dahjah/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-06-01 12:15:53 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge 994ee0d374 into f21a3adae2

Browse Source
This commit is contained in:
Phạm Minh Hoàng Nam 2026-05-03 09:30:58 +02:00 committed by GitHub
commit 17336c9ed4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/api/core/organizations.rs
View File

@ -1090,6 +1090,11 @@ async fn send_invite(
if !CONFIG.mail_enabled() && !user.password_hash.is_empty() { if !CONFIG.mail_enabled() && !user.password_hash.is_empty() {
member_status = MembershipStatus::Accepted as i32; member_status = MembershipStatus::Accepted as i32;
} }
// SSO_ONLY users have no master password and cannot use the email invite
// acceptance flow, so automatically accept them
if CONFIG.sso_enabled() && CONFIG.sso_only() && user.password_hash.is_empty() {
member_status = MembershipStatus::Accepted as i32;
}
user user
} }
} }
@ -1101,7 +1106,10 @@ async fn send_invite(
new_member.status = member_status; new_member.status = member_status;
new_member.save(&conn).await?; new_member.save(&conn).await?;
if CONFIG.mail_enabled() { // Only send the invite email if the member is still in the Invited state.
// SSO_ONLY users are auto-accepted above and should not receive an invite
// email with a link they cannot use.
if CONFIG.mail_enabled() && member_status == MembershipStatus::Invited as i32 {
let org_name = match Organization::find_by_uuid(&org_id, &conn).await { let org_name = match Organization::find_by_uuid(&org_id, &conn).await {
Some(org) => org.name, Some(org) => org.name,
None => err!("Error looking up organization"), None => err!("Error looking up organization"),
@ -1237,12 +1245,18 @@ async fn _reinvite_member(
err!("Invitations are not allowed.") err!("Invitations are not allowed.")
} }
let org_name = match Organization::find_by_uuid(org_id, conn).await { if CONFIG.sso_enabled() && CONFIG.sso_only() && user.password_hash.is_empty() {
Some(org) => org.name, // SSO_ONLY users have no master password and cannot use the email invite
None => err!("Error looking up organization."), // acceptance flow, so automatically accept them
}; Invitation::take(&user.email, conn).await;
let mut member = member;
if CONFIG.mail_enabled() { member.status = MembershipStatus::Accepted as i32;
member.save(conn).await?;
} else if CONFIG.mail_enabled() {
let org_name = match Organization::find_by_uuid(org_id, conn).await {
Some(org) => org.name,
None => err!("Error looking up organization."),
};
mail::send_invite(&user, org_id.clone(), member.uuid, &org_name, Some(invited_by_email.to_string())).await?; mail::send_invite(&user, org_id.clone(), member.uuid, &org_name, Some(invited_by_email.to_string())).await?;
} else if user.password_hash.is_empty() { } else if user.password_hash.is_empty() {
let invitation = Invitation::new(&user.email); let invitation = Invitation::new(&user.email);