From 710cad376eb865a0c82743a7213c3f4097027c23 Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Wed, 19 Apr 2023 11:44:00 +0200
Subject: [PATCH] Fix in auth

---
 src/lib/userstore.ts                   | 10 ++++++----
 src/routes/registration/+layout.svelte |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/lib/userstore.ts b/src/lib/userstore.ts
index 39e61bc..a64a5e8 100644
--- a/src/lib/userstore.ts
+++ b/src/lib/userstore.ts
@@ -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) => {
diff --git a/src/routes/registration/+layout.svelte b/src/routes/registration/+layout.svelte
index 1eaa6b7..0f2d4e2 100644
--- a/src/routes/registration/+layout.svelte
+++ b/src/routes/registration/+layout.svelte
@@ -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>