From 0ab40af3f7431e28686a5a14e4ddfd5c5516b906 Mon Sep 17 00:00:00 2001
From: Israel Sant'Anna <ibsantanna@inf.ufpr.br>
Date: Mon, 31 May 2021 11:40:08 -0300
Subject: [PATCH] Fix token authentication error
---
.../HelperFunctions/getAxiosConfig.js | 23 +++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/Components/HelperFunctions/getAxiosConfig.js b/src/Components/HelperFunctions/getAxiosConfig.js
index 6d1608bc..159d3950 100644
--- a/src/Components/HelperFunctions/getAxiosConfig.js
+++ b/src/Components/HelperFunctions/getAxiosConfig.js
@@ -9,7 +9,9 @@ export function getAxiosConfigFromJSON () {
export function updateHeaders (newHeaders) {
- sessionStorage.setItem('@portalmec/accessToken', newHeaders['access-token'])
+ let newToken = getNewAccessToken(newHeaders['access-token'])
+
+ sessionStorage.setItem('@portalmec/accessToken', newToken)
let auth_headers = JSON.parse(sessionStorage.getItem('@portalmec/auth_headers'))
/*const auth_headers = {
@@ -79,16 +81,27 @@ function checkPreviousTokens (new_token) {
}
+function getNewAccessToken (newAccessToken) {
+ if (!newAccessToken || newAccessToken.trim().length === 0) {
+ return JSON.parse(sessionStorage.getItem('@portalmec/accessToken'))
+ }
+ else {
+ return newAccessToken
+ }
+}
+
+
function updateAccessToken (newAccessToken) {
+ let newToken = getNewAccessToken(newAccessToken)
- if (checkPreviousTokens(newAccessToken)) {
+ if (checkPreviousTokens(newToken)) {
- sessionStorage.setItem('@portalmec/accessToken', newAccessToken)
+ sessionStorage.setItem('@portalmec/accessToken', newToken)
let auth_headers = JSON.parse(sessionStorage.getItem('@portalmec/auth_headers'))
if (auth_headers) {
- auth_headers['access-token'] = newAccessToken
+ auth_headers['access-token'] = newToken
}
sessionStorage.setItem('@portalmec/auth_headers', JSON.stringify(auth_headers))
@@ -264,6 +277,7 @@ export const validateGoogleLoginToken = (url, config, onSuccess, onError) => {
}
sessionStorage.setItem('@portalmec/auth_headers', JSON.stringify(auth_headers))
+ sessionStorage.setItem('@portalmec/accessToken', auth_headers["access-token"])
return response.json().catch(err => {
return {};
@@ -298,6 +312,7 @@ export async function authentication (url, payload, onSuccess, onError) {
}
sessionStorage.setItem('@portalmec/auth_headers', JSON.stringify(auth_headers))
+ sessionStorage.setItem('@portalmec/accessToken', auth_headers["access-token"])
let json = await response.json().catch(err => {
return {};
--
GitLab