forks/peertube
1
0
Fork 0
Code Releases Activity

username/display_name/video_channel_name min length 1 and max length 50 (#1265)

Browse source 
* make username, display_name and video_channel_name min length 1 and max length 50; (fixes #1263);
    ! still some bug on the frontend complains but if you remove the disabled property it creates the account just fine;
allow for usernames to start with a number;
fix test, since username can be 1 char now make test check empty;
fix test, Should fail with a too long username;
fix test, Should fail with a too small username;
fix regular expression for username and videoChannel;
change username, videoChannel to be lowercase and fix message;

* change 1 characters to 1 character
This commit is contained in:
BRAINS YUM 2018-12-07 07:54:33 -06:00 • committed by Chocobozzz
parent f3e4d59408
commit d0ce42c1c1
4 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
client/src/app/shared/forms/form-validators/user-validators.service.ts
View file

@ -23,15 +23,15 @@ export class UserValidatorsService {
this.USER_USERNAME = { this.USER_USERNAME = {
VALIDATORS: [ VALIDATORS: [
Validators.required, Validators.required,
Validators.minLength(3), Validators.minLength(1),
Validators.maxLength(20), Validators.maxLength(50),
Validators.pattern(/^[a-z0-9._]+$/) Validators.pattern(/^[a-z0-9][a-z0-9-._]*$/)
], ],
MESSAGES: { MESSAGES: {
'required': this.i18n('Username is required.'), 'required': this.i18n('Username is required.'),
'minlength': this.i18n('Username must be at least 3 characters long.'), 'minlength': this.i18n('Username must be at least 1 character long.'),
'maxlength': this.i18n('Username cannot be more than 20 characters long.'), 'maxlength': this.i18n('Username cannot be more than 50 characters long.'),
'pattern': this.i18n('Username should be only lowercase alphanumeric characters.') 'pattern': this.i18n('Username should be lowercase alphanumeric; dots, dashes and underscores are allowed.')
} }
} }
@ -88,13 +88,13 @@ export class UserValidatorsService {
this.USER_DISPLAY_NAME = { this.USER_DISPLAY_NAME = {
VALIDATORS: [ VALIDATORS: [
Validators.required, Validators.required,
Validators.minLength(3), Validators.minLength(1),
Validators.maxLength(120) Validators.maxLength(50)
], ],
MESSAGES: { MESSAGES: {
'required': this.i18n('Display name is required.'), 'required': this.i18n('Display name is required.'),
'minlength': this.i18n('Display name must be at least 3 characters long.'), 'minlength': this.i18n('Display name must be at least 1 character long.'),
'maxlength': this.i18n('Display name cannot be more than 120 characters long.') 'maxlength': this.i18n('Display name cannot be more than 50 characters long.')
} }
} }

20
client/src/app/shared/forms/form-validators/video-channel-validators.service.ts
View file

@ -14,28 +14,28 @@ export class VideoChannelValidatorsService {
this.VIDEO_CHANNEL_NAME = { this.VIDEO_CHANNEL_NAME = {
VALIDATORS: [ VALIDATORS: [
Validators.required, Validators.required,
Validators.minLength(3), Validators.minLength(1),
Validators.maxLength(20), Validators.maxLength(50),
Validators.pattern(/^[a-z0-9._]+$/) Validators.pattern(/^[a-z0-9][a-z0-9-._]*$/)
], ],
MESSAGES: { MESSAGES: {
'required': this.i18n('Name is required.'), 'required': this.i18n('Name is required.'),
'minlength': this.i18n('Name must be at least 3 characters long.'), 'minlength': this.i18n('Name must be at least 1 character long.'),
'maxlength': this.i18n('Name cannot be more than 20 characters long.'), 'maxlength': this.i18n('Name cannot be more than 50 characters long.'),
'pattern': this.i18n('Name should be only lowercase alphanumeric characters.') 'pattern': this.i18n('Name should be lowercase alphanumeric; dots, dashes and underscores are allowed.')
} }
} }
this.VIDEO_CHANNEL_DISPLAY_NAME = { this.VIDEO_CHANNEL_DISPLAY_NAME = {
VALIDATORS: [ VALIDATORS: [
Validators.required, Validators.required,
Validators.minLength(3), Validators.minLength(1),
Validators.maxLength(120) Validators.maxLength(50)
], ],
MESSAGES: { MESSAGES: {
'required': i18n('Display name is required.'), 'required': i18n('Display name is required.'),
'minlength': i18n('Display name must be at least 3 characters long.'), 'minlength': i18n('Display name must be at least 1 character long.'),
'maxlength': i18n('Display name cannot be more than 120 characters long.') 'maxlength': i18n('Display name cannot be more than 50 characters long.')
} }
} }

6
server/initializers/constants.ts
View file

@ -300,9 +300,9 @@ const CONFIG = {
const CONSTRAINTS_FIELDS = { const CONSTRAINTS_FIELDS = {
USERS: { USERS: {
NAME: { min: 3, max: 120 }, // Length NAME: { min: 1, max: 50 }, // Length
DESCRIPTION: { min: 3, max: 1000 }, // Length DESCRIPTION: { min: 3, max: 1000 }, // Length
USERNAME: { min: 3, max: 20 }, // Length USERNAME: { min: 1, max: 50 }, // Length
PASSWORD: { min: 6, max: 255 }, // Length PASSWORD: { min: 6, max: 255 }, // Length
VIDEO_QUOTA: { min: -1 }, VIDEO_QUOTA: { min: -1 },
VIDEO_QUOTA_DAILY: { min: -1 }, VIDEO_QUOTA_DAILY: { min: -1 },
@ -316,7 +316,7 @@ const CONSTRAINTS_FIELDS = {
REASON: { min: 2, max: 300 } // Length REASON: { min: 2, max: 300 } // Length
}, },
VIDEO_CHANNELS: { VIDEO_CHANNELS: {
NAME: { min: 3, max: 120 }, // Length NAME: { min: 1, max: 50 }, // Length
DESCRIPTION: { min: 3, max: 1000 }, // Length DESCRIPTION: { min: 3, max: 1000 }, // Length
SUPPORT: { min: 3, max: 1000 }, // Length SUPPORT: { min: 3, max: 1000 }, // Length
URL: { min: 3, max: 2000 } // Length URL: { min: 3, max: 2000 } // Length

8
server/tests/api/check-params/users.ts
View file

@ -99,13 +99,13 @@ describe('Test users API validators', function () {
} }
it('Should fail with a too small username', async function () { it('Should fail with a too small username', async function () {
const fields = immutableAssign(baseCorrectParams, { username: 'fi' }) const fields = immutableAssign(baseCorrectParams, { username: '' })
await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
}) })
it('Should fail with a too long username', async function () { it('Should fail with a too long username', async function () {
const fields = immutableAssign(baseCorrectParams, { username: 'my_super_username_which_is_very_long' }) const fields = immutableAssign(baseCorrectParams, { username: 'super'.repeat(11) })
await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
}) })
@ -550,13 +550,13 @@ describe('Test users API validators', function () {
} }
it('Should fail with a too small username', async function () { it('Should fail with a too small username', async function () {
const fields = immutableAssign(baseCorrectParams, { username: 'ji' }) const fields = immutableAssign(baseCorrectParams, { username: '' })
await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields })
}) })
it('Should fail with a too long username', async function () { it('Should fail with a too long username', async function () {
const fields = immutableAssign(baseCorrectParams, { username: 'my_super_username_which_is_very_long' }) const fields = immutableAssign(baseCorrectParams, { username: 'super'.repeat(11) })
await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields })
}) })