Fix MFA enforcement redirect loop (#4991)

1 files changed, 3 insertions, 22 deletions

diff --git a/webapp/routes/route_root.jsx b/webapp/routes/route_root.jsx
index f72e35302..cd0cb9a5d 100644
--- a/webapp/routes/route_root.jsx
+++ b/webapp/routes/route_root.jsx
@@ -13,7 +13,6 @@ import helpRoute from 'routes/route_help.jsx';
 
 import BrowserStore from 'stores/browser_store.jsx';
 import ErrorStore from 'stores/error_store.jsx';
-import UserStore from 'stores/user_store.jsx';
 import * as UserAgent from 'utils/user_agent.jsx';
 
 import {browserHistory} from 'react-router/es6';
@@ -31,28 +30,10 @@ function preLogin(nextState, replace, callback) {
     callback();
 }
 
-const mfaPaths = [
-    '/mfa/setup',
-    '/mfa/confirm'
-];
-
-const mfaAuthServices = [
-    '',
-    'email',
-    'ldap'
-];
-
 function preLoggedIn(nextState, replace, callback) {
-    if (window.mm_license.MFA === 'true' &&
-            window.mm_config.EnableMultifactorAuthentication === 'true' &&
-            window.mm_config.EnforceMultifactorAuthentication === 'true' &&
-            mfaPaths.indexOf(nextState.location.pathname) === -1) {
-        const user = UserStore.getCurrentUser();
-        if (user && !user.mfa_active &&
-                mfaAuthServices.indexOf(user.auth_service) !== -1) {
-            browserHistory.push('/mfa/setup');
-            return;
-        }
+    if (RouteUtils.checkIfMFARequired(nextState)) {
+        browserHistory.push('/mfa/setup');
+        return;
     }
 
     ErrorStore.clearLastError();