Merge branch 'feat/cloud-sync-saika' into feat/datacenter

packages/data-center/src/provider/affine/__tests__/affine.spec.ts

@@ -1,6 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { AffineProvider } from '../affine.js';
-import { Workspaces } from '../../../workspaces/index.js';
+// import { Workspaces } from '../../../workspaces/index.js';
 import { apis } from './mock-apis.js';
 import 'fake-indexeddb/auto';
 

packages/data-center/src/provider/affine/affine.ts

@@ -11,6 +11,7 @@ import { WebsocketProvider } from './sync.js';
 import { getApis } from './apis/index.js';
 import type { Apis, WorkspaceDetail, Callback } from './apis';
 import { setDefaultAvatar } from '../utils.js';
+import { MessageCode } from 'src/message/code.js';
 
 export interface AffineProviderConstructorParams
   extends ProviderConstructorParams {
@@ -196,7 +197,10 @@ export class AffineProvider extends BaseProvider {
         return;
       }
     }
-    await this._apis.signInWithGoogle?.();
+    const user = await this._apis.signInWithGoogle?.();
+    if (!user) {
+      this._messageCenter.send(MessageCode.loginError);
+    }
   }
 
   public override async getUserInfo(): Promise<User | undefined> {

packages/data-center/src/provider/base.ts

@@ -1,6 +1,7 @@
 import { Workspace as BlocksuiteWorkspace, uuidv4 } from '@blocksuite/store';
+import { MessageCenter } from 'src/message';
 import { Logger, User, WorkspaceInfo, WorkspaceMeta } from '../types';
-import type { WorkspacesScope } from '../workspaces';
+import type { WorkspaceMetaCollectionScope } from '../workspace-meta-collection';
 
 const defaultLogger = () => {
   return;
@@ -8,17 +9,24 @@ const defaultLogger = () => {
 
 export interface ProviderConstructorParams {
   logger?: Logger;
-  workspaces: WorkspacesScope;
+  workspaces: WorkspaceMetaCollectionScope;
+  messageCenter: MessageCenter;
 }
 
 export class BaseProvider {
   public readonly id: string = 'base';
-  protected _workspaces!: WorkspacesScope;
+  protected _workspaces!: WorkspaceMetaCollectionScope;
   protected _logger!: Logger;
+  protected _messageCenter!: MessageCenter;
 
-  public constructor({ logger, workspaces }: ProviderConstructorParams) {
+  public constructor({
+    logger,
+    workspaces,
+    messageCenter,
+  }: ProviderConstructorParams) {
     this._logger = (logger || defaultLogger) as Logger;
     this._workspaces = workspaces;
+    this._messageCenter = messageCenter;
   }
 
   /**

packages/data-center/src/provider/local/local.spec.ts

@@ -1,13 +1,13 @@
 import { test, expect } from '@playwright/test';
-import { Workspaces } from '../../workspaces/index.js';
+import { WorkspaceMetaCollection } from '../../workspace-meta-collection.js';
 import { LocalProvider } from './local.js';
 import { createBlocksuiteWorkspace } from '../../utils/index.js';
 import 'fake-indexeddb/auto';
 
 test.describe.serial('local provider', () => {
-  const workspaces = new Workspaces();
+  const workspaceMetaCollection = new WorkspaceMetaCollection();
   const provider = new LocalProvider({
-    workspaces: workspaces.createScope(),
+    workspaces: workspaceMetaCollection.createScope(),
   });
 
   const workspaceName = 'workspace-test';
@@ -25,30 +25,30 @@ test.describe.serial('local provider', () => {
       avatar: 'avatar-url-test',
     });
 
-    expect(workspaces.workspaces.length).toEqual(1);
-    expect(workspaces.workspaces[0].name).toEqual(workspaceName);
+    expect(workspaceMetaCollection.workspaces.length).toEqual(1);
+    expect(workspaceMetaCollection.workspaces[0].name).toEqual(workspaceName);
   });
 
   test('workspace list cache', async () => {
-    const workspaces1 = new Workspaces();
+    const workspacesMetaCollection1 = new WorkspaceMetaCollection();
     const provider1 = new LocalProvider({
-      workspaces: workspaces1.createScope(),
+      workspaces: workspacesMetaCollection1.createScope(),
     });
     await provider1.loadWorkspaces();
-    expect(workspaces1.workspaces.length).toEqual(1);
-    expect(workspaces1.workspaces[0].name).toEqual(workspaceName);
-    expect(workspaces1.workspaces[0].id).toEqual(workspaceId);
+    expect(workspacesMetaCollection1.workspaces.length).toEqual(1);
+    expect(workspacesMetaCollection1.workspaces[0].name).toEqual(workspaceName);
+    expect(workspacesMetaCollection1.workspaces[0].id).toEqual(workspaceId);
   });
 
   test('update workspace', async () => {
     await provider.updateWorkspaceMeta(workspaceId!, {
       name: '1111',
     });
-    expect(workspaces.workspaces[0].name).toEqual('1111');
+    expect(workspaceMetaCollection.workspaces[0].name).toEqual('1111');
   });
 
   test('delete workspace', async () => {
-    expect(workspaces.workspaces.length).toEqual(1);
+    expect(workspaceMetaCollection.workspaces.length).toEqual(1);
     /**
      * FIXME
      * If we don't wrap setTimeout,
@@ -56,8 +56,8 @@ test.describe.serial('local provider', () => {
      * InvalidStateError: An operation was called on an object on which it is not allowed or at a time when it is not allowed. Also occurs if a request is made on a source object that has been deleted or removed. Use TransactionInactiveError or ReadOnlyError when possible, as they are more specific variations of InvalidStateError.
      * */
     setTimeout(async () => {
-      await provider.deleteWorkspace(workspaces.workspaces[0].id);
-      expect(workspaces.workspaces.length).toEqual(0);
+      await provider.deleteWorkspace(workspaceMetaCollection.workspaces[0].id);
+      expect(workspaceMetaCollection.workspaces.length).toEqual(0);
     }, 10);
   });
 });

packages/data-center/src/provider/utils.ts

@@ -8,8 +8,7 @@ export const setDefaultAvatar = async (
   const blob = await getDefaultHeadImgBlob(blocksuiteWorkspace.meta.name);
   const blobStorage = await blocksuiteWorkspace.blobs;
   assert(blobStorage, 'No blob storage');
-  const blobId = await blobStorage.set(blob);
-  const avatar = await blobStorage.get(blobId);
+  const avatar = await blobStorage.set(blob);
   if (avatar) {
     blocksuiteWorkspace.meta.setAvatar(avatar);
   }