Merge pull request #768 from alxdarksage/develop

Use session to call admin API for admins on serverService.saveStudy() call
Sage-Bionetworks · Aug 16, 2019 · 2801e2c · 2801e2c
2 parents 0b9cb9e + b0469d6
commit 2801e2c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/app/src/pages/admin/info/info.js b/app/src/pages/admin/info/info.js
@@ -37,7 +37,7 @@ export default function info() {
 
     utils.startHandler(self, event);
     serverService
-      .saveStudy(self.study, true)
+      .saveStudy(self.study)
       .then(utils.successHandler(vm, event, "Study information saved."))
       .catch(utils.failureHandler());
   };

diff --git a/app/src/pages/events/auto_custom_events.js b/app/src/pages/events/auto_custom_events.js
@@ -50,8 +50,7 @@ export default function() {
     self.study.automaticCustomEvents = self.itemsObs().reduce(obsToMap, {});
 
     utils.startHandler(vm, event);
-    serverService
-      .saveStudy(self.study, false)
+    serverService.saveStudy(self.study)
       .then(utils.successHandler(vm, event, "Automatic custom events saved."))
       .catch(utils.failureHandler());
   };

diff --git a/app/src/pages/shared_upload_metadata/shared_upload_metadata.js b/app/src/pages/shared_upload_metadata/shared_upload_metadata.js
@@ -14,8 +14,6 @@ const failureHandler = utils.failureHandler({
 export default function sharedUploadMetadata(params) {
   let self = this;
 
-  self.isAdmin = root.isAdmin;
-
   new Binder(this)
     .obs("index", 0)
     .bind("fieldDefinitions[]", [])
@@ -28,7 +26,7 @@ export default function sharedUploadMetadata(params) {
     utils.startHandler(vm, event);
 
     self.study.uploadMetadataFieldDefinitions = schemaUtils.fieldObsToDef(self.fieldDefinitionsObs());
-    serverService.saveStudy(self.study, self.isAdmin())
+    serverService.saveStudy(self.study)
       .then(fn.handleObsUpdate(self.versionObs, "version"))
       .then(utils.successHandler(vm, event, "Upload metadata fields have been saved."))
       .catch(utils.failureHandler());

diff --git a/app/src/services/server_service.js b/app/src/services/server_service.js
@@ -242,8 +242,9 @@ export class ServerService {
   getStudyPublicKey() {
     return this.gethttp(config.getStudyPublicKey);
   }
-  saveStudy(study, isAdmin) {
-    let url = isAdmin ? config.getStudy + study.identifier : config.getCurrentStudy;
+  saveStudy(study) {
+    let asAdmin = (session && session.roles.indexOf("admin") > -1) ? true : false;
+    let url = asAdmin ? config.getStudy + study.identifier : config.getCurrentStudy;
     return this.post(url, study).then(function(response) {
       study.version = response.version;
       return response;

diff --git a/app/src/widgets/clipboard/clipboard.js b/app/src/widgets/clipboard/clipboard.js
@@ -305,7 +305,7 @@ MODEL_METADATA.TaskReference = {
   pasteMethod: function(task) {
     return serverService.getStudy().then(function(study) {
       study.taskIdentifiers.push(task.identifier);
-      return serverService.saveStudy(study, false);
+      return serverService.saveStudy(study);
     });
   }
 };
@@ -330,7 +330,7 @@ MODEL_METADATA.DataGroup = {
   pasteMethod: function(dataGroup) {
     return serverService.getStudy().then(function(study) {
       study.dataGroups.push(dataGroup.value);
-      return serverService.saveStudy(study, false);
+      return serverService.saveStudy(study);
     });
   }
 };