lfk/kiosk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix in auth

Browse Source
This commit is contained in:
Nicolai Ort 2023-04-19 11:44:00 +02:00
parent 5a81cb64f5
commit 710cad376e
Signed by: niggl
GPG Key ID: 13AFA55AF62F269F
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/userstore.ts
View File

@ -34,7 +34,7 @@ const userStore = () => {
localStorage.setItem('userdata', JSON.stringify(state)); localStorage.setItem('userdata', JSON.stringify(state));
localStorage.setItem('access_token', state.access_token); localStorage.setItem('access_token', state.access_token);
localStorage.setItem('refresh_token', state.refresh_token); OpenAPI.TOKEN = resAuth.access_token;
return state; return state;
}); });
}, },
@ -46,9 +46,9 @@ const userStore = () => {
this.logout(); this.logout();
} }
}, },
loginFromStorage() { async loginFromStorage() {
console.log('loginFromStorage'); console.log('loginFromStorage');
const access_token = localStorage.getItem('token'); const access_token = localStorage.getItem('access_token');
if (!access_token) { if (!access_token) {
throw new Error('Unauthorized'); throw new Error('Unauthorized');
} }
@ -63,10 +63,12 @@ const userStore = () => {
state.refreshInterval = setInterval(() => { state.refreshInterval = setInterval(() => {
this.refreshAuth(); this.refreshAuth();
}, 2 * 60000); }, 2 * 60000);
OpenAPI.TOKEN = userdata.access_token;
return state; return state;
}); });
this.refreshAuth await this.refreshAuth();
}, },
async logout() { async logout() {
update((state: UserState) => { update((state: UserState) => {

6
src/routes/registration/+layout.svelte
View File

@ -4,14 +4,14 @@
$: loginRendered = false; $: loginRendered = false;
onMount(() => { onMount(async () => {
try { try {
userstore.loginFromStorage(); await userstore.loginFromStorage();
loginRendered = true; loginRendered = true;
} catch (error) { } catch (error) {
console.log(error); console.log(error);
userstore.logout(); userstore.logout();
location.replace(`${location.pathname}/login`); location.replace(`/login`);
} }
}); });
</script> </script>