From 2d193969f7115e6a24aeff9691741d0c9b7609db Mon Sep 17 00:00:00 2001
From: s-prechtl <sprechtl@htl-steyr.ac.at>
Date: Tue, 11 Oct 2022 09:32:14 +0200
Subject: [PATCH] UserRepo fixed oda so

---
 .../src/models/repos/user/StrapiUserRepo.ts    |  6 +++---
 frontend/svelte/src/routes/+page.ts            | 18 ++----------------
 frontend/svelte/src/routes/login/+page.svelte  |  1 +
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts b/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
index 7c08cd5..2d000a3 100644
--- a/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
+++ b/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
@@ -12,7 +12,7 @@ export class StrapiUserRepo implements UserRepository {
             this.instance = new StrapiUserRepo();
             this.instance.setup().then(() => {
                 if (!this.instance.currentUser?.jwt) {
-                    window.location.href = "/login";
+                    //window.location.href = "/login";
                 }
             });
         }
@@ -26,7 +26,7 @@ export class StrapiUserRepo implements UserRepository {
 
     private static api: string = "http://localhost:1337/api"
 
-    private static apiUserEndpoint: string = StrapiUserRepo.api + "/local/auth"
+    private static apiUserEndpoint: string = StrapiUserRepo.api + "/auth/local"
 
     /**
      * Sets the current user.
@@ -66,7 +66,7 @@ export class StrapiUserRepo implements UserRepository {
         };
         if (authorization){
             requestInit["headers"] = {
-                authorization: StrapiNoteRepository.getAuthorizationHeader(),
+                authorization: StrapiNoteRepository.getAuthorizationHeader() ?? '',
             }
         }
         if (body) {
diff --git a/frontend/svelte/src/routes/+page.ts b/frontend/svelte/src/routes/+page.ts
index 49e20b3..3ebf8ca 100644
--- a/frontend/svelte/src/routes/+page.ts
+++ b/frontend/svelte/src/routes/+page.ts
@@ -1,20 +1,6 @@
-import {bearerFetch, jwt} from "../models/PomeloUtils";
+import {StrapiUserRepo} from "../models/repos/user/StrapiUserRepo";
 
 /** @type {import('./$types').PageLoad} */
 export async function load() {
-    let invalid = !jwt;
-
-    if (!invalid) {
-        const request = await bearerFetch("/users/me", jwt);
-        const response = await request.json();
-
-        invalid = "error" in response;
-    }
-
-    if (invalid) {
-        if (typeof window !== 'undefined') {
-            // @ts-ignore
-            window.location = "/login";
-        }
-    }
+    // StrapiUserRepo.getInstance();
 }
\ No newline at end of file
diff --git a/frontend/svelte/src/routes/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte
index 6c122c7..95e3c6c 100644
--- a/frontend/svelte/src/routes/login/+page.svelte
+++ b/frontend/svelte/src/routes/login/+page.svelte
@@ -74,6 +74,7 @@
 
 
 <style>
+    @import "src";
     html,
     body {
         height: 100%;