diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
| commit | 8fb66c2b834ee4e0669de173e5ddfebd56c34d58 (patch) | |
| tree | 9e8e66772d44c4f9010a48c8e0afed70421238b1 /webapp/client/web_client.jsx | |
| parent | 4208e42ba9df02b9c4bd7081179922c21206d83d (diff) | |
| parent | aafb8be87c79c60df7534b3b69f967c6301b157e (diff) | |
| download | chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.gz chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.bz2 chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.zip | |
Merge branch 'release-3.6'
Diffstat (limited to 'webapp/client/web_client.jsx')
| -rw-r--r-- | webapp/client/web_client.jsx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/webapp/client/web_client.jsx b/webapp/client/web_client.jsx index 53e199e66..99f30da37 100644 --- a/webapp/client/web_client.jsx +++ b/webapp/client/web_client.jsx @@ -13,6 +13,11 @@ import request from 'superagent'; const HTTP_UNAUTHORIZED = 401; +const mfaPaths = [ + '/mfa/setup', + '/mfa/confirm' +]; + class WebClientClass extends Client { constructor() { super(); @@ -39,7 +44,9 @@ class WebClientClass extends Client { handleError(err, res) { if (res && res.body && res.body.id === 'api.context.mfa_required.app_error') { - window.location.reload(); + if (mfaPaths.indexOf(window.location.pathname) === -1) { + window.location.reload(); + } return; } |