OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

More specific message when signup is not allowed

pull/5840/head
Chocobozzz 2023-06-05 08:53:31 +02:00
parent a45e2971f7
commit 4e9a98669f
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/lib/signup.ts
View File

@ -15,11 +15,11 @@ async function isSignupAllowed (options: {
const { signupMode } = options const { signupMode } = options
if (CONFIG.SIGNUP.ENABLED === false) { if (CONFIG.SIGNUP.ENABLED === false) {
return { allowed: false } return { allowed: false, errorMessage: 'User registration is not allowed' }
} }
if (signupMode === 'direct-registration' && CONFIG.SIGNUP.REQUIRES_APPROVAL === true) { if (signupMode === 'direct-registration' && CONFIG.SIGNUP.REQUIRES_APPROVAL === true) {
return { allowed: false } return { allowed: false, errorMessage: 'User registration requires approval' }
} }
// No limit and signup is enabled // No limit and signup is enabled
@ -29,7 +29,7 @@ async function isSignupAllowed (options: {
const totalUsers = await UserModel.countTotal() const totalUsers = await UserModel.countTotal()
return { allowed: totalUsers < CONFIG.SIGNUP.LIMIT } return { allowed: totalUsers < CONFIG.SIGNUP.LIMIT, errorMessage: 'User limit is reached on this instance' }
} }
function isSignupAllowedForCurrentIP (ip: string) { function isSignupAllowedForCurrentIP (ip: string) {

2
server/middlewares/validators/user-registrations.ts
View File

@ -59,7 +59,7 @@ function ensureUserRegistrationAllowedFactory (signupMode: SignupMode) {
if (allowedResult.allowed === false) { if (allowedResult.allowed === false) {
return res.fail({ return res.fail({
status: HttpStatusCode.FORBIDDEN_403, status: HttpStatusCode.FORBIDDEN_403,
message: allowedResult.errorMessage || 'User registration is not enabled, user limit is reached or registration requires approval.' message: allowedResult.errorMessage || 'User registration is not allowed'
}) })
} }