fix(core): cannot view pricing page if not logged in (#8907)

Due to lifetime plan card show `Upgrade` button that require accout, should show `Login` instead

packages/backend/server/src/plugins/payment/resolver.ts

@@ -370,7 +370,7 @@ export class UserSubscriptionResolver {
       };
     }
 
-    return this.db.userSubscription.findUnique({
+    const subscription = await this.db.userSubscription.findUnique({
       where: {
         userId_plan: {
           userId: user.id,
@@ -379,6 +379,18 @@ export class UserSubscriptionResolver {
         status: SubscriptionStatus.Active,
       },
     });
+
+    if (
+      subscription &&
+      subscription.variant &&
+      ![SubscriptionVariant.EA, SubscriptionVariant.Onetime].includes(
+        subscription.variant as SubscriptionVariant
+      )
+    ) {
+      subscription.variant = null;
+    }
+
+    return subscription;
   }
 
   @ResolveField(() => [UserSubscriptionType])
@@ -390,12 +402,25 @@ export class UserSubscriptionResolver {
       throw new AccessDenied();
     }
 
-    return this.db.userSubscription.findMany({
+    const subscriptions = await this.db.userSubscription.findMany({
       where: {
         userId: user.id,
         status: SubscriptionStatus.Active,
       },
     });
+
+    subscriptions.forEach(subscription => {
+      if (
+        subscription.variant &&
+        ![SubscriptionVariant.EA, SubscriptionVariant.Onetime].includes(
+          subscription.variant as SubscriptionVariant
+        )
+      ) {
+        subscription.variant = null;
+      }
+    });
+
+    return subscriptions;
   }
 
   @ResolveField(() => [UserInvoiceType])

packages/common/infra/src/modules/doc/entities/record-list.ts

@@ -13,23 +13,28 @@ export class DocRecordList extends Entity {
 
   private readonly pool = new Map<string, DocRecord>();
 
-  public readonly docs$ = LiveData.from<DocRecord[]>(
+  public readonly docsMap$ = LiveData.from<Map<string, DocRecord>>(
     this.store.watchDocIds().pipe(
-      map(ids =>
-        ids.map(id => {
-          const exists = this.pool.get(id);
-          if (exists) {
-            return exists;
-          }
-          const record = this.framework.createEntity(DocRecord, { id });
-          this.pool.set(id, record);
-          return record;
-        })
+      map(
+        ids =>
+          new Map(
+            ids.map(id => {
+              const exists = this.pool.get(id);
+              if (exists) {
+                return [id, exists];
+              }
+              const record = this.framework.createEntity(DocRecord, { id });
+              this.pool.set(id, record);
+              return [id, record];
+            })
+          )
       )
     ),
-    []
+    new Map()
   );
 
+  public readonly docs$ = this.docsMap$.selector(d => Array.from(d.values()));
+
   public readonly trashDocs$ = LiveData.from<DocRecord[]>(
     this.store.watchTrashDocIds().pipe(
       map(ids =>
@@ -53,7 +58,7 @@ export class DocRecordList extends Entity {
   );
 
   public doc$(id: string) {
-    return this.docs$.map(record => record.find(record => record.id === id));
+    return this.docsMap$.selector(map => map.get(id));
   }
 
   public setPrimaryMode(id: string, mode: DocMode) {

packages/common/infra/src/modules/doc/stores/docs.ts

@@ -32,7 +32,7 @@ export class DocsStore extends Store {
       switchMap(yjsObserve),
       map(meta => {
         if (meta instanceof YArray) {
-          return meta.map(v => v.get('id'));
+          return meta.map(v => v.get('id') as string);
         } else {
           return [];
         }
@@ -59,6 +59,7 @@ export class DocsStore extends Store {
   }
 
   watchDocMeta(id: string) {
+    let docMetaIndexCache = -1;
     return yjsObserveByPath(
       this.workspaceService.workspace.rootYDoc.getMap('meta'),
       'pages'
@@ -66,13 +67,23 @@ export class DocsStore extends Store {
       switchMap(yjsObserve),
       map(meta => {
         if (meta instanceof YArray) {
-          let docMetaYMap = null as YMap<any> | null;
-          meta.forEach(doc => {
-            if (doc.get('id') === id) {
-              docMetaYMap = doc;
+          if (docMetaIndexCache >= 0) {
+            const doc = meta.get(docMetaIndexCache);
+            if (doc && doc.get('id') === id) {
+              return doc as YMap<any>;
             }
-          });
-          return docMetaYMap;
+          }
+
+          // meta is YArray, `for-of` is faster then `for`
+          let i = 0;
+          for (const doc of meta) {
+            if (doc && doc.get('id') === id) {
+              docMetaIndexCache = i;
+              return doc as YMap<any>;
+            }
+            i++;
+          }
+          return null;
         } else {
           return null;
         }

packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/attachment-block.ts

@@ -7,6 +7,7 @@ import {
 import {
   AttachmentBlockService,
   AttachmentBlockSpec,
+  ImageBlockService,
 } from '@blocksuite/affine/blocks';
 import bytes from 'bytes';
 
@@ -19,6 +20,15 @@ class CustomAttachmentBlockService extends AttachmentBlockService {
   }
 }
 
+class CustomImageBlockService extends ImageBlockService {
+  override mounted(): void {
+    // blocksuite default max file size is 10MB, we override it to 2GB
+    // but the real place to limit blob size is CloudQuotaModal / LocalQuotaModal
+    this.maxFileSize = bytes.parse('2GB');
+    super.mounted();
+  }
+}
+
 export const CustomAttachmentBlockSpec: ExtensionType[] = [
   ...AttachmentBlockSpec,
   {
@@ -28,6 +38,11 @@ export const CustomAttachmentBlockSpec: ExtensionType[] = [
         CustomAttachmentBlockService,
         [StdIdentifier, BlockFlavourIdentifier('affine:attachment')]
       );
+      di.override(
+        BlockServiceIdentifier('affine:image'),
+        CustomImageBlockService,
+        [StdIdentifier, BlockFlavourIdentifier('affine:image')]
+      );
     },
   },
 ];

packages/frontend/core/src/desktop/dialogs/setting/general-setting/plans/lifetime/lifetime-plan.tsx

@@ -1,10 +1,10 @@
 import { Button } from '@affine/component';
-import { SubscriptionService } from '@affine/core/modules/cloud';
+import { AuthService, SubscriptionService } from '@affine/core/modules/cloud';
 import { SubscriptionRecurring } from '@affine/graphql';
 import { Trans, useI18n } from '@affine/i18n';
 import { useLiveData, useService } from '@toeverything/infra';
 
-import { Upgrade } from '../plan-card';
+import { SignUpAction, Upgrade } from '../plan-card';
 import { BelieverCard } from './believer-card';
 import { BelieverBenefits } from './benefits';
 import * as styles from './style.css';
@@ -12,6 +12,8 @@ import * as styles from './style.css';
 export const LifetimePlan = () => {
   const t = useI18n();
   const subscriptionService = useService(SubscriptionService);
+  const loggedIn =
+    useLiveData(useService(AuthService).session.status$) === 'authenticated';
 
   const readableLifetimePrice = useLiveData(
     subscriptionService.prices.readableLifetimePrice$
@@ -32,7 +34,11 @@ export const LifetimePlan = () => {
 
       <div className={styles.price}>{readableLifetimePrice}</div>
 
-      {isBeliever ? (
+      {!loggedIn ? (
+        <SignUpAction className={styles.purchase}>
+          {t['com.affine.payment.sign-up-free']()}
+        </SignUpAction>
+      ) : isBeliever ? (
         <Button className={styles.purchase} size="default" disabled>
           {t['com.affine.payment.lifetime.purchased']()}
         </Button>

packages/frontend/core/src/desktop/dialogs/setting/general-setting/plans/plan-card.tsx

@@ -383,7 +383,10 @@ const ChangeRecurring = ({
   );
 };
 
-const SignUpAction = ({ children }: PropsWithChildren) => {
+export const SignUpAction = ({
+  children,
+  className,
+}: PropsWithChildren<{ className?: string }>) => {
   const setOpen = useSetAtom(authAtom);
 
   const onClickSignIn = useCallback(() => {
@@ -396,7 +399,7 @@ const SignUpAction = ({ children }: PropsWithChildren) => {
   return (
     <Button
       onClick={onClickSignIn}
-      className={styles.planAction}
+      className={clsx(styles.planAction, className)}
       variant="primary"
     >
       {children}

packages/frontend/core/src/desktop/pages/open-app/index.tsx

@@ -1,5 +1,5 @@
 import { OpenInAppPage } from '@affine/core/modules/open-in-app/views/open-in-app-page';
-import { appSchemes } from '@affine/core/utils/channel';
+import { appSchemes, channelToScheme } from '@affine/core/utils/channel';
 import type { GetCurrentUserQuery } from '@affine/graphql';
 import { fetcher, getCurrentUserQuery } from '@affine/graphql';
 import type { LoaderFunction } from 'react-router-dom';
@@ -37,7 +37,9 @@ const OpenOAuthJwt = () => {
   const [params] = useSearchParams();
 
   const maybeScheme = appSchemes.safeParse(params.get('scheme'));
-  const scheme = maybeScheme.success ? maybeScheme.data : 'affine';
+  const scheme = maybeScheme.success
+    ? maybeScheme.data
+    : channelToScheme[BUILD_CONFIG.appBuildType];
   const next = params.get('next');
 
   if (!currentUser || !currentUser?.token?.sessionToken) {