Browse Source

Merged with chat-init

feature/code-cleanup-joca
Djordje Mitrovic 3 years ago
parent
commit
25a0fd1864

+ 1
- 1
src/components/ChatColumn/ChatColumn.js View File

@@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react";
import React, { useState, useEffect } from "react";
import ChatCard from "../Cards/ChatCard/ChatCard";
import {
ChatColumnContainer,

+ 1
- 1
src/store/actions/login/loginActions.js View File

@@ -29,7 +29,7 @@ export const fetchUserError = (payload) => ({
payload,
});

export const updateUserToken = (payload) => ({
export const setUserJwtToken = (payload) => ({
type: UPDATE_USER_JWT_TOKEN,
payload,
});

+ 3
- 2
src/store/saga/loginSaga.js View File

@@ -15,6 +15,7 @@ import {
fetchUserError,
fetchUserSuccess,
resetLoginState,
setUserJwtToken,
} from "../actions/login/loginActions";
import { LOGIN_PAGE } from "../../constants/pages";
import { addHeaderToken, removeHeaderToken } from "../../request";
@@ -30,7 +31,6 @@ import {
authScopeSetHelper,
} from "../../util/helpers/authScopeHelpers";
import { rejectErrorCodeHelper } from "../../util/helpers/rejectErrorCodeHelper";
import { setUserAccessToken } from "../actions/user/userActions";
import i18next from "i18next";
import { attemptFetchProfile } from "../../request/profileRequest";
import { clearProfile, setMineProfile } from "../actions/profile/profileActions";
@@ -127,7 +127,8 @@ function* logout(payload) {
function* refreshUserToken({payload}) {
try {
const newTokenDecoded = jwt.decode(payload);
yield put(setUserAccessToken({token: payload, exp: newTokenDecoded.exp}));

yield put(setUserJwtToken({token: payload, exp: newTokenDecoded.exp}));
yield call(addHeaderToken, payload);
yield call(authScopeSetHelper, JWT_TOKEN, payload);
}

Loading…
Cancel
Save