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

fix(ui): align the username regex with backend (#3460)

Browse source
This commit is contained in:
simeng-li 2023-03-17 16:13:32 +08:00 • committed by GitHub
parent d462addfde
commit 8a28e0d9d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/ui/src/utils/form.ts
View file

@ -1,3 +1,4 @@
import { usernameRegEx, emailRegEx } from '@logto/core-kit';
import { SignInIdentifier } from '@logto/schemas'; import { SignInIdentifier } from '@logto/schemas';
import i18next from 'i18next'; import i18next from 'i18next';
import { parsePhoneNumberWithError, ParseError } from 'libphonenumber-js/mobile'; import { parsePhoneNumberWithError, ParseError } from 'libphonenumber-js/mobile';
@ -9,9 +10,8 @@ import { parseE164Number, parsePhoneNumber } from '@/utils/country-code';
const { t } = i18next; const { t } = i18next;
const usernameRegex = /^[A-Z_a-z-][\w-]*$/; // We validate the password format step by step to provide more detailed error messages at the front end.
const emailRegex = /^\S+@\S+\.\S+$/; // The overall password format regex passwordRegEx is defined in the '@logto/core-kit' need to align these two.
const specialChars = /[!"#$%&'()*+,./:;<=>?@[\]^_`{|}~-]/; const specialChars = /[!"#$%&'()*+,./:;<=>?@[\]^_`{|}~-]/;
const digits = /\d/; const digits = /\d/;
const letters = /[A-Za-z]/; const letters = /[A-Za-z]/;
@ -28,13 +28,13 @@ export const validateUsername = (username: string): ErrorType | undefined => {
return 'username_should_not_start_with_number'; return 'username_should_not_start_with_number';
} }
if (!usernameRegex.test(username)) { if (!usernameRegEx.test(username)) {
return 'username_invalid_charset'; return 'username_invalid_charset';
} }
}; };
export const validateEmail = (email: string): ErrorType | undefined => { export const validateEmail = (email: string): ErrorType | undefined => {
if (!emailRegex.test(email)) { if (!emailRegEx.test(email)) {
return 'invalid_email'; return 'invalid_email';
} }
}; };