Changeset 14 for trunk/grails-app/services/nl/tno/metagenomics/integration/GscfService.groovy

Timestamp:

Feb 16, 2011, 2:24:56 PM (11 years ago)

Author:

robert@…

Message:

Implemented improved authorization (#16)
Built in select all checkboxes (#25)

File:

• trunk/grails-app/services/nl/tno/metagenomics/integration/GscfService.groovy (modified) (11 diffs)

trunk/grails-app/services/nl/tno/metagenomics/integration/GscfService.groovy

@@ -24 +24 @@
          */
         public String urlAuthRemote( def params, def token ) {
-                def redirectURL = "${config.gscf.baseURL}/login/auth_remote?moduleURL=${this.moduleURL()}&consumer=${this.consumerID()}&token=${token}&returnUrl=${config.grails.serverURL}"
-
+                def redirectURL = "${config.gscf.baseURL}/login/auth_remote?moduleURL=${this.moduleURL()}&consumer=${this.consumerID()}&token=${token}&"
+
+                def returnUrl = config.grails.serverURL
                 if (params.controller != null){
-                        redirectURL += "/${params.controller}"
+                        returnUrl += "/${params.controller}"
                         if (params.action != null){
-                                redirectURL += "/${params.action}"
+                                returnUrl += "/${params.action}"
                                 if (params.id != null){
-                                        redirectURL += "/${params.id}"
+                                        returnUrl += "/${params.id}"
                                 }
                         }
                 }
 
-                return redirectURL
+                // Append other parameters
+                returnUrl += "?" + params.collect {
+                        if( it.key != "controller" && it.key != "action" && it.key != "id" )
+                                return it.key.toString().encodeAsURL() + "=" + it.value.toString().encodeAsURL();
+                        else
+                                return ""
+                }.findAll { it }.join( "&" );
+                
+                return redirectURL + "returnUrl=" + returnUrl.encodeAsURL();
         }
 
@@ -65 +74 @@
          * @return Map
          */
-        public Map getUser(String sessionToken) {
+        public Map getUser(String sessionToken) throws Exception {
                 def user = [:]
-                this.callGSCF(sessionToken, "getUser").each {
-                        user[ it.key ] = it.value;
-                }
-                return user
+                try {
+                        this.callGSCF(sessionToken, "getUser").each {
+                                user[ it.key ] = it.value;
+                        }
+                        return user
+                } catch( Exception e ) {
+                        throw new Exception( "Retrieving user details from GSCF failed", e );
+                }
         }
 
@@ -80 +93 @@
          * @return ArrayList 
          */
-        public ArrayList getStudies(String sessionToken) {
+        public ArrayList getStudies(String sessionToken) throws BadRequestException, NotAuthenticatedException, NotAuthorizedException, ResourceNotFoundException, Exception {
                 return this.callGSCF(sessionToken, "getStudies")
         }
@@ -92 +105 @@
          * @return ArrayList
          */
-        public ArrayList getStudies(String sessionToken, ArrayList studyTokens ) {
+        public ArrayList getStudies(String sessionToken, ArrayList studyTokens ) throws BadRequestException, NotAuthenticatedException, NotAuthorizedException, ResourceNotFoundException, Exception  {
                 return this.callGSCF(sessionToken, "getStudies", [ "studyToken": studyTokens ] );
         }
@@ -104 +117 @@
          * @return ArrayList 
          */
-        public def getStudy(String sessionToken, String studyToken) throws NotAuthorizedException, ResourceNotFoundException {
+        public def getStudy(String sessionToken, String studyToken) throws BadRequestException, NotAuthenticatedException, NotAuthorizedException, ResourceNotFoundException, Exception  {
                 def list
 
@@ -131 +144 @@
          * @return ArrayList 
          */
-        public ArrayList getAssays(String sessionToken, String studyToken) throws NotAuthorizedException, ResourceNotFoundException {
+        public ArrayList getAssays(String sessionToken, String studyToken) throws BadRequestException, NotAuthenticatedException, NotAuthorizedException, ResourceNotFoundException, Exception  {
                 try {
                         return this.callGSCF(sessionToken, "getAssays", ["studyToken": studyToken])
@@ -150 +163 @@
          * @return ArrayList 
          */     
-        public def getAssay(String sessionToken, String studyToken, String assayToken ) throws NotAuthorizedException, ResourceNotFoundException {
+        public def getAssay(String sessionToken, String studyToken, String assayToken )throws BadRequestException, NotAuthenticatedException, NotAuthorizedException, ResourceNotFoundException, Exception  {
                 def list
                 try {
@@ -178 +191 @@
          * @return ArrayList
          */
-        public def getSample(String sessionToken, String assayToken, String sampleToken) throws NotAuthorizedException, ResourceNotFoundException {
+        public def getSample(String sessionToken, String assayToken, String sampleToken) throws BadRequestException, NotAuthenticatedException, NotAuthorizedException, ResourceNotFoundException, Exception  {
                 def list
 
@@ -205 +218 @@
          * @return ArrayList 
          */
-        public ArrayList getSamples(String sessionToken, String assayToken) throws NotAuthorizedException, ResourceNotFoundException {
+        public ArrayList getSamples(String sessionToken, String assayToken) throws BadRequestException, NotAuthenticatedException, NotAuthorizedException, ResourceNotFoundException, Exception  {
                 // Samples of a Study limited to a single Assay
                 try {
@@ -225 +238 @@
          * @return ArrayList
          */
-        public def getSamples(String sessionToken, List sampleTokens) throws NotAuthorizedException, ResourceNotFoundException {
+        public def getSamples(String sessionToken, List sampleTokens) throws BadRequestException, NotAuthenticatedException, NotAuthorizedException, ResourceNotFoundException, Exception  {
                 def list
 
@@ -249 +262 @@
          * @return ArrayList
          */
-        public HashMap getAuthorizationLevel(String sessionToken, String studyToken) throws ResourceNotFoundException {
+        public HashMap getAuthorizationLevel(String sessionToken, String studyToken) throws BadRequestException, NotAuthenticatedException, NotAuthorizedException, ResourceNotFoundException, Exception  {
                 ArrayList list