Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-22 05:10:29 +01:00
Fix emergency access invites for new users
If a new user gets invited it should check if the user is invited via emergency access, if so, allow that user to register.
Dieser Commit ist enthalten in:
Ursprung
8ba6e61fd5
Commit
76b7de15de
1 geänderte Dateien mit 3 neuen und 6 gelöschten Zeilen
|
@ -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")
|
||||||
}
|
}
|
||||||
|
|
Laden …
In neuem Issue referenzieren