Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-19 05:09:43 +02:00
Code Issues Releases Activity

Allow dots in username. Closes #116

Browse source
This commit is contained in:
Maksim Eltyshev 2021-04-13 18:59:02 +05:00
parent ad60517603
commit 253bdcda7a
5 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/utils/validator.js
View file

@ -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) => {

4
server/api/controllers/access-tokens/create.js
View file

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

2
server/api/controllers/users/create.js
View file

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

2
server/api/controllers/users/update-username.js
View file

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

2
server/api/models/User.js
View file

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