Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-02-17 22:04:19 -05:00
Code Issues Activity

refactor(ui): update the check username api (#2294)

Browse source
This commit is contained in:
simeng-li 2022-11-02 11:39:06 +08:00 • committed by GitHub
parent 69f7534b32
commit de870d6def
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/ui/src/apis/register.ts
View file

@ -73,10 +73,9 @@ export const verifyRegisterEmailPasscode = async (email: string, code: string) =
}) })
.json<Response>(); .json<Response>();
// TODO: @simeng LOG-4503 export const checkUsername = async (username: string) => {
export const verifyUsernameExistence = async (username: string) => {
await api await api
.post(`${apiPrefix}/check/username`, { .post(`${apiPrefix}/register/password/check-username`, {
json: { json: {
username, username,
}, },

12
packages/ui/src/containers/UsernameRegister/index.test.tsx
View file

@ -2,7 +2,7 @@ import { fireEvent, act, waitFor } from '@testing-library/react';
import renderWithPageContext from '@/__mocks__/RenderWithPageContext'; import renderWithPageContext from '@/__mocks__/RenderWithPageContext';
import SettingsProvider from '@/__mocks__/RenderWithPageContext/SettingsProvider'; import SettingsProvider from '@/__mocks__/RenderWithPageContext/SettingsProvider';
import { verifyUsernameExistence } from '@/apis/register'; import { checkUsername } from '@/apis/register';
import UsernameRegister from '.'; import UsernameRegister from '.';
@ -14,7 +14,7 @@ jest.mock('react-router-dom', () => ({
})); }));
jest.mock('@/apis/register', () => ({ jest.mock('@/apis/register', () => ({
verifyUsernameExistence: jest.fn(async () => ({})), checkUsername: jest.fn(async () => ({})),
})); }));
describe('<UsernameRegister />', () => { describe('<UsernameRegister />', () => {
@ -40,7 +40,7 @@ describe('<UsernameRegister />', () => {
expect(queryByText('username_required')).not.toBeNull(); expect(queryByText('username_required')).not.toBeNull();
expect(verifyUsernameExistence).not.toBeCalled(); expect(checkUsername).not.toBeCalled();
}); });
test('username with initial numeric char should throw', () => { test('username with initial numeric char should throw', () => {
@ -57,7 +57,7 @@ describe('<UsernameRegister />', () => {
expect(queryByText('username_should_not_start_with_number')).not.toBeNull(); expect(queryByText('username_should_not_start_with_number')).not.toBeNull();
expect(verifyUsernameExistence).not.toBeCalled(); expect(checkUsername).not.toBeCalled();
// Clear error // Clear error
if (usernameInput) { if (usernameInput) {
@ -80,7 +80,7 @@ describe('<UsernameRegister />', () => {
expect(queryByText('username_valid_charset')).not.toBeNull(); expect(queryByText('username_valid_charset')).not.toBeNull();
expect(verifyUsernameExistence).not.toBeCalled(); expect(checkUsername).not.toBeCalled();
// Clear error // Clear error
if (usernameInput) { if (usernameInput) {
@ -111,7 +111,7 @@ describe('<UsernameRegister />', () => {
}); });
await waitFor(() => { await waitFor(() => {
expect(verifyUsernameExistence).toBeCalledWith('username'); expect(checkUsername).toBeCalledWith('username');
}); });
}); });
}); });

8
packages/ui/src/containers/UsernameRegister/index.tsx
View file

@ -4,7 +4,7 @@ import { useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { verifyUsernameExistence } from '@/apis/register'; import { checkUsername } from '@/apis/register';
import Button from '@/components/Button'; import Button from '@/components/Button';
import Input from '@/components/Input'; import Input from '@/components/Input';
import TermsOfUse from '@/containers/TermsOfUse'; import TermsOfUse from '@/containers/TermsOfUse';
@ -54,7 +54,7 @@ const UsernameRegister = ({ className }: Props) => {
[setFieldErrors] [setFieldErrors]
); );
const { run: asyncVerifyUsername } = useApi(verifyUsernameExistence, errorHandlers); const { run: asyncCheckUsername } = useApi(checkUsername, errorHandlers);
const onSubmitHandler = useCallback( const onSubmitHandler = useCallback(
async (event?: React.FormEvent<HTMLFormElement>) => { async (event?: React.FormEvent<HTMLFormElement>) => {
@ -71,7 +71,7 @@ const UsernameRegister = ({ className }: Props) => {
const { username } = fieldValue; const { username } = fieldValue;
// Use sync call for this api to make sure the username value being passed to the password set page stays the same // Use sync call for this api to make sure the username value being passed to the password set page stays the same
const result = await asyncVerifyUsername(username); const result = await asyncCheckUsername(username);
if (result) { if (result) {
navigate(`/${UserFlow.register}/${SignInIdentifier.Username}/password`, { navigate(`/${UserFlow.register}/${SignInIdentifier.Username}/password`, {
@ -79,7 +79,7 @@ const UsernameRegister = ({ className }: Props) => {
}); });
} }
}, },
[validateForm, termsValidation, fieldValue, asyncVerifyUsername, navigate] [validateForm, termsValidation, fieldValue, asyncCheckUsername, navigate]
); );
return ( return (