From 07e014cd8f046331bd53585b420b449f19feff42 Mon Sep 17 00:00:00 2001
From: sprechtl <sprechtl@htl-steyr.ac.at>
Date: Mon, 10 Oct 2022 00:10:11 +0200
Subject: [PATCH 1/5] new folder structure

---
 frontend/svelte/src/models/{ => repos/note}/NoteRepository.ts   | 2 +-
 .../svelte/src/models/{ => repos/note}/StrapiNoteRepository.ts  | 2 +-
 frontend/svelte/src/models/repos/user/StrapiUserRepo.ts         | 0
 frontend/svelte/src/models/repos/user/UserRepository.ts         | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename frontend/svelte/src/models/{ => repos/note}/NoteRepository.ts (87%)
 rename frontend/svelte/src/models/{ => repos/note}/StrapiNoteRepository.ts (98%)
 create mode 100644 frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
 create mode 100644 frontend/svelte/src/models/repos/user/UserRepository.ts

diff --git a/frontend/svelte/src/models/NoteRepository.ts b/frontend/svelte/src/models/repos/note/NoteRepository.ts
similarity index 87%
rename from frontend/svelte/src/models/NoteRepository.ts
rename to frontend/svelte/src/models/repos/note/NoteRepository.ts
index 1cae27d..4fcda1e 100644
--- a/frontend/svelte/src/models/NoteRepository.ts
+++ b/frontend/svelte/src/models/repos/note/NoteRepository.ts
@@ -1,4 +1,4 @@
-import type {Note} from "./types";
+import type {Note} from "../../types";
 
 export interface NoteRepository {
     getNotes(): Promise<Note[]>;
diff --git a/frontend/svelte/src/models/StrapiNoteRepository.ts b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts
similarity index 98%
rename from frontend/svelte/src/models/StrapiNoteRepository.ts
rename to frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts
index 8b3f668..fff1952 100644
--- a/frontend/svelte/src/models/StrapiNoteRepository.ts
+++ b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts
@@ -1,4 +1,4 @@
-import type {Note} from "./types";
+import type {Note} from "../../types";
 import {parseCookies} from "nookies";
 import type {NoteRepository} from "./NoteRepository";
 
diff --git a/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts b/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
new file mode 100644
index 0000000..e69de29
diff --git a/frontend/svelte/src/models/repos/user/UserRepository.ts b/frontend/svelte/src/models/repos/user/UserRepository.ts
new file mode 100644
index 0000000..e69de29

From d66b9272b775efec7ef04da8f1d32a59cbe95c1f Mon Sep 17 00:00:00 2001
From: sprechtl <sprechtl@htl-steyr.ac.at>
Date: Mon, 10 Oct 2022 01:21:53 +0200
Subject: [PATCH 2/5] Repo for USER started

---
 frontend/svelte/src/models/PomeloUtils.ts     | 24 +++---
 .../login => }/models/authentication.ts       |  2 +-
 .../models/repos/note/StrapiNoteRepository.ts |  2 +-
 .../src/models/repos/user/StrapiUserRepo.ts   | 77 +++++++++++++++++++
 .../src/models/repos/user/UserRepository.ts   | 19 +++++
 frontend/svelte/src/routes/+page.svelte       | 11 +--
 frontend/svelte/src/routes/login/+page.svelte | 51 ++++--------
 .../svelte/src/routes/register/+page.svelte   | 46 ++++-------
 8 files changed, 146 insertions(+), 86 deletions(-)
 rename frontend/svelte/src/{routes/login => }/models/authentication.ts (70%)

