diff --git a/src/components/Topbar.tsx b/src/components/Topbar.tsx index 31cd3ad..2115041 100644 --- a/src/components/Topbar.tsx +++ b/src/components/Topbar.tsx @@ -162,7 +162,7 @@ export default function ({ handleTransfer }: TopbarProps) { - + {/* */} { try { if (!sessionStorage.getItem('userToken')) { const { data: token } = await axiosInstance.get(`${process.env.REACT_APP_API_URL}/token?ticket=${ticket}`); - sessionStorage.setItem('userToken', token); + sessionStorage.setItem('userToken', token.token); } - const token = sessionStorage.getItem('userToken'); - setToken(token); + const tokenik:any = JSON.parse(sessionStorage.getItem('userToken')as string); + const token: Token = { + authorityRole: tokenik.authorityRole, + email: tokenik.email, + id: tokenik.id, + token: tokenik.token, + }; + setToken(token.token); } catch (e) { console.log(e); } diff --git a/src/contexts/UsersProvider.tsx b/src/contexts/UsersProvider.tsx index 6e1c16d..e74dcc0 100644 --- a/src/contexts/UsersProvider.tsx +++ b/src/contexts/UsersProvider.tsx @@ -17,7 +17,7 @@ export const UsersProvider = ({ children }: UsersProviderProps) => { const getUsers = async () => { try { - const {data}= await axiosInstance.get>(`${process.env.REACT_APP_API_URL}/api/v1/users/student/search?query=`); + const {data}= await axiosInstance.get>(`${process.env.REACT_APP_API_URL}/api/v1/users/students`); setUsers(data); console.log(data); } catch(e){ diff --git a/src/types/index.ts b/src/types/index.ts index e354efc..1379203 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -27,6 +27,13 @@ export interface Course { classes?: Array; } +export interface Token { + authorityRole: string, + email: string, + id: number, + token: string, +} + export interface User { email: string; id: number;