Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-04-07 23:01:25 -05:00
Code Issues Activity

fix(experience): add sso form mode context provider for identifier sign-in/register pages (#6482)

Browse source
This commit is contained in:
Xiao Yijun 2024-08-21 13:30:53 +08:00 • committed by GitHub
parent b8b77526e4
commit 0ec8510789
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/experience/src/components/IdentifierRegisterForm/index.test.tsx
View file

@ -394,11 +394,13 @@ describe('<IdentifierRegisterForm />', () => {
mockSsoConnectors
);
const emailInput = container.querySelector('input[name="id"]');
const termsButton = getByText('description.agree_with_terms');
assert(emailInput, new Error('username input not found'));
act(() => {
fireEvent.change(emailInput, { target: { value: email } });
fireEvent.click(termsButton);
});
await waitFor(() => {

11
packages/experience/src/components/IdentifierRegisterForm/index.tsx
View file

@ -71,12 +71,16 @@ const IdentifierRegisterForm = ({ className, autoFocus, signUpMethods }: Props)
setIdentifierInputValue({ type, value });
if (showSingleSignOnForm) {
await navigateToSingleSignOn();
if (
agreeToTermsPolicy &&
agreeToTermsPolicy !== AgreeToTermsPolicy.Automatic &&
!(await termsValidation())
) {
return;
}
if (!(await termsValidation())) {
if (showSingleSignOnForm) {
await navigateToSingleSignOn();
return;
}
@ -84,6 +88,7 @@ const IdentifierRegisterForm = ({ className, autoFocus, signUpMethods }: Props)
})(event);
},
[
agreeToTermsPolicy,
clearErrorMessage,
handleSubmit,
navigateToSingleSignOn,

5
packages/experience/src/pages/IdentifierRegister/index.tsx
View file

@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next';
import { Navigate } from 'react-router-dom';
import FocusedAuthPageLayout from '@/Layout/FocusedAuthPageLayout';
import SingleSignOnFormModeContextProvider from '@/Providers/SingleSignOnFormModeContextProvider';
import IdentifierRegisterForm from '@/components/IdentifierRegisterForm';
import { useSieMethods } from '@/hooks/use-sie';
import { identifierInputDescriptionMap } from '@/utils/form';
@ -36,7 +37,9 @@ const IdentifierRegister = () => {
text: 'description.all_account_creation_options',
}}
>
<IdentifierRegisterForm signUpMethods={signUpMethods} />
<SingleSignOnFormModeContextProvider>
<IdentifierRegisterForm signUpMethods={signUpMethods} />
</SingleSignOnFormModeContextProvider>
</FocusedAuthPageLayout>
);
};

13
packages/experience/src/pages/IdentifierSignIn/index.tsx
View file

@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
import { Navigate } from 'react-router-dom';
import FocusedAuthPageLayout from '@/Layout/FocusedAuthPageLayout';
import SingleSignOnFormModeContextProvider from '@/Providers/SingleSignOnFormModeContextProvider';
import IdentifierSignInForm from '@/components/IdentifierSignInForm';
import PasswordSignInForm from '@/components/PasswordSignInForm';
import { identifierInputDescriptionMap } from '@/utils/form';
@ -43,11 +44,13 @@ const IdentifierSignIn = () => {
text: 'description.all_sign_in_options',
}}
>
{isPasswordOnly ? (
<PasswordSignInForm signInMethods={signInMethods.map(({ identifier }) => identifier)} />
) : (
<IdentifierSignInForm signInMethods={signInMethods} />
)}
<SingleSignOnFormModeContextProvider>
{isPasswordOnly ? (
<PasswordSignInForm signInMethods={signInMethods.map(({ identifier }) => identifier)} />
) : (
<IdentifierSignInForm signInMethods={signInMethods} />
)}
</SingleSignOnFormModeContextProvider>
</FocusedAuthPageLayout>
);
};