Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-01-27 21:39:16 -05:00
Code Issues Activity

refactor(ui): rename connector params in route path (#3001)

Browse source
This commit is contained in:
simeng-li 2023-01-20 12:35:44 +08:00 • committed by GitHub
parent 0e06a1cf4f
commit a6d16a5164
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/ui/src/App.tsx
View file

@ -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 />} />

4
packages/ui/src/pages/Callback/index.tsx
View file

@ -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();

2
packages/ui/src/pages/SocialLanding/index.test.tsx
View file

@ -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>

4
packages/ui/src/pages/SocialLanding/index.tsx
View file

@ -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

8
packages/ui/src/pages/SocialLinkAccount/index.test.tsx
View file

@ -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>

8
packages/ui/src/pages/SocialLinkAccount/index.tsx
View file

@ -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>
);
};

2
packages/ui/src/pages/SocialSignInCallback/index.test.tsx
View file

@ -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>

4
packages/ui/src/pages/SocialSignInCallback/index.tsx
View file

@ -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 />;
};