mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-27 02:42:25 +08:00
feat: add MessageCenterHandler (#770)
Co-authored-by: Peng Xiao <pengxiao@freewheel.tv>
This commit is contained in:
35
apps/web/src/components/message-center-handler/index.tsx
Normal file
35
apps/web/src/components/message-center-handler/index.tsx
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
import { toast } from '@affine/component';
|
||||||
|
import { getApis, MessageCenter } from '@affine/datacenter';
|
||||||
|
import { useRouter } from 'next/router';
|
||||||
|
import { useEffect } from 'react';
|
||||||
|
|
||||||
|
export function MessageCenterHandler({
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
children?: React.ReactNode;
|
||||||
|
}) {
|
||||||
|
const router = useRouter();
|
||||||
|
useEffect(() => {
|
||||||
|
const instance = MessageCenter.getInstance();
|
||||||
|
if (instance) {
|
||||||
|
return instance.onMessage(async message => {
|
||||||
|
if (message.code === MessageCenter.messageCode.noPermission) {
|
||||||
|
// todo: translate message
|
||||||
|
// todo: more specific message for accessing different resources
|
||||||
|
// todo: error toast style
|
||||||
|
toast('You have no permission to access this workspace');
|
||||||
|
getApis().auth.clear();
|
||||||
|
// the status of the app right now is unknown, and it won't help if we let
|
||||||
|
// the app continue and let the user auth the app.
|
||||||
|
// that's why so we need to reload the page for now.
|
||||||
|
//
|
||||||
|
// fix: a better option is to keep loading the app, and prompt the user to login
|
||||||
|
// or perhaps displaying page 401?
|
||||||
|
router.reload();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [router]);
|
||||||
|
|
||||||
|
return <>{children}</>;
|
||||||
|
}
|
||||||
@@ -11,7 +11,7 @@ export const useMembers = () => {
|
|||||||
const refreshMembers = useCallback(async () => {
|
const refreshMembers = useCallback(async () => {
|
||||||
if (!currentWorkspace || !dataCenter) return;
|
if (!currentWorkspace || !dataCenter) return;
|
||||||
const members = await dataCenter.getMembers(currentWorkspace.id);
|
const members = await dataCenter.getMembers(currentWorkspace.id);
|
||||||
setMembers(members);
|
setMembers(members ?? []);
|
||||||
}, [dataCenter, currentWorkspace]);
|
}, [dataCenter, currentWorkspace]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import { useTranslation } from '@affine/i18n';
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { GlobalAppProvider } from '@/store/app';
|
import { GlobalAppProvider } from '@/store/app';
|
||||||
import { DataCenterPreloader } from '@/store/app/datacenter';
|
import { DataCenterPreloader } from '@/store/app/datacenter';
|
||||||
|
import { MessageCenterHandler } from '@/components/message-center-handler';
|
||||||
|
|
||||||
const ThemeProvider = dynamic(() => import('@/providers/ThemeProvider'), {
|
const ThemeProvider = dynamic(() => import('@/providers/ThemeProvider'), {
|
||||||
ssr: false,
|
ssr: false,
|
||||||
@@ -77,17 +78,19 @@ const App = ({ Component, pageProps }: AppPropsWithLayout) => {
|
|||||||
<ConfirmProvider key="ConfirmProvider" />,
|
<ConfirmProvider key="ConfirmProvider" />,
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{NoNeedAppStatePageList.includes(router.route) ? (
|
<MessageCenterHandler>
|
||||||
getLayout(<Component {...pageProps} />)
|
{NoNeedAppStatePageList.includes(router.route) ? (
|
||||||
) : (
|
getLayout(<Component {...pageProps} />)
|
||||||
<Suspense fallback={<PageLoading />}>
|
) : (
|
||||||
<DataCenterPreloader>
|
<Suspense fallback={<PageLoading />}>
|
||||||
<AppDefender>
|
<DataCenterPreloader>
|
||||||
{getLayout(<Component {...pageProps} />)}
|
<AppDefender>
|
||||||
</AppDefender>
|
{getLayout(<Component {...pageProps} />)}
|
||||||
</DataCenterPreloader>
|
</AppDefender>
|
||||||
</Suspense>
|
</DataCenterPreloader>
|
||||||
)}
|
</Suspense>
|
||||||
|
)}
|
||||||
|
</MessageCenterHandler>
|
||||||
</ProviderComposer>
|
</ProviderComposer>
|
||||||
</GlobalAppProvider>
|
</GlobalAppProvider>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -6,23 +6,25 @@ import type {
|
|||||||
CreateWorkspaceInfoParams,
|
CreateWorkspaceInfoParams,
|
||||||
UpdateWorkspaceMetaParams,
|
UpdateWorkspaceMetaParams,
|
||||||
} from './provider/base';
|
} from './provider/base';
|
||||||
import { LocalProvider } from './provider/local/local';
|
import { LocalProvider } from './provider/local';
|
||||||
import { AffineProvider } from './provider';
|
import { AffineProvider } from './provider';
|
||||||
import type { Message } from './types';
|
import type { Message } from './types';
|
||||||
import assert from 'assert';
|
import assert from 'assert';
|
||||||
import { getLogger } from './logger';
|
import { getLogger } from './logger';
|
||||||
import { createBlocksuiteWorkspace } from './utils/index';
|
import { createBlocksuiteWorkspace } from './utils';
|
||||||
import { MessageCenter } from './message';
|
import { MessageCenter } from './message';
|
||||||
import { WorkspaceUnit } from './workspace-unit';
|
import { WorkspaceUnit } from './workspace-unit';
|
||||||
/**
|
/**
|
||||||
* @class DataCenter
|
* @class DataCenter
|
||||||
* @classdesc Data center is made for managing different providers for business
|
* @classdesc Data center is made for managing different providers for business
|
||||||
*/
|
*/
|
||||||
|
|
||||||
export class DataCenter {
|
export class DataCenter {
|
||||||
private readonly _workspaceUnitCollection = new WorkspaceUnitCollection();
|
private readonly _workspaceUnitCollection = new WorkspaceUnitCollection();
|
||||||
private readonly _logger = getLogger('dc');
|
private readonly _logger = getLogger('dc');
|
||||||
private _workspaceInstances: Map<string, BlocksuiteWorkspace> = new Map();
|
private _workspaceInstances: Map<string, BlocksuiteWorkspace> = new Map();
|
||||||
private _messageCenter = MessageCenter.getInstance();
|
private _messageCenter = MessageCenter.getInstance();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A mainProvider must exist as the only data trustworthy source.
|
* A mainProvider must exist as the only data trustworthy source.
|
||||||
*/
|
*/
|
||||||
@@ -304,7 +306,6 @@ export class DataCenter {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* remove the new member to the workspace
|
* remove the new member to the workspace
|
||||||
* @param {number} permissionId permission id
|
|
||||||
*/
|
*/
|
||||||
public async removeMember(workspaceId: string, permissionId: number) {
|
public async removeMember(workspaceId: string, permissionId: number) {
|
||||||
const workspaceInfo = this._workspaceUnitCollection.find(workspaceId);
|
const workspaceInfo = this._workspaceUnitCollection.find(workspaceId);
|
||||||
|
|||||||
@@ -32,5 +32,8 @@ export class MessageCenter extends Observable<string> {
|
|||||||
|
|
||||||
public onMessage(callback: (message: Message) => void) {
|
public onMessage(callback: (message: Message) => void) {
|
||||||
this.on('message', callback);
|
this.on('message', callback);
|
||||||
|
return () => {
|
||||||
|
this.off('message', callback);
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -105,17 +105,21 @@ export class Auth {
|
|||||||
type: 'Refresh',
|
type: 'Refresh',
|
||||||
token: refreshToken || this._refreshToken,
|
token: refreshToken || this._refreshToken,
|
||||||
});
|
});
|
||||||
this._padding.finally(() => {
|
|
||||||
// clear on settled
|
|
||||||
this._padding = undefined;
|
|
||||||
});
|
|
||||||
this._refreshToken = refreshToken || this._refreshToken;
|
this._refreshToken = refreshToken || this._refreshToken;
|
||||||
}
|
}
|
||||||
const res = await this._padding;
|
try {
|
||||||
if (!refreshToken || refreshToken !== this._refreshToken) {
|
const res = await this._padding;
|
||||||
this.setLogin(res);
|
if (res && (!refreshToken || refreshToken !== this._refreshToken)) {
|
||||||
|
this.setLogin(res);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
} catch {
|
||||||
|
this._logger('Failed to refresh token');
|
||||||
|
} finally {
|
||||||
|
// clear on settled
|
||||||
|
this._padding = undefined;
|
||||||
}
|
}
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
get user() {
|
get user() {
|
||||||
|
|||||||
@@ -14,19 +14,15 @@ export const bareClient: KyInstance = ky.extend({
|
|||||||
// todo: report timeout error
|
// todo: report timeout error
|
||||||
timeout: 60000,
|
timeout: 60000,
|
||||||
hooks: {
|
hooks: {
|
||||||
// afterResponse: [
|
beforeError: [
|
||||||
// async (_request, _options, response) => {
|
error => {
|
||||||
// if (response.status === 200) {
|
const { response } = error;
|
||||||
// const data = await response.json();
|
if (response.status === 401) {
|
||||||
// if (data.error) {
|
_sendMessage(MessageCenter.messageCode.noPermission);
|
||||||
// return new Response(data.error.message, {
|
}
|
||||||
// status: data.error.code,
|
return error;
|
||||||
// });
|
},
|
||||||
// }
|
],
|
||||||
// }
|
|
||||||
// return response;
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -59,15 +55,5 @@ export const client: KyInstance = bareClient.extend({
|
|||||||
request.headers.set('Authorization', auth.token);
|
request.headers.set('Authorization', auth.token);
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
||||||
beforeError: [
|
|
||||||
error => {
|
|
||||||
const { response } = error;
|
|
||||||
if (response.status === 401) {
|
|
||||||
_sendMessage(MessageCenter.messageCode.noPermission);
|
|
||||||
}
|
|
||||||
return error;
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user