Changeset 2186

Timestamp:

Mar 28, 2012, 2:29:09 PM (11 years ago)

Author:

work@…

Message:

• api methods should not use authentication, only the authenticate method

Location:

trunk/grails-app

Files:

• controllers/api/ApiController.groovy (modified) (4 diffs)
• views/api/index.gsp (modified) (1 diff)

trunk/grails-app/controllers/api/ApiController.groovy

@@ -42 +42 @@
         def result = [:]
         try {
+            // TODO - check if token belongs to current user?
             if (!token) {
                 // generate a token for this device
                 token = new Token(
-                        deviceID: params.deviceID,
-                        deviceToken: UUID.randomUUID().toString(),
-                        sequence: 0
+                        deviceID    : params.deviceID,
+                        deviceToken : UUID.randomUUID().toString(),
+                        user        : authenticationService.getLoggedInUser(),
+                        sequence    : 0
                 ).save(failOnError: true)
             }
@@ -81 +83 @@
             response.sendError(401, 'Unauthorized')
         } else {
-            def user = authenticationService.getLoggedInUser()
+//            def user = authenticationService.getLoggedInUser()
+            def user = Token.findByDeviceID(deviceID).user
             def readableStudies = Study.giveReadableStudies(user)
             def studies = []
@@ -132 +135 @@
 
         // fetch user and study
-        def user    = authenticationService.getLoggedInUser()
+//        def user    = authenticationService.getLoggedInUser()
+        def user    = Token.findByDeviceID(deviceID).user
         def study   = Study.findByStudyUUID(studyToken)
         
@@ -195 +199 @@
 
         // fetch user and study
-        def user    = authenticationService.getLoggedInUser()
+//        def user    = authenticationService.getLoggedInUser()
+        def user    = Token.findByDeviceID(deviceID).user
         def study   = Study.findByStudyUUID(studyToken)
 

trunk/grails-app/views/api/index.gsp

@@ -112 +112 @@
     <h2>example reply</h2>
     <blockquote>
-        {"count":2,"studies":[{"title":"NuGO PPS human study","description":"Human study performed at RRI; centres involved: RRI, IFR, TUM, Maastricht U.","subjects":11,"species":["Homo sapiens"],"assays":["Mass Sequencing module","SAM module for clinical data","Metabolomics module"],"events":1,"uniqueEvents":["start: 3 days, 22 hours, duration: 8 hours"],"samplingEvents":2,"uniqueSamplingEvents":["start: 0 seconds","start: 4 days, 6 hours"],"eventGroups":1,"uniqueEventGroups":["Root group"],"samples":22},{"title":"NuGO PPS3 mouse study leptin module","description":"C57Bl/6 mice were fed a high fat (45 en%) or low fat (10 en%) diet after a four week run-in on low fat diet.","subjects":80,"species":["Mus musculus"],"assays":["SAM module for clinical data","Metabolomics module"],"events":8,"uniqueEvents":["start: 1 hour, duration: 1 week","start: 1 hour, duration: 4 weeks"],"samplingEvents":2,"uniqueSamplingEvents":["start: 1 week, 1 hour"],"eventGroups":8,"uniqueEventGroups":["10% fat + vehicle for 1 week","10% fat + leptin for 1 week","45% fat + vehicle for 1 week","45% fat + leptin for 1 week","10% fat + vehicle for 4 weeks","10% fat + leptin for 4 weeks","45% fat + vehicle for 4 weeks","45% fat + leptin for 4 weeks"],"samples":80}]}
+        {"count":2,"studies":[{"token":"f2e085fb-9138-4ebe-a59f-82f1bdc21d7e","title":"NuGO PPS human study","description":"Human study performed at RRI; centres involved: RRI, IFR, TUM, Maastricht U.","subjects":11,"species":["Homo sapiens"],"assays":["Mass Sequencing module","SAM module for clinical data","Metabolomics module"],"events":1,"uniqueEvents":["start: 3 days, 22 hours, duration: 8 hours"],"samplingEvents":2,"uniqueSamplingEvents":["start: 0 seconds","start: 4 days, 6 hours"],"eventGroups":1,"uniqueEventGroups":["Root group"],"samples":22},{"token":"6b7e85b3-b174-492c-ba27-fbfb71ab9b8b","title":"NuGO PPS3 mouse study leptin module","description":"C57Bl/6 mice were fed a high fat (45 en%) or low fat (10 en%) diet after a four week run-in on low fat diet.","subjects":80,"species":["Mus musculus"],"assays":["SAM module for clinical data","Metabolomics module"],"events":8,"uniqueEvents":["start: 1 hour, duration: 1 week","start: 1 hour, duration: 4 weeks"],"samplingEvents":2,"uniqueSamplingEvents":["start: 1 week, 1 hour"],"eventGroups":8,"uniqueEventGroups":["10% fat + vehicle for 1 week","10% fat + leptin for 1 week","45% fat + vehicle for 1 week","45% fat + leptin for 1 week","10% fat + vehicle for 4 weeks","10% fat + leptin for 4 weeks","45% fat + vehicle for 4 weeks","45% fat + leptin for 4 weeks"],"samples":80}]}
     </blockquote>
 </p>