yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 02:09:37 +02:00
Code Issues Releases Wiki Activity

feat(API): permissive email check in login, reset & verification (#6648)

Browse source 
* feat(API): permissive email check in reset & verification

In order to not force users to be case sensitive when asking for
password reset or resend email verification. When there's multiple
emails where the only difference in the local is the capitalized
letters, in those cases the users has to be case sensitive.

closes #6570

* feat(API/login): permissive email handling

Allow case insensitive email when there's no other candidate.

closes #6570

* code review changes

* Fix tests

* Add more duplicate email checks

---------

Co-authored-by: Chocobozzz <me@florianbigard.com>
This commit is contained in:
kontrollanten 2025-01-28 14:16:43 +01:00 • committed by GitHub
parent 9f64909fc7
commit a51fb3f35e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 247 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/core/lib/auth/oauth.ts
View file

@ -154,12 +154,14 @@ async function handlePasswordGrant (options: {
const user = await getUser(usernameOrEmail, password, bypassLogin)
if (!user) {
const registration = await UserRegistrationModel.loadByEmailOrUsername(usernameOrEmail)
const registrations = await UserRegistrationModel.listByEmailCaseInsensitiveOrUsername(usernameOrEmail)
if (registration?.state === UserRegistrationState.REJECTED) {
throw new RegistrationApprovalRejected('Registration approval for this account has been rejected')
} else if (registration?.state === UserRegistrationState.PENDING) {
throw new RegistrationWaitingForApproval('Registration for this account is awaiting approval')
if (registrations.length === 1) {
if (registrations[0].state === UserRegistrationState.REJECTED) {
throw new RegistrationApprovalRejected('Registration approval for this account has been rejected')
} else if (registrations[0].state === UserRegistrationState.PENDING) {
throw new RegistrationWaitingForApproval('Registration for this account is awaiting approval')
}
}
throw new InvalidGrantError('Invalid grant: user credentials are invalid')