refactor: move getPermittedWorkspaceIds inner find method

Signed-off-by: Lin Wang <wonglam@amazon.com>
ruanyl · Sep 20, 2023 · 3d3fc1e · 3d3fc1e
1 parent b724852
commit 3d3fc1e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 26 deletions.
diff --git a/src/plugins/workspace/server/permission_control/client.ts b/src/plugins/workspace/server/permission_control/client.ts
@@ -10,7 +10,6 @@ import {
   SavedObjectsBulkGetObject,
   SavedObjectsServiceStart,
   Logger,
-  WORKSPACE_TYPE,
 } from '../../../../core/server';
 import { WORKSPACE_SAVED_OBJECTS_CLIENT_WRAPPER_ID } from '../../common/constants';
 import { getPrincipalsFromRequest } from '../utils';
@@ -130,25 +129,4 @@ export class SavedObjectsPermissionControl {
       };
     }, {});
   }
-
-  public async getPermittedWorkspaceIds(
-    request: OpenSearchDashboardsRequest,
-    permissionModes: SavedObjectsPermissionModes
-  ) {
-    const principals = getPrincipalsFromRequest(request);
-    const savedObjectClient = this.getScopedClient?.(request);
-    try {
-      const result = await savedObjectClient?.find({
-        type: [WORKSPACE_TYPE],
-        ACLSearchParams: {
-          permissionModes,
-          principals,
-        },
-        perPage: 999,
-      });
-      return result?.saved_objects.map((item) => item.id);
-    } catch (e) {
-      return [];
-    }
-  }
 }
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
@@ -378,10 +378,16 @@ export class WorkspaceSavedObjectsClientWrapper {
         options.ACLSearchParams.permissionModes = workspaceInnerPermissionModes;
         options.ACLSearchParams.principals = principals;
       } else {
-        const permittedWorkspaceIds = await this.permissionControl.getPermittedWorkspaceIds(
-          wrapperOptions.request,
-          workspaceInnerPermissionModes
-        );
+        const permittedWorkspaceIds = (
+          await wrapperOptions.client.find({
+            type: WORKSPACE_TYPE,
+            perPage: 999,
+            ACLSearchParams: {
+              principals,
+              permissionModes: workspaceInnerPermissionModes,
+            },
+          })
+        ).saved_objects.map((item) => item.id);
 
         if (options.workspaces) {
           const permittedWorkspaces = options.workspaces.filter((item) =>