toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Automated cherry pick of #4207 (#4213)

Browse source 
* MM-24385 Fix ExperimentalStrictCSRFEnforcement

* Fix ESLint errors

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
This commit is contained in:
Mattermost Build 2020-04-23 13:55:49 +02:00 committed by GitHub
parent da701268d5
commit 7f66fe84a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/actions/views/user.js
View file

@ -26,7 +26,6 @@ export function completeLogin(user, deviceToken) {
const token = Client4.getToken();
const url = Client4.getUrl();
setCSRFFromCookie(url);
setAppCredentials(deviceToken, user.id, token, url);
// Set timezone
@ -125,6 +124,7 @@ export function login(loginId, password, mfaToken, ldapOnly = false) {
try {
user = await Client4.login(loginId, password, mfaToken, deviceToken, ldapOnly);
await setCSRFFromCookie(Client4.getUrl());
} catch (error) {
return {error};
}
@ -142,6 +142,7 @@ export function login(loginId, password, mfaToken, ldapOnly = false) {
export function ssoLogin(token) {
return async (dispatch) => {
Client4.setToken(token);
await setCSRFFromCookie(Client4.getUrl());
const result = await dispatch(loadMe());
if (!result.error) {
@ -167,11 +168,8 @@ export function logout(skipServerLogout = false) {
}
export function forceLogoutIfNecessary(error) {
return async (dispatch, getState) => {
const state = getState();
const currentUserId = getCurrentUserId(state);
if (currentUserId && error.status_code === HTTP_UNAUTHORIZED && error.url && !error.url.includes('/login')) {
return async (dispatch) => {
if (error.status_code === HTTP_UNAUTHORIZED && error.url && !error.url.includes('/login')) {
dispatch(logout(true));
return true;
}