From a6d16a516443fe0f56c0798db201951988ff5c0a Mon Sep 17 00:00:00 2001
From: simeng-li <simeng@silverhand.io>
Date: Fri, 20 Jan 2023 12:35:44 +0800
Subject: [PATCH] refactor(ui): rename connector params in route path (#3001)

---
 packages/ui/src/App.tsx                                   | 8 ++++----
 packages/ui/src/pages/Callback/index.tsx                  | 4 ++--
 packages/ui/src/pages/SocialLanding/index.test.tsx        | 2 +-
 packages/ui/src/pages/SocialLanding/index.tsx             | 4 ++--
 packages/ui/src/pages/SocialLinkAccount/index.test.tsx    | 8 ++++----
 packages/ui/src/pages/SocialLinkAccount/index.tsx         | 8 ++++----
 packages/ui/src/pages/SocialSignInCallback/index.test.tsx | 2 +-
 packages/ui/src/pages/SocialSignInCallback/index.tsx      | 4 ++--
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/ui/src/App.tsx b/packages/ui/src/App.tsx
index 8684e0cad..f54db8e1b 100644
--- a/packages/ui/src/App.tsx
+++ b/packages/ui/src/App.tsx
@@ -76,7 +76,7 @@ const App = () => {
                   path="/sign-in"
                   element={isRegisterOnly ? <Navigate replace to="/register" /> : <SignIn />}
                 />
-                <Route path="/sign-in/social/:connector" element={<SocialSignIn />} />
+                <Route path="/sign-in/social/:connectorId" element={<SocialSignIn />} />
                 <Route path="/sign-in/:method" element={<SecondarySignIn />} />
                 <Route path="/sign-in/:method/password" element={<SignInPassword />} />
 
@@ -103,9 +103,9 @@ const App = () => {
                 <Route path="/continue/:method" element={<Continue />} />
 
                 {/* Social sign-in pages */}
-                <Route path="/callback/:connector" element={<Callback />} />
-                <Route path="/social/link/:connector" element={<SocialLinkAccount />} />
-                <Route path="/social/landing/:connector" element={<SocialLanding />} />
+                <Route path="/callback/:connectorId" element={<Callback />} />
+                <Route path="/social/link/:connectorId" element={<SocialLinkAccount />} />
+                <Route path="/social/landing/:connectorId" element={<SocialLanding />} />
 
                 {/* Always keep route path with param as the last one */}
                 <Route path="/:type/:method/verification-code" element={<VerificationCode />} />
diff --git a/packages/ui/src/pages/Callback/index.tsx b/packages/ui/src/pages/Callback/index.tsx
index e2c118b9e..54822e2ba 100644
--- a/packages/ui/src/pages/Callback/index.tsx
+++ b/packages/ui/src/pages/Callback/index.tsx
@@ -7,11 +7,11 @@ import useSocialCallbackHandler from '@/hooks/use-social-callback-handler';
 import * as styles from './index.module.scss';
 
 type Parameters = {
-  connector: string;
+  connectorId: string;
 };
 
 const Callback = () => {
-  const { connector: connectorId } = useParams<Parameters>();
+  const { connectorId } = useParams<Parameters>();
 
   const { socialCallbackHandler } = useSocialCallbackHandler();
 
diff --git a/packages/ui/src/pages/SocialLanding/index.test.tsx b/packages/ui/src/pages/SocialLanding/index.test.tsx
index 75684d385..08db5fbec 100644
--- a/packages/ui/src/pages/SocialLanding/index.test.tsx
+++ b/packages/ui/src/pages/SocialLanding/index.test.tsx
@@ -33,7 +33,7 @@ describe(`SocialLanding Page`, () => {
       <SettingsProvider>
         <MemoryRouter initialEntries={['/social/landing/github']}>
           <Routes>
-            <Route path="/social/landing/:connector" element={<SocialLanding />} />
+            <Route path="/social/landing/:connectorId" element={<SocialLanding />} />
           </Routes>
         </MemoryRouter>
       </SettingsProvider>
diff --git a/packages/ui/src/pages/SocialLanding/index.tsx b/packages/ui/src/pages/SocialLanding/index.tsx
index 35a48aed9..17f86923b 100644
--- a/packages/ui/src/pages/SocialLanding/index.tsx
+++ b/packages/ui/src/pages/SocialLanding/index.tsx
@@ -7,11 +7,11 @@ import useSocialLandingHandler from '@/hooks/use-social-landing-handler';
 import * as styles from './index.module.scss';
 
 type Parameters = {
-  connector: string;
+  connectorId: string;
 };
 
 const SocialLanding = () => {
-  const { connector: connectorId } = useParams<Parameters>();
+  const { connectorId } = useParams<Parameters>();
   const { loading, socialLandingHandler } = useSocialLandingHandler();
 
   // SocialSignIn Callback Handler
diff --git a/packages/ui/src/pages/SocialLinkAccount/index.test.tsx b/packages/ui/src/pages/SocialLinkAccount/index.test.tsx
index c54c4143a..3702a33dd 100644
--- a/packages/ui/src/pages/SocialLinkAccount/index.test.tsx
+++ b/packages/ui/src/pages/SocialLinkAccount/index.test.tsx
@@ -20,7 +20,7 @@ describe('SocialRegister', () => {
       <SettingsProvider>
         <MemoryRouter initialEntries={['/social/link/github']}>
           <Routes>
-            <Route path="/social/link/:connector" element={<SocialRegister />} />
+            <Route path="/social/link/:connectorId" element={<SocialRegister />} />
           </Routes>
         </MemoryRouter>
       </SettingsProvider>
@@ -43,7 +43,7 @@ describe('SocialRegister', () => {
       >
         <MemoryRouter initialEntries={['/social/link/github']}>
           <Routes>
-            <Route path="/social/link/:connector" element={<SocialRegister />} />
+            <Route path="/social/link/:connectorId" element={<SocialRegister />} />
           </Routes>
         </MemoryRouter>
       </SettingsProvider>
@@ -66,7 +66,7 @@ describe('SocialRegister', () => {
       >
         <MemoryRouter initialEntries={['/social/link/github']}>
           <Routes>
-            <Route path="/social/link/:connector" element={<SocialRegister />} />
+            <Route path="/social/link/:connectorId" element={<SocialRegister />} />
           </Routes>
         </MemoryRouter>
       </SettingsProvider>
@@ -89,7 +89,7 @@ describe('SocialRegister', () => {
       >
         <MemoryRouter initialEntries={['/social/link/github']}>
           <Routes>
-            <Route path="/social/link/:connector" element={<SocialRegister />} />
+            <Route path="/social/link/:connectorId" element={<SocialRegister />} />
           </Routes>
         </MemoryRouter>
       </SettingsProvider>
diff --git a/packages/ui/src/pages/SocialLinkAccount/index.tsx b/packages/ui/src/pages/SocialLinkAccount/index.tsx
index 3f4ca8014..826096a76 100644
--- a/packages/ui/src/pages/SocialLinkAccount/index.tsx
+++ b/packages/ui/src/pages/SocialLinkAccount/index.tsx
@@ -10,7 +10,7 @@ import ErrorPage from '@/pages/ErrorPage';
 import { socialAccountNotExistErrorDataGuard } from '@/types/guard';
 
 type Parameters = {
-  connector: string;
+  connectorId: string;
 };
 
 const getPageTitle = (signUpMethods: SignInIdentifier[]): TFuncKey => {
@@ -33,7 +33,7 @@ const getPageTitle = (signUpMethods: SignInIdentifier[]): TFuncKey => {
 };
 
 const SocialLinkAccount = () => {
-  const { connector } = useParams<Parameters>();
+  const { connectorId } = useParams<Parameters>();
   const { state } = useLocation();
   const { signUpMethods } = useSieMethods();
 
@@ -41,7 +41,7 @@ const SocialLinkAccount = () => {
     return <ErrorPage rawMessage="Missing relate account info" />;
   }
 
-  if (!connector) {
+  if (!connectorId) {
     return <ErrorPage rawMessage="Connector not found" />;
   }
 
@@ -49,7 +49,7 @@ const SocialLinkAccount = () => {
 
   return (
     <SecondaryPageWrapper title={getPageTitle(signUpMethods)}>
-      <SocialLinkAccountContainer connectorId={connector} relatedUser={relatedUser} />
+      <SocialLinkAccountContainer connectorId={connectorId} relatedUser={relatedUser} />
     </SecondaryPageWrapper>
   );
 };
diff --git a/packages/ui/src/pages/SocialSignInCallback/index.test.tsx b/packages/ui/src/pages/SocialSignInCallback/index.test.tsx
index 126a8e606..8f2f7ad69 100644
--- a/packages/ui/src/pages/SocialSignInCallback/index.test.tsx
+++ b/packages/ui/src/pages/SocialSignInCallback/index.test.tsx
@@ -35,7 +35,7 @@ describe('SocialCallbackPage with code', () => {
       <SettingsProvider>
         <MemoryRouter initialEntries={['/sign-in/social/github']}>
           <Routes>
-            <Route path="/sign-in/social/:connector" element={<SocialCallback />} />
+            <Route path="/sign-in/social/:connectorId" element={<SocialCallback />} />
           </Routes>
         </MemoryRouter>
       </SettingsProvider>
diff --git a/packages/ui/src/pages/SocialSignInCallback/index.tsx b/packages/ui/src/pages/SocialSignInCallback/index.tsx
index 985f50c6f..b5514318b 100644
--- a/packages/ui/src/pages/SocialSignInCallback/index.tsx
+++ b/packages/ui/src/pages/SocialSignInCallback/index.tsx
@@ -5,9 +5,9 @@ import useSocialSignInListener from '@/hooks/use-social-sign-in-listener';
 import SignIn from '../SignIn';
 
 const SocialSignInCallback = () => {
-  const parameters = useParams<{ connector: string }>();
+  const parameters = useParams<{ connectorId: string }>();
 
-  useSocialSignInListener(parameters.connector);
+  useSocialSignInListener(parameters.connectorId);
 
   return <SignIn />;
 };