fix: make permissions as optional params

Signed-off-by: SuZhou-Joe <[email protected]>
ruanyl · Oct 8, 2023 · d2d18a7 · d2d18a7
1 parent 86fcb49
commit d2d18a7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/src/plugins/workspace/server/routes/index.ts b/src/plugins/workspace/server/routes/index.ts
@@ -128,7 +128,9 @@ export function registerRoutes({
             ...result.result,
             workspaces: result.result.workspaces.map((workspace) => ({
               ...workspace,
-              permissions: convertFromACL(workspace.permissions),
+              ...(workspace.permissions
+                ? { permissions: convertFromACL(workspace.permissions) }
+                : {}),
             })),
           },
         },
@@ -163,7 +165,9 @@ export function registerRoutes({
           ...result,
           result: {
             ...result.result,
-            permissions: convertFromACL(result.result.permissions),
+            ...(result.result.permissions
+              ? { permissions: convertFromACL(result.result.permissions) }
+              : {}),
           },
         },
       });
@@ -182,9 +186,13 @@ export function registerRoutes({
       const { attributes } = req.body;
       const rawRequest = ensureRawRequest(req);
       const authInfo = rawRequest?.auth?.credentials?.authInfo as { user_name?: string } | null;
-      const permissions = Array.isArray(attributes.permissions)
-        ? attributes.permissions
-        : [attributes.permissions];
+      const { permissions: permissionsInAttributes, ...others } = attributes;
+      let permissions: WorkspaceRoutePermissionItem[] = [];
+      if (permissionsInAttributes) {
+        permissions = Array.isArray(permissionsInAttributes)
+          ? permissionsInAttributes
+          : [permissionsInAttributes];
+      }
 
       if (!!authInfo?.user_name) {
         permissions.push({
@@ -206,8 +214,8 @@ export function registerRoutes({
           logger,
         },
         {
-          ...attributes,
-          permissions: convertToACL(permissions),
+          ...others,
+          ...(permissionsInAttributes ? { permissions: convertToACL(permissions) } : {}),
         }
       );
       return res.ok({ body: result });
@@ -228,6 +236,7 @@ export function registerRoutes({
     router.handleLegacyErrors(async (context, req, res) => {
       const { id } = req.params;
       const { attributes } = req.body;
+      const { permissions, ...others } = attributes;
 
       const result = await client.update(
         {
@@ -237,8 +246,8 @@ export function registerRoutes({
         },
         id,
         {
-          ...attributes,
-          permissions: convertToACL(attributes.permissions),
+          ...others,
+          ...(permissions ? { permissions: convertToACL(permissions) } : {}),
         }
       );
       return res.ok({ body: result });

diff --git a/src/plugins/workspace/server/types.ts b/src/plugins/workspace/server/types.ts
@@ -15,7 +15,7 @@ import {
 } from '../../../core/server';
 
 export interface WorkspaceAttributeWithPermission extends WorkspaceAttribute {
-  permissions: Permissions;
+  permissions?: Permissions;
 }
 
 export interface WorkspaceFindOptions {