Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-16 09:36:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: catch 401 error

Browse Source
This commit is contained in:
MingLiang Wang
2022-12-23 19:28:06 +08:00
parent e50919d106
commit 235ea04078
2 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx
+17 -12
View File
@@ -27,8 +27,7 @@ const DynamicBlocksuite = ({
useEffect(() => {
const openWorkspace: LoadWorkspaceHandler = (
workspaceId: string,
websocket = false,
user
websocket = false
) =>
// eslint-disable-next-line no-async-promise-executor
new Promise(async resolve => {
@@ -64,16 +63,22 @@ const DynamicBlocksuite = ({
const indexDBProvider = workspace.providers.find(
p => p instanceof IndexedDBDocProvider
);
if (user) {
const updates = await downloadWorkspace({ workspaceId });
updates &&
StoreWorkspace.Y.applyUpdate(
workspace.doc,
new Uint8Array(updates)
);
// if after update, the space:meta is empty, then we need to get map with doc
workspace.doc.getMap('space:meta');
}
await new Promise<undefined>(resolve => {
downloadWorkspace({ workspaceId })
.then(async updates => {
updates &&
StoreWorkspace.Y.applyUpdate(
workspace.doc,
new Uint8Array(updates)
);
// if after update, the space:meta is empty, then we need to get map with doc
workspace.doc.getMap('space:meta');
resolve(undefined);
})
.catch(() => {
resolve(undefined);
});
});
if (indexDBProvider) {
(indexDBProvider as IndexedDBDocProvider).on('synced', async () => {
resolve(workspace);
packages/app/src/providers/app-state-provider/provider.tsx
+7 -26
View File
@@ -41,31 +41,11 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
workspaces: {},
});
const refreshWorkspacesInfo = async (
workspaces: AppStateValue['workspaces']
) => {
return Promise.all(
Object.entries(workspaces).map(async ([workspaceId, workspace]) => {
if (workspace) {
const updates = await downloadWorkspace({ workspaceId });
updates &&
StoreWorkspace.Y.applyUpdate(
workspace.doc,
new Uint8Array(updates)
);
// if after update, the space:meta is empty, then we need to get map with doc
workspace.doc.getMap('space:meta');
}
})
);
};
useEffect(() => {
(async () => {
const workspacesList = await Promise.all(
state.workspacesMeta.map(async ({ id }) => {
const workspace =
(await loadWorkspaceHandler?.(id, false, state.user)) || null;
const workspace = (await loadWorkspaceHandler?.(id, false)) || null;
return { id, workspace };
})
);
@@ -73,7 +53,6 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
workspacesList.forEach(({ id, workspace }) => {
workspaces[id] = workspace;
});
await refreshWorkspacesInfo(workspaces);
setState(state => ({
...state,
workspaces,
@@ -108,9 +87,7 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
if (state.currentWorkspaceId === workspaceId) {
return state.currentWorkspace;
}
const workspace =
(await loadWorkspaceHandler?.(workspaceId, true, state.user)) || null;
const workspace = (await loadWorkspaceHandler?.(workspaceId, true)) || null;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
@@ -195,6 +172,11 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
}
const callback = async (user: AccessTokenMessage | null) => {
const isLogin = token.isLogin;
setState(state => ({
...state,
user,
}));
const workspacesMeta = user
? await getWorkspaces().catch(() => {
return [];
@@ -203,7 +185,6 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => {
setState(state => ({
...state,
user: user,
workspacesMeta,
synced: isLogin ? !!user : true,
}));