Repo for USER started

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
     });
 }
 
-
+export function handleErrorsFromResponseWithToast(response: Authentication) {
-const getJwtCookie = () => {
+    if (response.error != null) {
-    // @ts-ignore
+        if (response.error.details.errors) {
-    return parseCookies("/").jwt;
+            for (const error of response.error.details.errors) {
-};
+                createErrorToast(error.message);
-
+            }
-/**
+        } else {
- * JWT Cookie
+            createErrorToast(response.error.message);
- */
+        }
-export const jwt: string = getJwtCookie();
+    }
+}

frontend/svelte/src/models/authentication.ts

@@ -1,4 +1,4 @@
-import type {User} from "../../../models/user";
+import type {User} from "./user";
 
 /**
  * User Login Auth.

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}`
     }

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);
+    }
+}

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>;
+}

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"
+    <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" crossorigin="anonymous">
+          integrity="sha384-iYQeCzEYFbKjA/T2uDLTpkwGzCiq6soy8tYaI1GyVh/UjpbCx/TYkiZhlZB6+fzT" rel="stylesheet">
 </head>
 
 <body>

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 { SvelteToast } from '@zerodevx/svelte-toast'
-    import {createErrorToast} from "../../models/customToasts";
     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 userRepo: StrapiUserRepo = StrapiUserRepo.getInstance();
-        const payload = {
-            identifier: user,
-            password: password
-        };
 
-        const login = await fetch(endpoint, {
+        const response = await userRepo.loginUser(user, password);
-            method: 'post',
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify(payload)
-        })
 
-        const response: Authentication = await login.json();
+        if (response.error != null) {
-
+            handleErrorsFromResponseWithToast(response);
-        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);
-            }
         } 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"
+    <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" crossorigin="anonymous">
+          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>

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 {StrapiUserRepo} from "../../models/repos/user/StrapiUserRepo";
-    import {createErrorToast} from "../../models/customToasts";
+    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 userRepo: StrapiUserRepo = StrapiUserRepo.getInstance();
-        const payload = {
-            email: email,
-            password: password,
-            username: user
-        };
 
-        const login = await fetch(endpoint, {
+        const response = await userRepo.registerUser(email, user, password);
-            method: 'post',
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify(payload)
-        })
-
-        const response: Authentication = await login.json();
 
         if (response.error != null) {
-            if (response.error.details.errors) {
+            handleErrorsFromResponseWithToast(response);
-                for (const error of response.error.details.errors) {
-                    createErrorToast(error.message);
-                }
-            } else {
-                createErrorToast(response.error.message);
-            }
         } 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"
+    <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" crossorigin="anonymous">
+          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>