summaryrefslogtreecommitdiffstats
path: root/webapp/routes/route_team.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-01-12 19:59:37 -0500
committerChristopher Speller <crspeller@gmail.com>2017-01-12 19:59:37 -0500
commit8fb66c2b834ee4e0669de173e5ddfebd56c34d58 (patch)
tree9e8e66772d44c4f9010a48c8e0afed70421238b1 /webapp/routes/route_team.jsx
parent4208e42ba9df02b9c4bd7081179922c21206d83d (diff)
parentaafb8be87c79c60df7534b3b69f967c6301b157e (diff)
downloadchat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.gz
chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.bz2
chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.zip
Merge branch 'release-3.6'
Diffstat (limited to 'webapp/routes/route_team.jsx')
-rw-r--r--webapp/routes/route_team.jsx5
1 files changed, 5 insertions, 0 deletions
diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx
index 8416b91c0..4cc85c81b 100644
--- a/webapp/routes/route_team.jsx
+++ b/webapp/routes/route_team.jsx
@@ -61,6 +61,11 @@ function doChannelChange(state, replace, callback) {
}
function preNeedsTeam(nextState, replace, callback) {
+ if (RouteUtils.checkIfMFARequired(nextState)) {
+ browserHistory.push('/mfa/setup');
+ return;
+ }
+
// First check to make sure you're in the current team
// for the current url.
const teamName = nextState.params.team;