Bugfix: Share study with Organization (ITISFoundation#2370)

odeimaiz · web-flow · commit 8a65bde59dde · 2021-06-08T09:25:25.000+02:00
* store org IDs in auth data
* canGroupsWrite
diff --git a/services/web/client/source/class/osparc/auth/Data.js b/services/web/client/source/class/osparc/auth/Data.js
@@ -43,6 +43,15 @@ qx.Class.define("osparc.auth.Data", {
       check: "Number"
     },
 
+    /**
+     *  org IDs
+     */
+    orgIds: {
+      init: [],
+      nullable: false,
+      check: "Array"
+    },
+
     /**
      *  Basic authentification with a token
     */
diff --git a/services/web/client/source/class/osparc/auth/Manager.js b/services/web/client/source/class/osparc/auth/Manager.js
@@ -148,6 +148,11 @@ qx.Class.define("osparc.auth.Manager", {
       osparc.auth.Data.getInstance().setToken(profile.login);
       osparc.auth.Data.getInstance().setUserId(profile.id);
       osparc.auth.Data.getInstance().setGroupId(profile["groups"]["me"]["gid"]);
+      if ("organizations" in profile["groups"]) {
+        const orgIds = [];
+        profile["groups"]["organizations"].forEach(org => orgIds.push(org["gid"]));
+        osparc.auth.Data.getInstance().setOrgIds(orgIds);
+      }
       osparc.data.Permissions.getInstance().setRole(profile.role);
     },
 
diff --git a/services/web/client/source/class/osparc/component/metadata/QualityEditor.js b/services/web/client/source/class/osparc/component/metadata/QualityEditor.js
@@ -692,7 +692,9 @@ qx.Class.define("osparc.component.metadata.QualityEditor", {
         if (osparc.utils.Resources.isService(this.__resourceData)) {
           return osparc.component.permissions.Service.canGroupWrite(this.__resourceData["access_rights"], myGid);
         }
-        return osparc.component.permissions.Study.canGroupWrite(this.__resourceData["accessRights"], myGid);
+        const orgIDs = osparc.auth.Data.getInstance().getOrgIds();
+        orgIDs.push(myGid);
+        return osparc.component.permissions.Study.canGroupsWrite(this.__resourceData["accessRights"], orgIDs);
       }
       return false;
     }
diff --git a/services/web/client/source/class/osparc/component/metadata/ServicesInStudy.js b/services/web/client/source/class/osparc/component/metadata/ServicesInStudy.js
@@ -193,7 +193,11 @@ qx.Class.define("osparc.component.metadata.ServicesInStudy", {
           column: this.self().gridPos.latestVersion
         });
 
-        if (osparc.data.Permissions.getInstance().canDo("study.service.update") && osparc.data.model.Study.canIWrite(this.__studyData["accessRights"])) {
+        const myGroupId = osparc.auth.Data.getInstance().getGroupId();
+        const orgIDs = osparc.auth.Data.getInstance().getOrgIds();
+        orgIDs.push(myGroupId);
+        const canIWrite = osparc.component.permissions.Study.canGroupsWrite(this.__studyData["accessRights"], orgIDs);
+        if (osparc.data.Permissions.getInstance().canDo("study.service.update") && canIWrite) {
           const updateButton = new osparc.ui.form.FetchButton(null, "@MaterialIcons/update/14");
           updateButton.set({
             label: node["version"] === latestCompatibleMetadata["version"] ? this.tr("Up-to-date") : this.tr("Update"),
diff --git a/services/web/client/source/class/osparc/component/permissions/Study.js b/services/web/client/source/class/osparc/component/permissions/Study.js
@@ -41,13 +41,7 @@ qx.Class.define("osparc.component.permissions.Study", {
   },
 
   statics: {
-    canGroupRead: function(accessRights, GID) {
-      if (GID in accessRights) {
-        return accessRights[GID]["read"];
-      }
-      return false;
-    },
-    canGroupWrite: function(accessRights, GID) {
+    __canGroupWrite: function(accessRights, GID) {
       if (GID in accessRights) {
         return accessRights[GID]["write"];
       }
@@ -60,6 +54,15 @@ qx.Class.define("osparc.component.permissions.Study", {
       return false;
     },
 
+    canGroupsWrite: function(accessRights, GIDs) {
+      let canWrite = false;
+      for (let i=0; i<GIDs.length && !canWrite; i++) {
+        // eslint-disable-next-line no-underscore-dangle
+        canWrite = this.self().__canGroupWrite(accessRights, GIDs[i]);
+      }
+      return canWrite;
+    },
+
     getViewerAccessRight: function() {
       return {
         "read": true,
diff --git a/services/web/client/source/class/osparc/dashboard/StudyBrowserButtonItem.js b/services/web/client/source/class/osparc/dashboard/StudyBrowserButtonItem.js
@@ -454,8 +454,11 @@ qx.Class.define("osparc.dashboard.StudyBrowserButtonItem", {
 
     __setStudyPermissions: function(accessRights) {
       const myGroupId = osparc.auth.Data.getInstance().getGroupId();
+      const orgIDs = osparc.auth.Data.getInstance().getOrgIds();
+      orgIDs.push(myGroupId);
+
       const image = this.getChildControl("permission-icon");
-      if (osparc.component.permissions.Study.canGroupWrite(accessRights, myGroupId)) {
+      if (osparc.component.permissions.Study.canGroupsWrite(accessRights, orgIDs)) {
         image.exclude();
       } else {
         image.setSource(this.self().PERM_READ);
diff --git a/services/web/client/source/class/osparc/data/model/Study.js b/services/web/client/source/class/osparc/data/model/Study.js
@@ -223,14 +223,6 @@ qx.Class.define("osparc.data.model.Study", {
       return osparc.component.permissions.Study.canGroupExecute(aceessRights, myGid);
     },
 
-    canIWrite: function(accessRights) {
-      const myGid = osparc.auth.Data.getInstance().getGroupId();
-      if (myGid) {
-        return osparc.component.permissions.Study.canGroupWrite(accessRights, myGid);
-      }
-      return false;
-    },
-
     hasSlideshow: function(studyData) {
       if ("ui" in studyData && "slideshow" in studyData["ui"] && Object.keys(studyData["ui"]["slideshow"]).length) {
         return true;
@@ -250,8 +242,11 @@ qx.Class.define("osparc.data.model.Study", {
 
     __applyAccessRights: function(value) {
       const myGid = osparc.auth.Data.getInstance().getGroupId();
+      const orgIDs = osparc.auth.Data.getInstance().getOrgIds();
+      orgIDs.push(myGid);
+
       if (myGid) {
-        const canIWrite = osparc.component.permissions.Study.canGroupWrite(value, myGid);
+        const canIWrite = osparc.component.permissions.Study.canGroupsWrite(value, orgIDs);
         this.setReadOnly(!canIWrite);
       } else {
         this.setReadOnly(true);
diff --git a/services/web/client/source/class/osparc/desktop/StudyEditor.js b/services/web/client/source/class/osparc/desktop/StudyEditor.js
@@ -126,13 +126,22 @@ qx.Class.define("osparc.desktop.StudyEditor", {
       study.openStudy()
         .then(() => {
           study.initStudy();
-          const myGrpId = osparc.auth.Data.getInstance().getGroupId();
-          if (osparc.component.permissions.Study.canGroupWrite(study.getAccessRights(), myGrpId)) {
-            this.__startAutoSaveTimer();
-          } else {
-            const msg = this.tr("You do not have writing permissions.<br>Changes will not be saved");
-            osparc.component.message.FlashMessenger.getInstance().logAs(msg, "INFO");
-          }
+
+          osparc.data.Resources.get("organizations")
+            .then(resp => {
+              const myGroupId = osparc.auth.Data.getInstance().getGroupId();
+              const orgs = resp["organizations"];
+              const orgIDs = [myGroupId];
+              orgs.forEach(org => orgIDs.push(org["gid"]));
+
+              if (osparc.component.permissions.Study.canGroupsWrite(study.getAccessRights(), orgIDs)) {
+                this.__startAutoSaveTimer();
+              } else {
+                const msg = this.tr("You do not have writing permissions.<br>Changes will not be saved");
+                osparc.component.message.FlashMessenger.getInstance().logAs(msg, "INFO");
+              }
+            });
+
           switch (this.getPageContext()) {
             case "slideshow":
               this.__slideshowView.startSlides();
@@ -414,7 +423,9 @@ qx.Class.define("osparc.desktop.StudyEditor", {
 
     updateStudyDocument: function(run = false) {
       const myGrpId = osparc.auth.Data.getInstance().getGroupId();
-      if (!osparc.component.permissions.Study.canGroupWrite(this.getStudy().getAccessRights(), myGrpId)) {
+      const orgIDs = osparc.auth.Data.getInstance().getOrgIds();
+      orgIDs.push(myGrpId);
+      if (!osparc.component.permissions.Study.canGroupsWrite(this.getStudy().getAccessRights(), orgIDs)) {
         return new Promise(resolve => {
           resolve();
         });
diff --git a/tests/e2e/portal-files/VTK_file.js b/tests/e2e/portal-files/VTK_file.js
@@ -41,10 +41,11 @@ async function runTutorial () {
     const workbenchData = utils.extractWorkbenchData(studyData["data"]);
     const nodeIdViewer = workbenchData["nodeIds"][1];
     await tutorial.waitForServices(workbenchData["studyId"], [nodeIdViewer]);
-
-    // Some time for starting the service
     await utils.takeScreenshot(page, screenshotPrefix + 'service_started');
 
+    // Some time for setting up service's frontend
+    await tutorial.waitFor(3000);
+
     const iframeHandles = await page.$$("iframe");
     const iframes = [];
     for (let i=0; i<iframeHandles.length; i++) {

Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,9 @@ qx.Class.define("osparc.component.metadata.QualityEditor", {`
`692`	`692`	`if (osparc.utils.Resources.isService(this.__resourceData)) {`
`693`	`693`	`return osparc.component.permissions.Service.canGroupWrite(this.__resourceData["access_rights"], myGid);`
`694`	`694`	`}`
`695`		`- return osparc.component.permissions.Study.canGroupWrite(this.__resourceData["accessRights"], myGid);`
	`695`	`+ const orgIDs = osparc.auth.Data.getInstance().getOrgIds();`
	`696`	`+ orgIDs.push(myGid);`
	`697`	`+ return osparc.component.permissions.Study.canGroupsWrite(this.__resourceData["accessRights"], orgIDs);`
`696`	`698`	`}`
`697`	`699`	`return false;`
`698`	`700`	`}`