feat: use app state to store request workspace id

Signed-off-by: SuZhou-Joe <[email protected]>
SuZhou-Joe · Apr 3, 2024 · 7fd5160 · 7fd5160
1 parent dd6cebf
commit 7fd5160
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/plugins/workspace/server/plugin.ts b/src/plugins/workspace/server/plugin.ts
@@ -54,7 +54,7 @@ export class WorkspacePlugin implements Plugin<{}, {}> {
 
       if (workspaceId) {
         updateWorkspaceState(request, {
-          id: workspaceId,
+          requestWorkspaceId: workspaceId,
         });
         const requestUrl = new URL(request.url.toString());
         requestUrl.pathname = cleanWorkspaceId(requestUrl.pathname);

diff --git a/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts b/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts
@@ -23,7 +23,7 @@ export class WorkspaceIdConsumerWrapper {
   ): T {
     const { workspaces, ...others } = options || {};
     const workspaceState = getWorkspaceState(request);
-    const workspaceIdParsedFromRequest = workspaceState?.id;
+    const workspaceIdParsedFromRequest = workspaceState?.requestWorkspaceId;
     const workspaceIdsInUserOptions = options?.workspaces;
     let finalWorkspaces: string[] = [];
     if (options?.hasOwnProperty('workspaces')) {