Changeset 829

Timestamp:

Aug 23, 2010, 9:29:03 AM (13 years ago)

Author:

keesvb

Message:

started authentication implementation

Location:

trunk

Files:

• grails-app/conf/NimbleBootStrap.groovy (modified) (2 diffs)
• grails-app/controllers/RestController.groovy (modified) (3 diffs)
• src/groovy/nl (added)
• src/groovy/nl/metabolomicscentre (added)
• src/groovy/nl/metabolomicscentre/dsp (added)
• src/groovy/nl/metabolomicscentre/dsp/http (added)

trunk/grails-app/conf/NimbleBootStrap.groovy

@@ -49 +49 @@
     // Execute any custom Nimble related BootStrap for your application below
 
-        if (dbnp.user.User.count() == 0) {
+        println "Adding example user..."
+
+        if (0 && dbnp.user.User.count() == 0) {
 
                 // Create example User account
@@ -70 +72 @@
                   throw new RuntimeException("Error creating example user")
                 }
+
+                println "Adding example admin user..."
 
                 // Create example Administrative account

trunk/grails-app/controllers/RestController.groovy

@@ -31 +31 @@
       /** Rest resources for Simple Assay Module (SAM) **/
      /**************************************************/
-    
+
+        def beforeInterceptor = [action:this.&auth]
+        def credentials
+// defined as a regular method so its private
+
+        def auth() {
+            credentials = nl.metabolomicscentre.dsp.http.BasicAuthentication.credentialsFromRequest(request)
+                if(false) {
+                    response.sendError(403)
+                return false
+            }
+        }
+
 
 
@@ -38 +50 @@
         * Provide a list of all studies. 
         *
-        *
-        * Examlpe call of the getAssays REST resource: http://localhost:8080/gscf/rest/getAssays/json?externalStudyID=1
         *
         * @return as JSON object list of members externalStudyID, and title for all studies
@@ -74 +84 @@
         * Provide a list of all assays for a given study
         *
-        * @param  externalStudyID 
-        * @return list of assays as JSON object 
+        * Example call of the getAssays REST resource: http://localhost:8080/gscf/rest/getAssays?externalStudyID=PPSH&moduleURL=http://localhost:8182/sam
+        *
+        * @param externalStudyID The external study id (code) of the target GSCF Study object
+        * @param moduleURL The base URL of the calling dbNP module
+        * @return list of assays in the study as JSON object, filtered to only contain assays for the specified module
         */
         def getAssays = {
                 List assays = [] 
                 if( params.externalStudyID ) {
+                        println params.moduleURL
                         def study = Study.find( "from Study as s where s.code=?", [params.externalStudyID])
-                        if(study) study.assays.each{ assay -> 
-                            def map = ['name':assay.name, 'externalAssayID':assay.externalAssayID]
-                                assays.push( map )
+                        if(study) study.assays.each{ assay ->
+                                println assay.module.url
+                                if (assay.module.url.equals(params.moduleURL)) {
+                                def map = ['name':assay.name, 'externalAssayID':assay.externalAssayID]
+                                        assays.push( map )
+                                }
                         }
                 }