saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-08-11 13:39:07 +00:00
Code Activity

auto-accept existing user if mail is disabled

Browse source 
Apply suggestions from code review

Co-authored-by: Mathijs van Veluw <black.dex@gmail.com>
This commit is contained in:
Stefan Melmuk 2024-07-22 18:00:17 +02:00
commit 3a673d37b7
No known key found for this signature in database
GPG key ID: 817020C608FE9C09
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/api/core/organizations.rs
View file

@ -1030,9 +1030,14 @@ async fn _reinvite_user(org_id: &str, user_org: &str, invited_by_email: &str, co
Some(invited_by_email.to_string()), Some(invited_by_email.to_string()),
) )
.await?; .await?;
} else { } else if user.password_hash.is_empty() {
let invitation = Invitation::new(&user.email); let invitation = Invitation::new(&user.email);
invitation.save(conn).await?; invitation.save(conn).await?;
} else {
let _ = Invitation::take(&user.email, conn).await;
let mut user_org = user_org;
user_org.status = UserOrgStatus::Accepted as i32;
user_org.save(conn).await?;
} }
Ok(()) Ok(())