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

MM-24385 Fix ExperimentalStrictCSRFEnforcement (#4207)

Browse source
This commit is contained in:
Elias Nahum 2020-04-23 06:01:20 -04:00 committed by GitHub
parent 135dc8c9bd
commit 3a302eaae7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,6 @@ export function completeLogin(user, deviceToken) {
const token = Client4.getToken();
const url = Client4.getUrl();
setCSRFFromCookie(url);
setAppCredentials(deviceToken, user.id, token, url);
// Set timezone
@ -168,6 +167,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};
}
@ -185,6 +185,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) {
@ -215,7 +216,7 @@ export function forceLogoutIfNecessary(error) {
const state = getState();
const currentUserId = getCurrentUserId(state);
if (currentUserId && error.status_code === HTTP_UNAUTHORIZED && error.url && !error.url.includes('/login')) {
if (error.status_code === HTTP_UNAUTHORIZED && error.url && !error.url.includes('/login')) {
dispatch(logout(true));
return true;
}