Skip to content

GitLab

mattermost-webapp
mattermost-webapp
Commit 957f6bd5 authored by Christopher Speller's avatar Christopher Speller Committed by JoramWilander
Browse files
Options

Reverting #2060 to fix SAML login. (#2116)

parent 44db65a9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
actions/views/root.js
View file @ 957f6bd5
...@@ -5,8 +5,6 @@ import {getClientConfig, getLicenseConfig} from 'mattermost-redux/actions/genera ...@@ -5,8 +5,6 @@ import {getClientConfig, getLicenseConfig} from 'mattermost-redux/actions/genera
import * as UserActions from 'mattermost-redux/actions/users'; import * as UserActions from 'mattermost-redux/actions/users';
import {Client4} from 'mattermost-redux/client'; import {Client4} from 'mattermost-redux/client';
import LocalStorageStore from 'stores/local_storage_store';
import {ActionTypes} from 'utils/constants'; import {ActionTypes} from 'utils/constants';
export function loadMeAndConfig() { export function loadMeAndConfig() {
...@@ -17,7 +15,7 @@ export function loadMeAndConfig() { ...@@ -17,7 +15,7 @@ export function loadMeAndConfig() {
dispatch(getLicenseConfig()), dispatch(getLicenseConfig()),
]; ];
if (document.cookie.indexOf('MMUSERID=') > -1 && LocalStorageStore.getWasLoggedIn()) { if (document.cookie.indexOf('MMUSERID=') > -1) {
promises.push(dispatch(UserActions.loadMe())); promises.push(dispatch(UserActions.loadMe()));
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment