Allow dots in username. Closes #116

pull/119/head
Maksim Eltyshev 5 years ago
parent fb42ed460e
commit 0fb60eb886

@ -1,4 +1,4 @@
const USERNAME_REGEX = /^[a-zA-Z0-9]+(_?[a-zA-Z0-9])*$/; const USERNAME_REGEX = /^[a-zA-Z0-9]+((_|\.)?[a-zA-Z0-9])*$/;
// eslint-disable-next-line import/prefer-default-export // eslint-disable-next-line import/prefer-default-export
export const isUsername = (string) => { export const isUsername = (string) => {

@ -17,7 +17,9 @@ module.exports = {
custom: (value) => custom: (value) =>
value.includes('@') value.includes('@')
? validator.isEmail(value) ? validator.isEmail(value)
: value.length >= 3 && value.length <= 16 && /^[a-zA-Z0-9]+(_?[a-zA-Z0-9])*$/.test(value), : value.length >= 3 &&
value.length <= 16 &&
/^[a-zA-Z0-9]+((_|\.)?[a-zA-Z0-9])*$/.test(value),
required: true, required: true,
}, },
password: { password: {

@ -27,7 +27,7 @@ module.exports = {
isNotEmptyString: true, isNotEmptyString: true,
minLength: 3, minLength: 3,
maxLength: 16, maxLength: 16,
regex: /^[a-zA-Z0-9]+(_?[a-zA-Z0-9])*$/, regex: /^[a-zA-Z0-9]+((_|\.)?[a-zA-Z0-9])*$/,
allowNull: true, allowNull: true,
}, },
phone: { phone: {

@ -23,7 +23,7 @@ module.exports = {
isNotEmptyString: true, isNotEmptyString: true,
minLength: 3, minLength: 3,
maxLength: 16, maxLength: 16,
regex: /^[a-zA-Z0-9]+(_?[a-zA-Z0-9])*$/, regex: /^[a-zA-Z0-9]+((_|\.)?[a-zA-Z0-9])*$/,
allowNull: true, allowNull: true,
}, },
currentPassword: { currentPassword: {

@ -34,7 +34,7 @@ module.exports = {
isNotEmptyString: true, isNotEmptyString: true,
minLength: 3, minLength: 3,
maxLength: 16, maxLength: 16,
regex: /^[a-zA-Z0-9]+(_?[a-zA-Z0-9])*$/, regex: /^[a-zA-Z0-9]+((_|\.)?[a-zA-Z0-9])*$/,
allowNull: true, allowNull: true,
}, },
avatarDirname: { avatarDirname: {

Loading…
Cancel
Save