Merge pull request #1179 from DEVTomatoCake/fix/consistent-username-length-requirements
Consistent username length requirement
This commit is contained in:
commit
1f0c41ac5f
@ -1,17 +1,17 @@
|
|||||||
/*
|
/*
|
||||||
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
|
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
|
||||||
Copyright (C) 2023 Spacebar and Spacebar Contributors
|
Copyright (C) 2023 Spacebar and Spacebar Contributors
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU Affero General Public License as published
|
it under the terms of the GNU Affero General Public License as published
|
||||||
by the Free Software Foundation, either version 3 of the License, or
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
(at your option) any later version.
|
(at your option) any later version.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU Affero General Public License for more details.
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
You should have received a copy of the GNU Affero General Public License
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
@ -287,6 +287,16 @@ router.post(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const { maxUsername } = Config.get().limits.user;
|
||||||
|
if (body.username.length > maxUsername) {
|
||||||
|
throw FieldErrors({
|
||||||
|
username: {
|
||||||
|
code: "BASE_TYPE_BAD_LENGTH",
|
||||||
|
message: `Must be between 2 and ${maxUsername} in length.`,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const user = await User.register({ ...body, req });
|
const user = await User.register({ ...body, req });
|
||||||
|
|
||||||
if (body.invite) {
|
if (body.invite) {
|
||||||
|
@ -155,8 +155,8 @@ router.patch(
|
|||||||
if (check_username.length > maxUsername) {
|
if (check_username.length > maxUsername) {
|
||||||
throw FieldErrors({
|
throw FieldErrors({
|
||||||
username: {
|
username: {
|
||||||
code: "USERNAME_INVALID",
|
code: "BASE_TYPE_BAD_LENGTH",
|
||||||
message: `Username must be less than ${maxUsername} in length`,
|
message: `Must be between 2 and ${maxUsername} in length.`,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
/*
|
/*
|
||||||
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
|
Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
|
||||||
Copyright (C) 2023 Spacebar and Spacebar Contributors
|
Copyright (C) 2023 Spacebar and Spacebar Contributors
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
This program is free software: you can redistribute it and/or modify
|
||||||
it under the terms of the GNU Affero General Public License as published
|
it under the terms of the GNU Affero General Public License as published
|
||||||
by the Free Software Foundation, either version 3 of the License, or
|
by the Free Software Foundation, either version 3 of the License, or
|
||||||
(at your option) any later version.
|
(at your option) any later version.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU Affero General Public License for more details.
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
You should have received a copy of the GNU Affero General Public License
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
@ -19,7 +19,6 @@
|
|||||||
export interface RegisterSchema {
|
export interface RegisterSchema {
|
||||||
/**
|
/**
|
||||||
* @minLength 2
|
* @minLength 2
|
||||||
* @maxLength 32
|
|
||||||
*/
|
*/
|
||||||
username: string;
|
username: string;
|
||||||
/**
|
/**
|
||||||
|
@ -18,8 +18,7 @@
|
|||||||
|
|
||||||
export interface UserModifySchema {
|
export interface UserModifySchema {
|
||||||
/**
|
/**
|
||||||
* @minLength 1
|
* @minLength 2
|
||||||
* @maxLength 100
|
|
||||||
*/
|
*/
|
||||||
username?: string;
|
username?: string;
|
||||||
avatar?: string | null;
|
avatar?: string | null;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user