vw_small

commit 042c1072d9f35003348815288693324028646a5d
parent e245e965baaef161c7407f5eead1115641d27a4f
Author: Nick Fox <nick@foxsec.net>
Date:   Mon, 17 Dec 2018 17:02:15 -0500

Remove CONFIG.email_invitation option

Diffstat:
M
src/api/core/organizations.rs
 | 
2
+-
M
src/main.rs
 | 
2
--

2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
@@ -479,7 +479,7 @@ fn send_invite(org_id: String, data: JsonUpcase<InviteData>, headers: AdminHeade
             }
         }
 
-        if CONFIG.email_invitations {
+        if CONFIG.mail.is_some() {
             use crate::mail;
             use chrono::{Duration, Utc};
             let time_now = Utc::now().naive_utc();
diff --git a/src/main.rs b/src/main.rs
@@ -271,7 +271,6 @@ pub struct Config {
     local_icon_extractor: bool,
     signups_allowed: bool,
     invitations_allowed: bool,
-    email_invitations: bool,
     server_admin_email: Option<String>,
     password_iterations: i32,
     show_password_hint: bool,
@@ -322,7 +321,6 @@ impl Config {
             signups_allowed: get_env_or("SIGNUPS_ALLOWED", true),
             server_admin_email: get_env("SERVER_ADMIN_EMAIL"),
             invitations_allowed: get_env_or("INVITATIONS_ALLOWED", true),
-            email_invitations: get_env_or("EMAIL_INVITATIONS", false),
             password_iterations: get_env_or("PASSWORD_ITERATIONS", 100_000),
             show_password_hint: get_env_or("SHOW_PASSWORD_HINT", true),