fix: permissions missed after workspace update (opensearch-project#245)

* fix: permissions missed after workspace update Signed-off-by: Lin Wang <wonglam@amazon.com> * remove not used imports Signed-off-by: Lin Wang <wonglam@amazon.com> --------- Signed-off-by: Lin Wang <wonglam@amazon.com>
SuZhou-Joe · Oct 27, 2023 · dc240eb · dc240eb
1 parent d1fe469
commit dc240eb
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 9 deletions.
diff --git a/src/plugins/workspace/public/workspace_client.ts b/src/plugins/workspace/public/workspace_client.ts
@@ -30,7 +30,7 @@ type IResponse<T> =
       error?: string;
     };
 
-type WorkspaceRoutePermissionItem = {
+type WorkspacePermissionItem = {
   modes: Array<
     | WorkspacePermissionMode.LibraryRead
     | WorkspacePermissionMode.LibraryWrite
@@ -177,7 +177,7 @@ export class WorkspaceClient {
    */
   public async create(
     attributes: Omit<WorkspaceAttribute, 'id'>,
-    permissions?: WorkspaceRoutePermissionItem[]
+    permissions?: WorkspacePermissionItem[]
   ): Promise<IResponse<WorkspaceAttribute>> {
     const path = this.getPath();
 
@@ -265,7 +265,7 @@ export class WorkspaceClient {
   public async update(
     id: string,
     attributes: Partial<WorkspaceAttribute>,
-    permissions?: WorkspaceRoutePermissionItem[]
+    permissions?: WorkspacePermissionItem[]
   ): Promise<IResponse<boolean>> {
     const path = this.getPath(id);
     const body = {

diff --git a/src/plugins/workspace/server/integration_tests/routes.test.ts b/src/plugins/workspace/server/integration_tests/routes.test.ts
@@ -6,13 +6,9 @@
 import { WorkspaceAttribute } from 'src/core/types';
 import { omit } from 'lodash';
 import * as osdTestServer from '../../../../core/test_helpers/osd_server';
-import { WorkspaceRoutePermissionItem } from '../types';
-import { WorkspacePermissionMode } from '../../../../core/server';
 import { WORKSPACE_TYPE } from '../../../../core/server';
 
-const testWorkspace: WorkspaceAttribute & {
-  permissions: WorkspaceRoutePermissionItem;
-} = {
+const testWorkspace: WorkspaceAttribute = {
   id: 'fake_id',
   name: 'test_workspace',
   description: 'test_workspace_description',
@@ -120,6 +116,39 @@ describe('workspace service', () => {
       expect(getResult.body.success).toEqual(true);
       expect(getResult.body.result.name).toEqual('updated');
     });
+    it('update with permission', async () => {
+      const permission = {
+        userId: 'foo',
+        type: 'user',
+        modes: ['read', 'library_read'],
+      };
+      const result: any = await osdTestServer.request
+        .post(root, `/api/workspaces`)
+        .send({
+          attributes: omit(testWorkspace, 'id'),
+        })
+        .expect(200);
+
+      await osdTestServer.request
+        .put(root, `/api/workspaces/${result.body.result.id}`)
+        .send({
+          attributes: {
+            ...omit(testWorkspace, 'id'),
+            name: 'updated',
+          },
+          permissions: permission,
+        })
+        .expect(200);
+
+      const getResult = await osdTestServer.request.get(
+        root,
+        `/api/workspaces/${result.body.result.id}`
+      );
+
+      expect(getResult.body.success).toEqual(true);
+      expect(getResult.body.result.name).toEqual('updated');
+      expect(getResult.body.result.permissions[0]).toEqual(permission);
+    });
     it('delete', async () => {
       const result: any = await osdTestServer.request
         .post(root, `/api/workspaces`)

diff --git a/src/plugins/workspace/server/routes/index.ts b/src/plugins/workspace/server/routes/index.ts
@@ -189,7 +189,7 @@ export function registerRoutes({
         id,
         {
           ...attributes,
-          ...(finalPermissions.length ? { finalPermissions } : {}),
+          ...(finalPermissions.length ? { permissions: finalPermissions } : {}),
         }
       );
       return res.ok({ body: result });