Fix in auth

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

View File

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

View File

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