Browse Source

auto-accept existing user if mail is disabled

Apply suggestions from code review

Co-authored-by: Mathijs van Veluw <black.dex@gmail.com>
pull/4768/head
Stefan Melmuk 9 months ago
parent
commit
3a673d37b7
No known key found for this signature in database GPG Key ID: 817020C608FE9C09
  1. 7
      src/api/core/organizations.rs

7
src/api/core/organizations.rs

@ -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()),
)
.await?;
} else {
} else if user.password_hash.is_empty() {
let invitation = Invitation::new(&user.email);
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(())

Loading…
Cancel
Save