octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-17 18:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-emergency-invite-register' of https://github.com/BlackDex/vaultwarden into BlackDex-fix-emergency-invite-register

Browse Source
This commit is contained in:
Daniel García 2022-01-23 23:42:35 +01:00
commit 14e3dcad8e
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/core/accounts.rs
View File

@ -87,14 +87,11 @@ fn register(data: JsonUpcase<RegisterData>, conn: DbConn) -> EmptyResult {
user_org.status = UserOrgStatus::Accepted as i32; user_org.status = UserOrgStatus::Accepted as i32;
user_org.save(&conn)?; user_org.save(&conn)?;
} }
user
} else if EmergencyAccess::find_invited_by_grantee_email(&email, &conn).is_some() {
user user
} else if CONFIG.is_signup_allowed(&email) { } else if CONFIG.is_signup_allowed(&email) {
// check if it's invited by emergency contact err!("Account with this email already exists")
match EmergencyAccess::find_invited_by_grantee_email(&data.Email, &conn) {
Some(_) => user,
_ => err!("Account with this email already exists"),
}
} else { } else {
err!("Registration not allowed or user already exists") err!("Registration not allowed or user already exists")
} }