mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-25 18:26:05 +08:00
fix: getUserInfo from tauri instead from affine cloud in app
This commit is contained in:
@@ -32,7 +32,9 @@ export const AppStateProvider = ({
|
|||||||
if (dataCenter.workspaces.length === 0) {
|
if (dataCenter.workspaces.length === 0) {
|
||||||
await createDefaultWorkspace(dataCenter);
|
await createDefaultWorkspace(dataCenter);
|
||||||
}
|
}
|
||||||
setUser((await dataCenter.getUserInfo()) || null);
|
setUser(
|
||||||
|
(await dataCenter.getUserInfo(dataCenter.providers[0]?.id)) || null
|
||||||
|
);
|
||||||
setAppState({
|
setAppState({
|
||||||
dataCenter,
|
dataCenter,
|
||||||
workspaceList: dataCenter.workspaces,
|
workspaceList: dataCenter.workspaces,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import type { WorkspaceUnit } from 'src/workspace-unit.js';
|
|||||||
import { createWorkspaceUnit, loadWorkspaceUnit } from '../local/utils.js';
|
import { createWorkspaceUnit, loadWorkspaceUnit } from '../local/utils.js';
|
||||||
import { WorkspaceWithPermission } from './ipc/types/workspace.js';
|
import { WorkspaceWithPermission } from './ipc/types/workspace.js';
|
||||||
import { applyUpdate } from '../../utils/index.js';
|
import { applyUpdate } from '../../utils/index.js';
|
||||||
|
import { User } from 'src/types/index.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* init - createUser - create first workspace and ydoc - loadWorkspace - return the first workspace - wrapWorkspace - #initDocFromIPC - applyUpdate - on('update') - updateYDocument
|
* init - createUser - create first workspace and ydoc - loadWorkspace - return the first workspace - wrapWorkspace - #initDocFromIPC - applyUpdate - on('update') - updateYDocument
|
||||||
@@ -20,7 +21,7 @@ import { applyUpdate } from '../../utils/index.js';
|
|||||||
* (init - createUser - error) loadWorkspace - return the first workspace - wrapWorkspace - #initDocFromIPC - applyUpdate - on('update') - updateYDocument
|
* (init - createUser - error) loadWorkspace - return the first workspace - wrapWorkspace - #initDocFromIPC - applyUpdate - on('update') - updateYDocument
|
||||||
*/
|
*/
|
||||||
export class TauriIPCProvider extends LocalProvider {
|
export class TauriIPCProvider extends LocalProvider {
|
||||||
static id = 'tauri-ipc';
|
public id = 'tauri-ipc';
|
||||||
static defaultUserEmail = 'xxx@xx.xx';
|
static defaultUserEmail = 'xxx@xx.xx';
|
||||||
/**
|
/**
|
||||||
* // TODO: We only have one user in this version of app client. But may support switch user later.
|
* // TODO: We only have one user in this version of app client. But may support switch user later.
|
||||||
@@ -60,6 +61,22 @@ export class TauriIPCProvider extends LocalProvider {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get auth user info
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
public async getUserInfo(): Promise<User | undefined> {
|
||||||
|
const user = await this.#ipc?.getUser({
|
||||||
|
email: TauriIPCProvider.defaultUserEmail,
|
||||||
|
});
|
||||||
|
if (user?.name !== undefined) {
|
||||||
|
return {
|
||||||
|
...user,
|
||||||
|
avatar: user?.avatar_url || '',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async #initDocFromIPC(
|
async #initDocFromIPC(
|
||||||
workspaceID: string,
|
workspaceID: string,
|
||||||
blocksuiteWorkspace: BlocksuiteWorkspace
|
blocksuiteWorkspace: BlocksuiteWorkspace
|
||||||
|
|||||||
Reference in New Issue
Block a user