diff --git a/frontend/svelte/src/models/PomeloUtils.ts b/frontend/svelte/src/models/PomeloUtils.ts
index 5d290ae..cfec11b 100644
--- a/frontend/svelte/src/models/PomeloUtils.ts
+++ b/frontend/svelte/src/models/PomeloUtils.ts
@@ -1,4 +1,5 @@
-import {parseCookies} from "nookies";
+import type {Authentication} from "./authentication";
+import {createErrorToast} from "./customToasts";
 
 /**
  * Capitalises first letter of string.
@@ -22,13 +23,14 @@ export async function bearerFetch(endpoint: string, jwt: string, baseUrl: string
     });
 }
 
-
-const getJwtCookie = () => {
-    // @ts-ignore
-    return parseCookies("/").jwt;
-};
-
-/**
- * JWT Cookie
- */
-export const jwt: string = getJwtCookie();
\ No newline at end of file
+export function handleErrorsFromResponseWithToast(response: Authentication) {
+    if (response.error != null) {
+        if (response.error.details.errors) {
+            for (const error of response.error.details.errors) {
+                createErrorToast(error.message);
+            }
+        } else {
+            createErrorToast(response.error.message);
+        }
+    }
+}
\ No newline at end of file
diff --git a/frontend/svelte/src/routes/login/models/authentication.ts b/frontend/svelte/src/models/authentication.ts
similarity index 70%
rename from frontend/svelte/src/routes/login/models/authentication.ts
rename to frontend/svelte/src/models/authentication.ts
index dccb434..c5adc10 100644
--- a/frontend/svelte/src/routes/login/models/authentication.ts
+++ b/frontend/svelte/src/models/authentication.ts
@@ -1,4 +1,4 @@
-import type {User} from "../../../models/user";
+import type {User} from "./user";
 
 /**
  * User Login Auth.
diff --git a/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts
index fff1952..2a4ef83 100644
--- a/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts
+++ b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts
@@ -66,7 +66,7 @@ export class StrapiNoteRepository implements NoteRepository {
         return "bearer TOKEN"
     }
 
-    private static getAuthorizationHeader() {
+    static getAuthorizationHeader() {
         const jwt = parseCookies().jwt;
         return `bearer ${jwt}`
     }
diff --git a/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts b/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
index e69de29..7c08cd5 100644
--- a/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
+++ b/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
@@ -0,0 +1,77 @@
+import type {UserRepository} from "./UserRepository";
+import type {Authentication} from "../../authentication";
+import {parseCookies} from "nookies";
+import type {HttpMethod} from "@sveltejs/kit/types/private";
+import {StrapiNoteRepository} from "../note/StrapiNoteRepository";
+
+export class StrapiUserRepo implements UserRepository {
+    private static instance: StrapiUserRepo;
+
+    public static getInstance(): StrapiUserRepo {
+        if (this.instance === undefined || this.instance === null) {
+            this.instance = new StrapiUserRepo();
+            this.instance.setup().then(() => {
+                if (!this.instance.currentUser?.jwt) {
+                    window.location.href = "/login";
+                }
+            });
+        }
+        return this.instance;
+    }
+
+    public currentUser?: Authentication;
+
+    private constructor() {
+    }
+
+    private static api: string = "http://localhost:1337/api"
+
+    private static apiUserEndpoint: string = StrapiUserRepo.api + "/local/auth"
+
+    /**
+     * Sets the current user.
+     * @private
+     */
+    private async setup() {
+        this.currentUser = await this.getMe(parseCookies().jwt);
+    }
+
+    async getMe(jwt: string): Promise<Authentication> {
+        const response = await StrapiUserRepo.fetchStrapi("/me", "GET", null, true, "/users")
+        return await response.json();
+    }
+
+    async registerUser(email: string, username: string, password: string): Promise<Authentication> {
+        const payload = {
+            email: email,
+            password: password,
+            username: username
+        };
+        const response = await StrapiUserRepo.fetchStrapi("/register", "POST", payload, false);
+        return await response.json();
+    }
+
+    async loginUser(identifier: string, password: string): Promise<Authentication> {
+        const payload = {
+            identifier: identifier,
+            password: password
+        };
+        const response = await StrapiUserRepo.fetchStrapi("/", "POST", payload, false);
+        return response.json();
+    }
+
+    private static async fetchStrapi(path: string, method: HttpMethod, body: any | null = null, authorization: boolean = true, customPath: any = null): Promise<Response> {
+        let requestInit: RequestInit = {
+            method: method,
+        };
+        if (authorization){
+            requestInit["headers"] = {
+                authorization: StrapiNoteRepository.getAuthorizationHeader(),
+            }
+        }
+        if (body) {
+            requestInit["body"] = JSON.stringify({data: body});
+        }
+        return await fetch((customPath) ? (this.api + customPath + path) : StrapiUserRepo.apiUserEndpoint + path, requestInit);
+    }
+}
\ No newline at end of file
diff --git a/frontend/svelte/src/models/repos/user/UserRepository.ts b/frontend/svelte/src/models/repos/user/UserRepository.ts
index e69de29..3128bfb 100644
--- a/frontend/svelte/src/models/repos/user/UserRepository.ts
+++ b/frontend/svelte/src/models/repos/user/UserRepository.ts
@@ -0,0 +1,19 @@
+import type {Authentication} from "../../authentication";
+
+export interface UserRepository {
+    /**
+     * Registers a new user.
+     * @param email
+     * @param username
+     * @param password
+     */
+    registerUser(email: string, username: string, password: string): Promise<Authentication>;
+
+    /**
+     * Gets the current user.
+     * @param jwt
+     */
+    getMe(jwt: string): Promise<Authentication>;
+
+    loginUser(identifier: string, password: string): Promise<Authentication>;
+}
\ No newline at end of file
diff --git a/frontend/svelte/src/routes/+page.svelte b/frontend/svelte/src/routes/+page.svelte
index f52d418..d276084 100644
--- a/frontend/svelte/src/routes/+page.svelte
+++ b/frontend/svelte/src/routes/+page.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
     import type {Note} from "../models/types";
     import {onMount} from "svelte";
