diff --git a/apps/keck/src/index.ts b/apps/keck/src/index.ts index d76df31b53..31dadb7893 100644 --- a/apps/keck/src/index.ts +++ b/apps/keck/src/index.ts @@ -34,34 +34,31 @@ const _checkAuth = async ( response: http.ServerResponse, callback: (response: http.OutgoingMessage, workspace: string) => boolean ) => { + const url = new URL(request.url, `http://${request.headers.host}`); + const workspace = _getWorkspace(url.pathname); if (process.env.NODE_ENV === 'development') { - const url = new URL(request.url, `http://${request.headers.host}`); - const workspace = _getWorkspace(url.pathname); if (workspace) return callback(response, workspace); return false; - } else { - try { - const decodedToken = await firebaseAuth - .getAuth() - .verifyIdToken(request.headers.token as string); - const allowWorkspace = [AFFINE_COMMON_WORKSPACE, decodedToken.uid]; - const url = new URL(request.url, `http://${request.headers.host}`); - const workspace = _getWorkspace(url.pathname); - if (allowWorkspace.includes(workspace)) { - return callback(response, workspace); - } - } catch (error) { - console.log(error); - } - return false; } + try { + const decodedToken = await firebaseAuth + .getAuth() + .verifyIdToken(request.headers.token as string); + const allowWorkspace = [AFFINE_COMMON_WORKSPACE, decodedToken.uid]; + if (allowWorkspace.includes(workspace)) { + return callback(response, workspace); + } + } catch (error) { + console.log(error); + } + return false; }; const HOST = process.env.HOST || 'localhost'; const PORT = process.env.PORT || 3000; const _tokens = new LRUCache({ - max: 10240, + max: 1024 * 10, ttl: 1000 * 60 * 5, }); diff --git a/apps/ligo-virgo/src/pages/workspace/Home.tsx b/apps/ligo-virgo/src/pages/workspace/Home.tsx index c8ce89b6d4..a424a2052d 100644 --- a/apps/ligo-virgo/src/pages/workspace/Home.tsx +++ b/apps/ligo-virgo/src/pages/workspace/Home.tsx @@ -10,16 +10,13 @@ export function WorkspaceHome() { useEffect(() => { const navigate_to_user_initial_page = async () => { - const recent_pages = await services.api.userConfig.getRecentPages( - workspace_id, - user.id - ); - - const user_initial_page_id = - await services.api.userConfig.getUserInitialPage( + const [recent_pages, user_initial_page_id] = await Promise.all([ + services.api.userConfig.getRecentPages(workspace_id, user.id), + services.api.userConfig.getUserInitialPage( workspace_id, user.id - ); + ), + ]); if (recent_pages.length === 0) { await services.api.editorBlock.copyTemplateToPage( workspace_id, diff --git a/apps/ligo-virgo/src/pages/workspace/docs/workspace-name.tsx b/apps/ligo-virgo/src/pages/workspace/docs/workspace-name.tsx index cf6f3a0313..6311497161 100644 --- a/apps/ligo-virgo/src/pages/workspace/docs/workspace-name.tsx +++ b/apps/ligo-virgo/src/pages/workspace/docs/workspace-name.tsx @@ -95,15 +95,11 @@ export const WorkspaceName = () => { if (!currentSpaceId) { return; } - - const name = await services.api.userConfig.getWorkspaceName( - currentSpaceId - ); + const [name, workspaceId] = await Promise.all([ + services.api.userConfig.getWorkspaceName(currentSpaceId), + services.api.userConfig.getWorkspaceId(currentSpaceId), + ]); setWorkspaceName(name); - - const workspaceId = await services.api.userConfig.getWorkspaceId( - currentSpaceId - ); setWorkspaceId(workspaceId); }, [currentSpaceId]);