From aa5a05960ed504de9df41c58d454467c132c00bf Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Thu, 6 Oct 2022 00:18:20 +0200 Subject: [PATCH] allow registration without invite link if signups are allowed invited users should be able to complete their registration even when they don't have the invite link at hand. --- src/api/core/accounts.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/api/core/accounts.rs b/src/api/core/accounts.rs index a980271b..02390761 100644 --- a/src/api/core/accounts.rs +++ b/src/api/core/accounts.rs @@ -101,11 +101,7 @@ async fn register(data: JsonUpcase, conn: DbConn) -> JsonResult { let mut user = match User::find_by_mail(&email, &conn).await { Some(user) => { if !user.password_hash.is_empty() { - if CONFIG.is_signup_allowed(&email) { - err!("User already exists") - } else { - err!("Registration not allowed or user already exists") - } + err!("Registration not allowed or user already exists") } if let Some(token) = data.Token { @@ -121,10 +117,10 @@ async fn register(data: JsonUpcase, conn: DbConn) -> JsonResult { user_org.save(&conn).await?; } user - } else if EmergencyAccess::find_invited_by_grantee_email(&email, &conn).await.is_some() { + } else if CONFIG.is_signup_allowed(&email) + || EmergencyAccess::find_invited_by_grantee_email(&email, &conn).await.is_some() + { user - } else if CONFIG.is_signup_allowed(&email) { - err!("Account with this email already exists") } else { err!("Registration not allowed or user already exists") }