Removed isEmailEnabledSynchronous and switched the email disabled warnings to use ConfigStore

3 files changed, 4 insertions, 23 deletions

diff --git a/web/react/components/invite_member_modal.jsx b/web/react/components/invite_member_modal.jsx
index fb3d46b0a..ef63465c8 100644
--- a/web/react/components/invite_member_modal.jsx
+++ b/web/react/components/invite_member_modal.jsx
@@ -2,6 +2,7 @@
 // See License.txt for license information.
 
 var utils = require('../utils/utils.jsx');
+var ConfigStore = require('../stores/config_store.jsx');
 var Client = require('../utils/client.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var ConfirmModal = require('./confirm_modal.jsx');
@@ -152,7 +153,7 @@ module.exports = React.createClass({
             emailErrors: {},
             firstNameErrors: {},
             lastNameErrors: {},
-            emailEnabled: Client.isEmailEnabledSynchronous()
+            emailEnabled: !ConfigStore.getSettingAsBoolean('ByPassEmail', false)
         };
     },
     render: function() {
diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx
index ee690f692..e27fcd19d 100644
--- a/web/react/components/signup_team_complete.jsx
+++ b/web/react/components/signup_team_complete.jsx
@@ -2,6 +2,7 @@
 // See License.txt for license information.
 
 var utils = require('../utils/utils.jsx');
+var ConfigStore = require('../stores/config_store.jsx');
 var client = require('../utils/client.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var BrowserStore = require('../stores/browser_store.jsx');
@@ -500,7 +501,7 @@ SendInivtesPage = React.createClass({
     },
     getInitialState: function() {
         return {
-            emailEnabled: client.isEmailEnabledSynchronous()
+            emailEnabled: !ConfigStore.getSettingAsBoolean('ByPassEmail', false)
         };
     },
     render: function() {
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index 250e3edbd..8178ab01a 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -864,24 +864,3 @@ function getConfig(success, error) {
     });
 };
 module.exports.getConfig = getConfig;
-
-module.exports.isEmailEnabledSynchronous = function() {
-    var enabled = false;
-
-    $.ajax({
-        async: false,
-        url: '/api/v1/config/get/bypass_email',
-        dataType: 'json',
-        type: 'GET',
-        success: function(value) {
-            enabled = !value;
-        },
-        error: function(xhr, status, err) {
-            if (status !== '200') {
-                handleError('isEmailEnabled', xhr, status, err);
-            }
-        }
-    });
-
-    return enabled;
-};