mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-07-30 00:29:46 +08:00
Merge remote-tracking branch 'refs/remotes/origin/feat/cloud-sync-saika'
Conflicts: packages/data-center/src/datacenter.ts
This commit is contained in:
@@ -23,6 +23,7 @@ import { getAuthorizer } from './apis/token';
|
||||
import { WebsocketProvider } from './sync';
|
||||
import { IndexedDBProvider } from '../indexeddb';
|
||||
import { getDefaultHeadImgBlob } from '../../utils';
|
||||
import { getUserByEmail } from './apis/user';
|
||||
|
||||
export class AffineProvider extends BaseProvider {
|
||||
public id = 'affine';
|
||||
@@ -248,7 +249,8 @@ export class AffineProvider extends BaseProvider {
|
||||
if (!meta.avatar) {
|
||||
// set default avatar
|
||||
const blob = await getDefaultHeadImgBlob(meta.name);
|
||||
meta.avatar = (await this.setBlob(blob)) || '';
|
||||
const blobId = await this.setBlob(blob);
|
||||
meta.avatar = (await this.getBlob(blobId)) || '';
|
||||
}
|
||||
const { id } = await createWorkspace(meta as Required<WorkspaceMeta>);
|
||||
this._logger('Creating affine workspace');
|
||||
@@ -277,4 +279,19 @@ export class AffineProvider extends BaseProvider {
|
||||
public override async publish(id: string, isPublish: boolean): Promise<void> {
|
||||
await updateWorkspace({ id, public: isPublish });
|
||||
}
|
||||
|
||||
public override async getUserByEmail(
|
||||
workspace_id: string,
|
||||
email: string
|
||||
): Promise<User | null> {
|
||||
const user = await getUserByEmail({ workspace_id, email });
|
||||
return user
|
||||
? {
|
||||
id: user.id,
|
||||
name: user.name,
|
||||
avatar: user.avatar_url,
|
||||
email: user.email,
|
||||
}
|
||||
: null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,11 +4,9 @@ export type { Callback } from './token.js';
|
||||
import { getAuthorizer } from './token.js';
|
||||
import * as user from './user.js';
|
||||
import * as workspace from './workspace.js';
|
||||
import * as business from './business.js';
|
||||
|
||||
export type Apis = typeof user &
|
||||
typeof workspace & {
|
||||
business: typeof business;
|
||||
signInWithGoogle: ReturnType<typeof getAuthorizer>[0];
|
||||
onAuthStateChanged: ReturnType<typeof getAuthorizer>[1];
|
||||
};
|
||||
@@ -18,7 +16,6 @@ export const getApis = (): Apis => {
|
||||
return {
|
||||
...user,
|
||||
...workspace,
|
||||
business,
|
||||
signInWithGoogle,
|
||||
onAuthStateChanged,
|
||||
};
|
||||
|
||||
@@ -9,6 +9,7 @@ const defaultLogger = () => {
|
||||
export interface ProviderConstructorParams {
|
||||
logger?: Logger;
|
||||
workspaces: WorkspacesScope;
|
||||
blobs: BlobStorage;
|
||||
}
|
||||
|
||||
export class BaseProvider {
|
||||
@@ -17,9 +18,10 @@ export class BaseProvider {
|
||||
protected _logger!: Logger;
|
||||
protected _blobs!: BlobStorage;
|
||||
|
||||
public constructor({ logger, workspaces }: ProviderConstructorParams) {
|
||||
public constructor({ logger, workspaces, blobs }: ProviderConstructorParams) {
|
||||
this._logger = (logger || defaultLogger) as Logger;
|
||||
this._workspaces = workspaces;
|
||||
this._blobs = blobs;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -149,10 +151,25 @@ export class BaseProvider {
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
* create workspace by workspace meta
|
||||
* @param {WorkspaceMeta} meta
|
||||
*/
|
||||
public async createWorkspace(
|
||||
meta: WorkspaceMeta
|
||||
): Promise<Workspace | undefined> {
|
||||
meta;
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
* get user by email
|
||||
* @param {string} id
|
||||
* @param {string} email
|
||||
* @returns
|
||||
*/
|
||||
public async getUserByEmail(id: string, email: string): Promise<User | null> {
|
||||
email;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,7 +82,8 @@ export class LocalProvider extends BaseProvider {
|
||||
if (!meta.avatar) {
|
||||
// set default avatar
|
||||
const blob = await getDefaultHeadImgBlob(meta.name);
|
||||
meta.avatar = (await this.setBlob(blob)) || '';
|
||||
const blobId = await this.setBlob(blob);
|
||||
meta.avatar = (await this.getBlob(blobId)) || '';
|
||||
}
|
||||
this._logger('Creating affine workspace');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user