fix: permission check error

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
ruanyl · Aug 17, 2023 · 8b9113a · 8b9113a
1 parent b49aa1f
commit 8b9113a
Showing 1 changed file with 27 additions and 30 deletions.
diff --git a/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts b/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts
@@ -73,16 +73,15 @@ export class WorkspaceSavedObjectsClientWrapper {
     if (!workspaceId) {
       return;
     }
-    if (
-      !(await this.permissionControl.validate(
-        request,
-        {
-          type: WORKSPACE_TYPE,
-          id: workspaceId,
-        },
-        this.formatWorkspacePermissionModeToStringArray(permissionMode)
-      ))
-    ) {
+    const validateResult = await this.permissionControl.validate(
+      request,
+      {
+        type: WORKSPACE_TYPE,
+        id: workspaceId,
+      },
+      this.formatWorkspacePermissionModeToStringArray(permissionMode)
+    );
+    if (!validateResult?.result) {
       throw generateWorkspacePermissionError();
     }
   }
@@ -96,16 +95,15 @@ export class WorkspaceSavedObjectsClientWrapper {
       return;
     }
     for (const workspaceId of workspaces) {
-      if (
-        !(await this.permissionControl.validate(
-          request,
-          {
-            type: WORKSPACE_TYPE,
-            id: workspaceId,
-          },
-          this.formatWorkspacePermissionModeToStringArray(permissionMode)
-        ))
-      ) {
+      const validateResult = await this.permissionControl.validate(
+        request,
+        {
+          type: WORKSPACE_TYPE,
+          id: workspaceId,
+        },
+        this.formatWorkspacePermissionModeToStringArray(permissionMode)
+      );
+      if (!validateResult?.result) {
         throw generateWorkspacePermissionError();
       }
     }
@@ -121,16 +119,15 @@ export class WorkspaceSavedObjectsClientWrapper {
     }
     let permitted = false;
     for (const workspaceId of workspaces) {
-      if (
-        await this.permissionControl.validate(
-          request,
-          {
-            type: WORKSPACE_TYPE,
-            id: workspaceId,
-          },
-          this.formatWorkspacePermissionModeToStringArray(permissionMode)
-        )
-      ) {
+      const validateResult = await this.permissionControl.validate(
+        request,
+        {
+          type: WORKSPACE_TYPE,
+          id: workspaceId,
+        },
+        this.formatWorkspacePermissionModeToStringArray(permissionMode)
+      );
+      if (validateResult?.result) {
         permitted = true;
         break;
       }