Changeset 1655

Timestamp:

Mar 21, 2011, 3:04:22 PM (9 years ago)

Author:

work@…

Message:

make sure all json methods also set a proper json header

Location:

trunk/grails-app/controllers

Files:

• HomeController.groovy (modified) (1 diff)
• RestController.groovy (modified) (11 diffs)
• dbnp/authentication/LoginController.groovy (modified) (3 diffs)
• dbnp/authentication/UserController.groovy (modified) (1 diff)
• dbnp/importer/ImporterController.groovy (modified) (1 diff)
• dbnp/studycapturing/StudyController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/HomeController.groovy

@@ -164 +164 @@
                 }
 
+                // set output header to json
+                response.contentType = 'application/json'
+
                 // render result
                 if (params.callback) {

trunk/grails-app/controllers/RestController.groovy

@@ -65 +65 @@
                 boolean isUser = authenticationService.isRemotelyLoggedIn( params.consumer, params.token )
                 def reply = ['authenticated':isUser]
+
+                // set output header to json
+                response.contentType = 'application/json'
+
                 render reply as JSON
         }
@@ -80 +84 @@
                 SecUser user = authenticationService.getRemotelyLoggedInUser( params.consumer, params.token )
                 def reply = [username: user.username, id: user.id]
+
+                // set output header to json
+                response.contentType = 'application/json'
+
                 render reply as JSON
         }
-
 
         /**
@@ -181 +188 @@
                 }
 
-                render returnStudies as JSON 
+                // set output header to json
+                response.contentType = 'application/json'
+
+                render returnStudies as JSON
         }
 
@@ -227 +237 @@
                 versionInfo[ 'version' ] = study.version;
 
+                // set output header to json
+                response.contentType = 'application/json'
+
                 render versionInfo as JSON
         }
@@ -260 +273 @@
                         }
                 }
-                render subjects as JSON 
+
+                // set output header to json
+                response.contentType = 'application/json'
+
+                render subjects as JSON
         }
 
@@ -305 +322 @@
          */
         def getAssays = {
+                // set output header to json
+                response.contentType = 'application/json'
 
                 List returnList = []    // return list of hashes each containing fields and values belonging to an assay 
@@ -311 +330 @@
                 def validCall = CommunicationManager.hasValidParams( params, "consumer", "studyToken" )
                 if( !validCall ) { 
-                        render "Error. Wrong or insufficient parameters." as JSON 
+                        render "Error. Wrong or insufficient parameters." as JSON
                         return
                 }
@@ -365 +384 @@
 
                 }
-                render returnList as JSON 
+                render returnList as JSON
         }
 
@@ -514 +533 @@
                 }
 
+                // set output header to json
+                response.contentType = 'application/json'
+
                 render items as JSON
         }
@@ -540 +562 @@
                         def auth = ['isOwner': study.isOwner(user), 'canRead': study.canRead(user), 'canWrite': study.canWrite(user)];
                         log.trace "Authorization for study " + study.title + " and user " + user.username + ": " + auth
+
+                        // set output header to json
+                        response.contentType = 'application/json'
+
                         render auth as JSON;
                 } else {
@@ -546 +572 @@
                 }
     }
-
 }

trunk/grails-app/controllers/dbnp/authentication/LoginController.groovy

@@ -155 +155 @@
 
                 if (springSecurityService.isAjax(request)) {
+                        // set output header to json
+                        response.contentType = 'application/json'
+
                         render([error: msg] as JSON)
                 }
@@ -167 +170 @@
          */
         def ajaxSuccess = {
-println "ajaxsuccess"
+                // set output header to json
+                response.contentType = 'application/json'
+
                 render([success: true, username: springSecurityService.authentication.name] as JSON)
         }
@@ -175 +180 @@
          */
         def ajaxDenied = {
-println "ajaxdenied"
+                // set output header to json
+                response.contentType = 'application/json'
+
                 render([error: 'access denied'] as JSON)
         }

trunk/grails-app/controllers/dbnp/authentication/UserController.groovy

@@ -184 +184 @@
                 }
 
-                render text: jsonData as JSON, contentType: 'text/plain'
+                render text: jsonData as JSON, contentType: 'application/json'
         }
 

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -324 +324 @@
                 def templates = Template.findAllByEntity(gdtService.getInstanceByEntity(params.entity.decodeURL()))
 
+                // set output header to json
+                response.contentType = 'application/json'
+
                 // render as JSON
                 render templates as JSON

trunk/grails-app/controllers/dbnp/studycapturing/StudyController.groovy

@@ -349 +349 @@
                         }
         }
+
+                // set output header to json
+                response.contentType = 'application/json'
+
         render json as JSON
     }
@@ -375 +379 @@
      */
     def ajaxGetAssays = {
-
         def study = Study.read(params.id)
+
+                // set output header to json
+                response.contentType = 'application/json'
+
         render study?.assays?.collect{[name: it.name, id: it.id]} as JSON
     }