merge workspace error fix

Signed-off-by: tygao <tygao@amazon.com>
raintygao · Aug 18, 2023 · f8a28be · f8a28be
1 parent 54a84dc
commit f8a28be
Showing 1 changed file with 23 additions and 25 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
@@ -71,45 +71,43 @@ export class WorkspaceSavedObjectsClientWrapper {
     request: OpenSearchDashboardsRequest,
     permissionMode: WorkspacePermissionMode | WorkspacePermissionMode[]
   ) {
-    //PermissionMode here is an array which is merged by workspace type required permission and other saved object required permission.
-    //So we only need to do one permission check no matter its type.
+    // PermissionMode here is an array which is merged by workspace type required permission and other saved object required permission.
+    // So we only need to do one permission check no matter its type.
     if (!id) {
       return;
     }
-    if (
-      !(await this.permissionControl.validate(
-        request,
-        {
-          type,
-          id,
-        },
-        this.formatWorkspacePermissionModeToStringArray(permissionMode)
-      ))
-    ) {
+    const validateResult = await this.permissionControl.validate(
+      request,
+      {
+        type,
+        id,
+      },
+      this.formatWorkspacePermissionModeToStringArray(permissionMode)
+    );
+    if (!validateResult?.result) {
       throw generateWorkspacePermissionError();
     }
   }
 
   private async validateMultiObjectsPermissions(
-    objects: Pick<SavedObject, 'id' | 'type'>[],
+    objects: Array<Pick<SavedObject, 'id' | 'type'>>,
     request: OpenSearchDashboardsRequest,
     permissionMode: WorkspacePermissionMode | WorkspacePermissionMode[]
   ) {
-    //PermissionMode here is an array which is merged by workspace type required permission and other saved object required permission.
-    //So we only need to do one permission check no matter its type.
+    // PermissionMode here is an array which is merged by workspace type required permission and other saved object required permission.
+    // So we only need to do one permission check no matter its type.
     let permitted = true;
 
     for (const { id, type } of objects) {
-      if (
-        !(await this.permissionControl.validate(
-          request,
-          {
-            type,
-            id,
-          },
-          this.formatWorkspacePermissionModeToStringArray(permissionMode)
-        ))
-      ) {
+      const validateResult = await this.permissionControl.validate(
+        request,
+        {
+          type,
+          id,
+        },
+        this.formatWorkspacePermissionModeToStringArray(permissionMode)
+      );
+      if (!validateResult?.result) {
         permitted = false;
         break;
       }