-    import {bearerFetch, jwt} from "../models/PomeloUtils";
+    import {bearerFetch} from "../models/PomeloUtils";
+    import {StrapiUserRepo} from "../models/repos/user/StrapiUserRepo";
 
     const endpoint = "/notes";
 
@@ -14,7 +15,7 @@
 
     let notes: Note[];
     onMount(async () => {
-        const response = await bearerFetch(endpoint, jwt);
+        const response = await bearerFetch(endpoint, StrapiUserRepo.getInstance().currentUser.jwt);
         let data = await response.json();
         notes = data.data;
         notes.forEach(note => {
@@ -114,11 +115,11 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta content="width=device-width, initial-scale=1" name="viewport">
     <title>PomeloNote | Home</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.3.0/font/bootstrap-icons.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
+    <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css"
+          integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" rel="stylesheet">
 </head>
 
 <body>
diff --git a/frontend/svelte/src/routes/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte
index fee4156..6c122c7 100644
--- a/frontend/svelte/src/routes/login/+page.svelte
+++ b/frontend/svelte/src/routes/login/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import {setCookie} from "nookies";
-    import type {Authentication} from "./models/authentication";
-    import { SvelteToast } from '@zerodevx/svelte-toast'
-    import {createErrorToast} from "../../models/customToasts";
+    import {SvelteToast} from '@zerodevx/svelte-toast'
     import logo from "../../resources/images/logo2.svg";
+    import {handleErrorsFromResponseWithToast} from "../../models/PomeloUtils";
+    import {StrapiUserRepo} from "../../models/repos/user/StrapiUserRepo";
 
     let user: string;
     let password: string;
@@ -14,31 +14,12 @@
      * Handles the button click.
      */
     async function handleSubmit() {
-        const endpoint = "http://localhost:1337/api/auth/local";
-        const payload = {
-            identifier: user,
-            password: password
-        };
+        const userRepo: StrapiUserRepo = StrapiUserRepo.getInstance();
 
-        const login = await fetch(endpoint, {
-            method: 'post',
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify(payload)
-        })
+        const response = await userRepo.loginUser(user, password);
 
-        const response: Authentication = await login.json();
-
-        if (response.error != null){
-            if (response.error.details.errors){
-                for (const error of response.error.details.errors) {
-                    createErrorToast(error.message);
-                }
-            } else{
-                createErrorToast(response.error.message);
-            }
+        if (response.error != null) {
+            handleErrorsFromResponseWithToast(response);
         } else {
             if (rememberMe) {
                 setCookie(null, 'jwt', response.jwt, {
@@ -56,34 +37,34 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta content="width=device-width, initial-scale=1" name="viewport">
     <title>PomeloNote | Login</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
+    <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css"
+          integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" rel="stylesheet">
 </head>
 
 <body>
 <main class="form-signin w-100 m-auto">
 
-    <img class="img-fluid" src="{logo}" alt="Logo">
+    <img alt="Logo" class="img-fluid" src="{logo}">
     <h1 class="h3 mb-3 fw-normal">Please sign in</h1>
 
     <div class="form-floating">
-        <input type="email" class="form-control" id="floatingInput" placeholder="name@example.com" bind:value={user}>
+        <input bind:value={user} class="form-control" id="floatingInput" placeholder="name@example.com" type="email">
         <label for="floatingInput">Email address or username</label>
     </div>
     <div class="form-floating">
-        <input type="password" class="form-control" id="floatingPassword" placeholder="Password" bind:value={password}>
+        <input bind:value={password} class="form-control" id="floatingPassword" placeholder="Password" type="password">
         <label for="floatingPassword">Password</label>
     </div>
 
     <div class="checkbox mb-3">
         <label>
-            <input type="checkbox" value="rememberMe" bind:checked={rememberMe}> Remember me
+            <input bind:checked={rememberMe} type="checkbox" value="rememberMe"> Remember me
         </label>
     </div>
     <button class="w-100 btn btn-lg btn-primary" on:click={handleSubmit}>Sign in</button>
-    <a href="/register" class="opacity-75 d-flex justify-content-center text-center fs-6">No user yet? Register.</a>
+    <a class="opacity-75 d-flex justify-content-center text-center fs-6" href="/register">No user yet? Register.</a>
     <p class="mt-5 mb-3 text-muted">&copy;2022</p>
 
 </main>
@@ -126,7 +107,7 @@
         border-top-right-radius: 0;
     }
 
-    .img-fluid{
+    .img-fluid {
         margin-bottom: 15px;
     }
 </style>
\ No newline at end of file
diff --git a/frontend/svelte/src/routes/register/+page.svelte b/frontend/svelte/src/routes/register/+page.svelte
index 88e7cea..67ae41a 100644
--- a/frontend/svelte/src/routes/register/+page.svelte
+++ b/frontend/svelte/src/routes/register/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import logo from "../../resources/images/logo2.svg";
     import {SvelteToast} from "@zerodevx/svelte-toast";
-    import type {Authentication} from "../login/models/authentication";
-    import {createErrorToast} from "../../models/customToasts";
+    import {StrapiUserRepo} from "../../models/repos/user/StrapiUserRepo";
+    import {handleErrorsFromResponseWithToast} from "../../models/PomeloUtils";
 
     let user: string;
     let password: string;
@@ -13,32 +13,12 @@
      * Handles the button click.
      */
     async function handleSubmit() {
-        const endpoint = "http://localhost:1337/api/auth/local/register";
-        const payload = {
-            email: email,
-            password: password,
-            username: user
-        };
+        const userRepo: StrapiUserRepo = StrapiUserRepo.getInstance();
 
-        const login = await fetch(endpoint, {
-            method: 'post',
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify(payload)
-        })
-
-        const response: Authentication = await login.json();
+        const response = await userRepo.registerUser(email, user, password);
 
         if (response.error != null) {
-            if (response.error.details.errors) {
-                for (const error of response.error.details.errors) {
-                    createErrorToast(error.message);
-                }
-            } else {
-                createErrorToast(response.error.message);
-            }
+            handleErrorsFromResponseWithToast(response);
         } else {
             window.location = "/login";
         }
@@ -49,29 +29,29 @@
         lang="en">
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta content="width=device-width, initial-scale=1" name="viewport">
     <title>PomeloNote | Register</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" crossorigin="anonymous">
+    <link crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.1/dist/css/bootstrap.min.css"
+          integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" rel="stylesheet">
 </head>
 
 <body>
 <main class="form-signin w-100 m-auto">
 
-    <img class="img-fluid" src="{logo}" alt="Logo">
+    <img alt="Logo" class="img-fluid" src="{logo}">
     <h1 class="h3 mb-3 fw-normal">Register a new user</h1>
 
     <div class="form-floating">
-        <input type="text" class="form-control" id="floatingUsr" placeholder="exampleUsername" bind:value={user}>
+        <input bind:value={user} class="form-control" id="floatingUsr" placeholder="exampleUsername" type="text">
         <label for="floatingUsr">Username</label>
     </div>
 
     <div class="form-floating">
-        <input type="email" class="form-control" id="floatingInput" placeholder="name@example.com" bind:value={email}>
+        <input bind:value={email} class="form-control" id="floatingInput" placeholder="name@example.com" type="email">
         <label for="floatingInput">Email address</label>
     </div>
     <div class="form-floating">
-        <input type="password" class="form-control" id="floatingPassword" placeholder="Password" bind:value={password}>
+        <input bind:value={password} class="form-control" id="floatingPassword" placeholder="Password" type="password">
         <label for="floatingPassword">Password</label>
     </div>
 
@@ -79,7 +59,7 @@
         Register user
         {#if user}: {user} {/if}
     </button>
-    <a href="/login" class="opacity-75 d-flex justify-content-center text-center fs-6">Already registered? Login.</a>
+    <a class="opacity-75 d-flex justify-content-center text-center fs-6" href="/login">Already registered? Login.</a>
     <p class="mt-5 mb-3 text-muted">&copy;2022</p>
 
 </main>

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 3/5] 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%;

From 6fd7726ae0a83583f68ca5054dadc39f6db6384c Mon Sep 17 00:00:00 2001
From: s-prechtl <sprechtl@htl-steyr.ac.at>
Date: Thu, 13 Oct 2022 08:54:24 +0200
Subject: [PATCH 4/5] UserRepo Working

---
 .../src/models/repos/note/StrapiNoteRepository.ts |  2 +-
 .../src/models/repos/user/StrapiUserRepo.ts       | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts
index 7420149..2646b90 100644
--- a/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts
+++ b/frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts
@@ -71,7 +71,7 @@ export class StrapiNoteRepository implements NoteRepository {
     }
 
     static getAuthorizationHeader() {
-        const jwt = parseCookies().jwt;
+        const jwt = parseCookies('/').jwt;
         return `bearer ${jwt}`
     }
 }
\ No newline at end of file
diff --git a/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts b/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
index 2d000a3..959bc51 100644
--- a/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
+++ b/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
@@ -64,13 +64,24 @@ export class StrapiUserRepo implements UserRepository {
         let requestInit: RequestInit = {
             method: method,
         };
-        if (authorization){
+        if (authorization && body) {
+            requestInit["headers"] = {
+                authorization: StrapiNoteRepository.getAuthorizationHeader() ?? '',
+                'Accept': 'application/json',
+                'Content-Type': 'application/json'
+            }
+        } else if (authorization){
             requestInit["headers"] = {
                 authorization: StrapiNoteRepository.getAuthorizationHeader() ?? '',
             }
+        } else if (body) {
+            requestInit["headers"] = {
+                'Accept': 'application/json',
+                'Content-Type': 'application/json'
+            }
         }
         if (body) {
-            requestInit["body"] = JSON.stringify({data: body});
+            requestInit["body"] = JSON.stringify(body)
         }
         return await fetch((customPath) ? (this.api + customPath + path) : StrapiUserRepo.apiUserEndpoint + path, requestInit);
     }

From ad23d05000f4b7c745dba1809c8c3cbe1b370147 Mon Sep 17 00:00:00 2001
From: sprechtl <sprechtl@htl-steyr.ac.at>
Date: Sun, 16 Oct 2022 23:42:40 +0200
Subject: [PATCH 5/5] No beauty but worky

---
 .../src/models/repos/user/StrapiUserRepo.ts   | 27 +++++++++++--------
 frontend/svelte/src/routes/+page.svelte       |  4 ++-
 frontend/svelte/src/routes/login/+page.svelte | 10 ++-----
 .../svelte/src/routes/register/+page.svelte   |  2 +-
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts b/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
index 959bc51..58f2ea2 100644
--- a/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
+++ b/frontend/svelte/src/models/repos/user/StrapiUserRepo.ts
@@ -1,25 +1,26 @@
 import type {UserRepository} from "./UserRepository";
 import type {Authentication} from "../../authentication";
-import {parseCookies} from "nookies";
 import type {HttpMethod} from "@sveltejs/kit/types/private";
 import {StrapiNoteRepository} from "../note/StrapiNoteRepository";
+import {error} from "@sveltejs/kit";
+import {User} from "../../user";
 
 export class StrapiUserRepo implements UserRepository {
     private static instance: StrapiUserRepo;
 
-    public static getInstance(): StrapiUserRepo {
+    public static getInstance(verification: boolean = true): StrapiUserRepo {
         if (this.instance === undefined || this.instance === null) {
             this.instance = new StrapiUserRepo();
-            this.instance.setup().then(() => {
-                if (!this.instance.currentUser?.jwt) {
-                    //window.location.href = "/login";
+            this.instance.verify().then(() => {
+                if (verification && !this.instance.verified) {
+                    window.location.href = "/login";
                 }
             });
         }
         return this.instance;
     }
 
-    public currentUser?: Authentication;
+    private verified: boolean = false;
 
     private constructor() {
     }
@@ -29,14 +30,18 @@ export class StrapiUserRepo implements UserRepository {
     private static apiUserEndpoint: string = StrapiUserRepo.api + "/auth/local"
 
     /**
-     * Sets the current user.
+     * Verifies the current users jwt.
      * @private
      */
-    private async setup() {
-        this.currentUser = await this.getMe(parseCookies().jwt);
+    private async verify() {
+        this.verified = false;
+        let result = await this.getMe();
+        if (!result.error) {
+            this.verified = true;
+        }
     }
 
-    async getMe(jwt: string): Promise<Authentication> {
+    async getMe(): Promise<Authentication> {
         const response = await StrapiUserRepo.fetchStrapi("/me", "GET", null, true, "/users")
         return await response.json();
     }
@@ -70,7 +75,7 @@ export class StrapiUserRepo implements UserRepository {
                 'Accept': 'application/json',
                 'Content-Type': 'application/json'
             }
-        } else if (authorization){
+        } else if (authorization) {
             requestInit["headers"] = {
                 authorization: StrapiNoteRepository.getAuthorizationHeader() ?? '',
             }
diff --git a/frontend/svelte/src/routes/+page.svelte b/frontend/svelte/src/routes/+page.svelte
index ef1e0fc..28d5957 100644
--- a/frontend/svelte/src/routes/+page.svelte
+++ b/frontend/svelte/src/routes/+page.svelte
@@ -1,12 +1,14 @@
 <script lang="ts">
     import type {Note} from "../models/types";
     import {onMount} from "svelte";
-    import {StrapiNoteRepository} from "../models/StrapiNoteRepository";
+    import {StrapiNoteRepository} from "../models/repos/note/StrapiNoteRepository";
+    import {StrapiUserRepo} from "../models/repos/user/StrapiUserRepo";
 
     const noteRepo: StrapiNoteRepository = StrapiNoteRepository.getInstance();
     let notes: Note[];
 
     onMount(async () => {
+        StrapiUserRepo.getInstance();
         notes = await noteRepo.getNotes();
         notes.forEach(note => {
             note.lastViewed = new Date(note.lastViewed);
diff --git a/frontend/svelte/src/routes/login/+page.svelte b/frontend/svelte/src/routes/login/+page.svelte
index 6027022..537507d 100644
--- a/frontend/svelte/src/routes/login/+page.svelte
+++ b/frontend/svelte/src/routes/login/+page.svelte
@@ -14,7 +14,7 @@
      * Handles the button click.
      */
     async function handleSubmit() {
-        const userRepo: StrapiUserRepo = StrapiUserRepo.getInstance();
+        const userRepo: StrapiUserRepo = StrapiUserRepo.getInstance(false);
 
         const response = await userRepo.loginUser(user, password);
 
@@ -50,7 +50,7 @@
     <h1 class="h3 mb-3 fw-normal">Please sign in</h1>
 
     <div class="form-floating">
-        <input bind:value={user} class="form-control" id="floatingInput" placeholder="name@example.com" type="email">
+        <input bind:value={user} class="form-control" id="floatingInput" placeholder="name@example.com" type="text">
         <label for="floatingInput">Email address or username</label>
     </div>
     <div class="form-floating">
@@ -75,10 +75,4 @@
 <style>
     @import "../../userInput.css";
     @import "../../customBootstrap.css";
-
-    .form-signin input[type="email"] {
-        margin-bottom: -1px !important;
-        border-bottom-right-radius: 0 !important;
-        border-bottom-left-radius: 0 !important;
-    }
 </style>
\ No newline at end of file
diff --git a/frontend/svelte/src/routes/register/+page.svelte b/frontend/svelte/src/routes/register/+page.svelte
index d5b6704..93dac34 100644
--- a/frontend/svelte/src/routes/register/+page.svelte
+++ b/frontend/svelte/src/routes/register/+page.svelte
@@ -13,7 +13,7 @@
      * Handles the button click.
      */
     async function handleSubmit() {
-        const userRepo: StrapiUserRepo = StrapiUserRepo.getInstance();
+        const userRepo: StrapiUserRepo = StrapiUserRepo.getInstance(false);
 
         const response = await userRepo.registerUser(email, user, password);