From dc0d5775ae48e6d8e6143e2e714b8366643e91b5 Mon Sep 17 00:00:00 2001
From: Charles Zhao <charleszhao@silverhand.io>
Date: Fri, 10 May 2024 15:10:51 +0800
Subject: [PATCH] refactor(console): refactor some console global routes
 (#5841)

---
 packages/console/src/cloud/AppRoutes.tsx                | 4 +++-
 packages/console/src/containers/ConsoleRoutes/index.tsx | 7 ++++---
 packages/console/src/contexts/TenantsProvider.tsx       | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/console/src/cloud/AppRoutes.tsx b/packages/console/src/cloud/AppRoutes.tsx
index d97f388c13c..32394669d75 100644
--- a/packages/console/src/cloud/AppRoutes.tsx
+++ b/packages/console/src/cloud/AppRoutes.tsx
@@ -6,6 +6,7 @@ import AcceptInvitation from '@/pages/AcceptInvitation';
 import Callback from '@/pages/Callback';
 import CheckoutSuccessCallback from '@/pages/CheckoutSuccessCallback';
 import Profile from '@/pages/Profile';
+import HandleSocialCallback from '@/pages/Profile/containers/HandleSocialCallback';
 
 import * as styles from './AppRoutes.module.scss';
 import Main from './pages/Main';
@@ -20,10 +21,11 @@ function AppRoutes() {
         <Route path={GlobalAnonymousRoute.SocialDemoCallback} element={<SocialDemoCallback />} />
         <Route element={<ProtectedRoutes />}>
           <Route
-            path={`${GlobalRoute.AcceptInvitation}/:invitationId`}
+            path={`${GlobalAnonymousRoute.AcceptInvitation}/:invitationId`}
             element={<AcceptInvitation />}
           />
           <Route path={GlobalAnonymousRoute.Profile + '/*'} element={<Profile />} />
+          <Route path="/handle-social" element={<HandleSocialCallback />} />
           <Route path={GlobalRoute.CheckoutSuccessCallback} element={<CheckoutSuccessCallback />} />
           <Route index element={<Main />} />
         </Route>
diff --git a/packages/console/src/containers/ConsoleRoutes/index.tsx b/packages/console/src/containers/ConsoleRoutes/index.tsx
index 45c0da00a05..b6efae43ea4 100644
--- a/packages/console/src/containers/ConsoleRoutes/index.tsx
+++ b/packages/console/src/containers/ConsoleRoutes/index.tsx
@@ -40,13 +40,14 @@ export function ConsoleRoutes() {
        * console path to trigger the console routes.
        */}
       {!isCloud && <Route path="/" element={<Navigate to={ossConsolePath} />} />}
-      {!isCloud && (
-        <Route path={ossConsolePath + GlobalAnonymousRoute.Profile + '/*'} element={<Profile />} />
-      )}
       <Route path="/:tenantId" element={<Layout />}>
         <Route path="callback" element={<Callback />} />
         <Route path="welcome" element={<Welcome />} />
         <Route element={<ProtectedRoutes />}>
+          <Route
+            path={dropLeadingSlash(GlobalAnonymousRoute.Profile) + '/*'}
+            element={<Profile />}
+          />
           <Route path="handle-social" element={<HandleSocialCallback />} />
           <Route element={<TenantAccess />}>
             {isCloud && (
diff --git a/packages/console/src/contexts/TenantsProvider.tsx b/packages/console/src/contexts/TenantsProvider.tsx
index eca1189c936..71822d21902 100644
--- a/packages/console/src/contexts/TenantsProvider.tsx
+++ b/packages/console/src/contexts/TenantsProvider.tsx
@@ -21,6 +21,7 @@ import { isCloud } from '@/consts/env';
 export enum GlobalAnonymousRoute {
   Callback = '/callback',
   SocialDemoCallback = '/social-demo-callback',
+  AcceptInvitation = '/accept',
   Profile = '/profile',
 }
 
@@ -29,7 +30,6 @@ export enum GlobalAnonymousRoute {
  */
 export enum GlobalRoute {
   CheckoutSuccessCallback = '/checkout-success-callback',
-  AcceptInvitation = '/accept',
 }
 
 const reservedRoutes: Readonly<string[]> = Object.freeze([