From bf90d98136965dfd37546e5ecb23d8c6970bed8a Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 30 Mar 2016 11:07:03 -0400 Subject: Fixing session and logout errors --- webapp/utils/client.jsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'webapp/utils') diff --git a/webapp/utils/client.jsx b/webapp/utils/client.jsx index a596d1e14..854aa31dc 100644 --- a/webapp/utils/client.jsx +++ b/webapp/utils/client.jsx @@ -50,12 +50,8 @@ function handleError(methodName, xhr, status, err) { track('api', 'api_weberror', methodName, 'message', msg); if (xhr.status === 401) { - if (window.location.href.indexOf('/channels') === 0) { - browserHistory.push('/login?extra=expired&redirect=' + encodeURIComponent(window.location.pathname + window.location.search)); - } else { - var teamURL = window.location.pathname.split('/channels')[0]; - browserHistory.push(teamURL + '/login?extra=expired&redirect=' + encodeURIComponent(window.location.pathname + window.location.search)); - } + const team = window.location.pathname.split('/')[1]; + browserHistory.push('/' + team + '/login?extra=expired&redirect=' + encodeURIComponent(window.location.pathname + window.location.search)); } return e; -- cgit v1.2.3-1-g7c22