feat(core): open desktop directly in subscription landing page

toeverything · Apr 22, 2024 · c3d3b2d · c3d3b2d
1 parent f70c827
commit c3d3b2d
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/packages/frontend/core/src/components/affine/subscription-landing/index.tsx b/packages/frontend/core/src/components/affine/subscription-landing/index.tsx
@@ -4,6 +4,7 @@ import { useNavigateHelper } from '@affine/core/hooks/use-navigate-helper';
 import { Trans } from '@affine/i18n';
 import { useAFFiNEI18N } from '@affine/i18n/hooks';
 import { type ReactNode, useCallback } from 'react';
+import { useSearchParams } from 'react-router-dom';
 
 import * as styles from './styles.css';
 
@@ -15,11 +16,16 @@ const UpgradeSuccessLayout = ({
   description?: ReactNode;
 }) => {
   const t = useAFFiNEI18N();
+  const [params] = useSearchParams();
 
-  const { jumpToIndex } = useNavigateHelper();
+  const { jumpToIndex, openInApp } = useNavigateHelper();
   const openAffine = useCallback(() => {
-    jumpToIndex();
-  }, [jumpToIndex]);
+    if (params.get('schema')) {
+      openInApp(params.get('schema') ?? 'affine', 'bring-to-front');
+    } else {
+      jumpToIndex();
+    }
+  }, [jumpToIndex, openInApp, params]);
 
   const subtitle = (
     <div className={styles.leftContentText}>

diff --git a/packages/frontend/core/src/hooks/use-navigate-helper.ts b/packages/frontend/core/src/hooks/use-navigate-helper.ts
@@ -155,6 +155,14 @@ export function useNavigateHelper() {
     [navigate]
   );
 
+  const openInApp = useCallback(
+    (schema: string, path: string) => {
+      const encodedUrl = encodeURIComponent(`${schema}://${path}`);
+      return navigate(`/open-app/url?schema=${schema}&url=${encodedUrl}`);
+    },
+    [navigate]
+  );
+
   return useMemo(
     () => ({
       jumpToPage,
@@ -169,6 +177,7 @@ export function useNavigateHelper() {
       jumpToCollections,
       jumpToTags,
       jumpToTag,
+      openInApp,
     }),
     [
       jumpToPage,
@@ -183,6 +192,7 @@ export function useNavigateHelper() {
       jumpToCollections,
       jumpToTags,
       jumpToTag,
+      openInApp,
     ]
   );
 }
diff --git a/packages/frontend/core/src/modules/cloud/stores/subscription.ts b/packages/frontend/core/src/modules/cloud/stores/subscription.ts
@@ -110,6 +110,12 @@ export class SubscriptionStore extends Store {
   }
 
   async createCheckoutSession(input: CreateCheckoutSessionInput) {
+    const { successCallbackLink } = input;
+    if (successCallbackLink && environment.isDesktop) {
+      const url = new URL(successCallbackLink);
+      url.searchParams.set('schema', window.appInfo.schema);
+      input.successCallbackLink = url.toString();
+    }
     const data = await this.gqlService.gql({
       query: createCheckoutSessionMutation,
       variables: { input },

diff --git a/packages/frontend/electron/renderer/app.tsx b/packages/frontend/electron/renderer/app.tsx
@@ -32,6 +32,7 @@ import { RouterProvider } from 'react-router-dom';
 const desktopWhiteList = [
   '/desktop-signin',
   '/open-app/signin-redirect',
+  '/open-app/url',
   '/upgrade-success',
   '/ai-upgrade-success',
 ];

diff --git a/packages/frontend/electron/src/main/deep-link.ts b/packages/frontend/electron/src/main/deep-link.ts
@@ -67,6 +67,12 @@ async function handleAffineUrl(url: string) {
   if (urlObj.hostname === 'signin-redirect') {
     await handleOauthJwt(url);
   }
+  if (urlObj.hostname === 'bring-to-front') {
+    const mainWindow = await getMainWindow();
+    if (mainWindow) {
+      mainWindow.show();
+    }
+  }
 }
 
 async function handleOauthJwt(url: string) {