From 3a673d37b7d7eff4add0a403fae8f304b1cec5ed Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Mon, 22 Jul 2024 18:00:17 +0200 Subject: [PATCH] auto-accept existing user if mail is disabled Apply suggestions from code review Co-authored-by: Mathijs van Veluw --- src/api/core/organizations.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs index 00393668..7b7f5896 100644 --- a/src/api/core/organizations.rs +++ b/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(())