use the new session management

This commit is contained in:
Sven Czarnian
2022-11-04 21:04:45 +01:00
parent acea193aa0
commit fc05ae4546
8 changed files with 44 additions and 60 deletions

View File

@@ -1,5 +1,6 @@
import React from 'react';
import { useSearchParams } from 'react-router-dom';
import { Session } from '../services';
export const Auth: React.FC = () => {
const [searchParams] = useSearchParams();
@@ -7,11 +8,11 @@ export const Auth: React.FC = () => {
const baseUrl = `${window.location.protocol}//${window.location.host}`
if (token) {
sessionStorage.setItem('token', token);
window.location.href = `${baseUrl}/overview`;
Session.setBearerToken(token);
window.location.replace(`${baseUrl}/overview`);
} else {
sessionStorage.removeItem('token');
window.location.href = `${baseUrl}`;
Session.reset();
window.location.replace(`${baseUrl}/`);
}
return <></>;

View File

@@ -1,11 +1,11 @@
import React, { useEffect } from 'react';
import { Button } from 'primereact/button';
import { Card } from 'primereact/card';
import { Configuration } from '../services';
import { Configuration, Session } from '../services';
export const Login: React.FC = () => {
// reset every old token
useEffect(() => sessionStorage.removeItem('token'), []);
useEffect(() => Session.reset(), []);
const redirectToVatsim = () => {
const url = [

View File

@@ -1,22 +1,15 @@
import React, { useContext, useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { AuthContext } from '../contexts';
import { Session } from '../services';
export const Logout: React.FC = () => {
const context = useContext(AuthContext);
const navigate = useNavigate();
useEffect(() => {
sessionStorage.removeItem('token');
context.setAuth({
valid: false,
user: {
vatsimId: '',
fullName: '',
administrator: false,
airportConfigurationAccess: [],
},
});
Session.reset();
context.resetAuth();
navigate('/');
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);