Merge pull request #674 from Digital-Engineering/development

Emergency Patch
idaholab · Jun 7, 2024 · 5bdc2fd · 5bdc2fd
2 parents e3453f4 + 325c189
commit 5bdc2fd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "deep-lynx",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "description": "DeepLynx allows for an integrated platform during design and operations of mega projects.",
     "main": "./dist/main.js",
     "author": "John Darrington and Christopher Ritter",

diff --git a/server/src/domain_objects/data_warehouse/ontology/container.ts b/server/src/domain_objects/data_warehouse/ontology/container.ts
@@ -305,17 +305,14 @@ export class ContainerPermissionSet extends NakedDomainClass {
         await e.removePolicy(userID, containerID, 'users', 'read');
         await e.removePolicy(userID, containerID, 'users', 'write');
 
-        try {
-            await e.savePolicy();
-        } catch (e) {
-            Logger.debug(`error saving policy ${e}`);
-        }
+        Logger.info(`removed all casbin policies for user ID ${userID}`);
 
         if (this.containers && this.containers.length > 0) {
             this.containers.forEach((permission) => {
                 e.addPolicy(userID, containerID, 'containers', permission).catch((e) =>
                     Logger.error(`error while setting container permissions for user ${userID}: ${e}`),
                 );
+                Logger.info(`added casbin policy container ${permission} for user ID ${userID}`);
             });
         }
 
@@ -324,6 +321,7 @@ export class ContainerPermissionSet extends NakedDomainClass {
                 e.addPolicy(userID, containerID, 'ontology', permission).catch((e) =>
                     Logger.error(`error while setting container permissions for user ${userID}: ${e}`),
                 );
+                Logger.info(`added casbin policy ontology ${permission} for user ID ${userID}`);
             });
         }
 
@@ -332,6 +330,7 @@ export class ContainerPermissionSet extends NakedDomainClass {
                 e.addPolicy(userID, containerID, 'data', permission).catch((e) =>
                     Logger.error(`error while setting container permissions for user ${userID}: ${e}`),
                 );
+                Logger.info(`added casbin policy data ${permission} for user ID ${userID}`);
             });
         }
 
@@ -340,6 +339,7 @@ export class ContainerPermissionSet extends NakedDomainClass {
                 e.addPolicy(userID, containerID, 'users', permission).catch((e) =>
                     Logger.error(`error while setting container permissions for user ${userID}: ${e}`),
                 );
+                Logger.info(`added casbin policy users ${permission} for user ID ${userID}`);
             });
         }
 

diff --git a/ui/AdminWebApp/package-lock.json b/ui/AdminWebApp/package-lock.json
diff --git a/ui/AdminWebApp/package.json b/ui/AdminWebApp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "deep-lynx-admin-gui",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "private": true,
   "scripts": {
     "serve": "cross-env NODE_ENV=development vue-cli-service serve",

diff --git a/ui/WebGLViewer/package-lock.json b/ui/WebGLViewer/package-lock.json