From f319e022fe705b2e551f80b358c2f65496a59752 Mon Sep 17 00:00:00 2001 From: wrzesinski-hubert Date: Mon, 25 Jan 2021 18:37:47 +0100 Subject: [PATCH] priviligies --- src/contexts/CASProvider.tsx | 6 +++++- src/utils/axiosInstance.ts | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/contexts/CASProvider.tsx b/src/contexts/CASProvider.tsx index 6422d52..97ce6ca 100644 --- a/src/contexts/CASProvider.tsx +++ b/src/contexts/CASProvider.tsx @@ -1,6 +1,7 @@ import React, { useState, useEffect, createContext, ReactNode } from 'react'; import { LoggedUser } from '../types'; -import { axiosInstance } from '../utils/axiosInstance'; +import { axiosInstance, getNewTokens } from '../utils/axiosInstance'; + export interface CASContext { user: LoggedUser | undefined; @@ -42,6 +43,9 @@ export const CASProvider = ({ children }: CASProviderProps) => { localStorage.setItem('refreshToken', user.refreshToken); setIsFetchingToken(false); } + else{ + getNewTokens(); + } const token = localStorage.getItem('userToken'); const refreshToken = localStorage.getItem('refreshToken'); const role = localStorage.getItem('userPrivilige'); diff --git a/src/utils/axiosInstance.ts b/src/utils/axiosInstance.ts index 066c670..d0081c4 100644 --- a/src/utils/axiosInstance.ts +++ b/src/utils/axiosInstance.ts @@ -3,12 +3,14 @@ import axios from 'axios'; export const axiosInstance = axios.create(); //getting new tokens -const getNewTokens = async () => { +export const getNewTokens = async () => { try { const refreshToken = localStorage.getItem('refreshToken'); const { data } = await axiosInstance.get( `${process.env.REACT_APP_API_URL}/token/refresh?refreshToken=${refreshToken}`, ); + console.log("12312321",data); + localStorage.setItem('userPrivilige',data.authorityRole); localStorage.setItem('userToken', data.token); localStorage.setItem('refreshToken', data.refreshToken); return data.token;