Changeset 945
- Timestamp:
- 14-10-10 19:57:16 (3 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/controllers/RestController.groovy
r940 r945 41 41 */ 42 42 private def auth() { 43 44 43 credentials = BasicAuthentication.credentialsFromRequest(request) 45 44 requestUser = AuthenticationService.authenticateUser(credentials.u, credentials.p) 46 45 47 // we circumvene the user48 46 if(!requestUser) { 49 47 response.sendError(403) … … 66 64 credentials = BasicAuthentication.credentialsFromRequest(request) 67 65 def reqUser = AuthenticationService.authenticateUser(credentials.u, credentials.p) 68 69 if (reqUser) { 70 isUser = true 71 } 72 else { 73 isUser = false 74 } 66 isUser = reqUser ? true : false 75 67 def reply = ['authenticated':isUser] 76 68 render reply as JSON 77 69 } 70 78 71 79 72 /** … … 159 152 if( params.assayToken ) { 160 153 def assay = Assay.find( "from Assay as a where externalAssayID=?",[params.assayToken]) 161 assay.getSamples().each { sample -> 162 def item = [ 163 'sampleToken' : sample.name, 164 'material' : sample.material.name, 165 'subject' : sample.parentSubject.name, 166 'event' : sample.parentEvent.template.name, 167 'startTime' : sample.parentEvent.getStartTimeString() 168 ] 169 items.push item 154 if( assay ) { 155 assay.getSamples().each { sample -> 156 def item = [ 157 'sampleToken' : sample.name, 158 'material' : sample.material.name, 159 'subject' : sample.parentSubject.name, 160 'event' : sample.parentEvent.template.name, 161 'startTime' : sample.parentEvent.getStartTimeString() 162 ] 163 items.push item 164 } 170 165 } 171 166 } … … 194 189 if( params.studyToken ) { 195 190 def study = Study.find( "from Study as s where code=?",[params.studyToken]) 196 study.giveFields().each { field -> 197 def name = field.name 198 def value = study.getFieldValue( name ) 199 items[name] = value 191 if(study) { 192 study.giveFields().each { field -> 193 def name = field.name 194 def value = study.getFieldValue( name ) 195 items[name] = value 196 } 200 197 } 201 198 } … … 222 219 if( params.assayToken ) { 223 220 def assay = Assay.find( "from Assay as a where externalAssayID=?",[params.assayToken]) 224 assay.giveFields().each { field -> 225 def name = field.name 226 def value = assay.getFieldValue( name ) 227 items[name] = value 221 if(assay) { 222 assay.giveFields().each { field -> 223 def name = field.name 224 def value = assay.getFieldValue( name ) 225 items[name] = value 226 } 228 227 } 229 228 } … … 259 258 if( params.assayToken && params.sampleToken ) { 260 259 def assay = Assay.find( "from Assay as a where externalAssayID=?",[params.assayToken]) 261 assay.getSamples().each { sample -> 262 if( sample.name == params.sampleToken ) { 263 items = [ 264 'subject' : sample.parentSubject.name, 265 'event' : sample.parentEvent.template.name, 266 'startTime' : sample.parentEvent.getStartTimeString() 267 ] 268 sample.giveFields().each { field -> 269 def name = field.name 270 def value = sample.getFieldValue( name ) 271 items[name] = value 272 } 260 if(assay) { 261 assay.getSamples().each { sample -> 262 if( sample.name == params.sampleToken ) { 263 items = [ 264 'subject' : sample.parentSubject.name, 265 'event' : sample.parentEvent.template.name, 266 'startTime' : sample.parentEvent.getStartTimeString() 267 ] 268 sample.giveFields().each { field -> 269 def name = field.name 270 def value = sample.getFieldValue( name ) 271 items[name] = value 272 } 273 } 273 274 } 274 275 } … … 278 279 279 280 def getAuthorizationLevel = { 280 // Warning: this case is only for testing!281 // The code below should be used until the282 // authorization works.283 /*if( params.isOwner || params.isEditor || params.Owner ) {284 return render ['isReader':params.isOwner,285 'isEditor':params.isEditor, 'isOwner':params.isOwner] as JSON286 }*/287 288 281 // in future the users authorization level will be based on authorization model 289 282 if( params.studyToken ) { … … 292 285 if(study) study.subjects.each { subjects.push it.name } 293 286 } 294 295 /*def user296 if( params.user ) {297 def id = params.user298 user = users.find( "from User as u where u.code=?", [id])299 }*/300 287 301 288 def perm = study.getPermissions(requestUser)
