From 757037d5bc053bbe7a1cd6686d4e9e2037a05c90 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 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/api/core/accounts.rs b/src/api/core/accounts.rs index 3520269875..92a94c8470 100644 --- a/src/api/core/accounts.rs +++ b/src/api/core/accounts.rs @@ -101,11 +101,7 @@ async fn register(data: JsonUpcase, conn: DbConn) -> EmptyResult { 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 { @@ -124,7 +120,7 @@ async fn register(data: JsonUpcase, conn: DbConn) -> EmptyResult { } else if 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") + user } else { err!("Registration not allowed or user already exists") }