diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-01-04 07:14:46 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-01-04 07:14:46 -0500 |
commit | da6aba6e50d2571354b03b67bdd0b0b84f92ce9c (patch) | |
tree | 6e4835fafd574598d05c5a1e1a8479deca89bf2b /web | |
parent | c44873c61b205932bdbf1f81cfc2a9728a6fee31 (diff) | |
parent | 7b4e8cd12840bdba7895bf48edf4a027dcbcb468 (diff) | |
download | chat-da6aba6e50d2571354b03b67bdd0b0b84f92ce9c.tar.gz chat-da6aba6e50d2571354b03b67bdd0b0b84f92ce9c.tar.bz2 chat-da6aba6e50d2571354b03b67bdd0b0b84f92ce9c.zip |
Merge pull request #1769 from mattermost/PLT-1488
PLT-1488 fixing error message from session revoke
Diffstat (limited to 'web')
-rw-r--r-- | web/react/utils/client.jsx | 3 | ||||
-rw-r--r-- | web/templates/head.html | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index 1c417153b..8a4cee589 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -246,6 +246,7 @@ export function loginByEmail(name, email, password, success, error) { data: JSON.stringify({name, email, password}), success: function onSuccess(data, textStatus, xhr) { track('api', 'api_users_login_success', data.team_id, 'email', data.email); + sessionStorage.removeItem(data.id + '_last_error'); BrowserStore.signalLogin(); success(data, textStatus, xhr); }, @@ -267,6 +268,8 @@ export function loginByLdap(teamName, id, password, success, error) { data: JSON.stringify({teamName, id, password}), success: function onSuccess(data, textStatus, xhr) { track('api', 'api_users_loginLdap_success', data.team_id, 'id', id); + sessionStorage.removeItem(data.id + '_last_error'); + BrowserStore.signalLogin(); success(data, textStatus, xhr); }, error: function onError(xhr, status, err) { diff --git a/web/templates/head.html b/web/templates/head.html index c2c40098c..70c94e8ff 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -77,7 +77,7 @@ } console.log('detected login from a different tab'); - window.location.href = '/'; + window.location.href = '/' + window.mm_team.name; } }); }); |