Merge branch 'develop' into popup

# Conflicts:
#	frontend/svelte/src/routes/+page.svelte

backend/strapi/src/api/note/controllers/note.js

@@ -50,6 +50,9 @@ module.exports = createCoreController(noteUid, ({strapi}) => ({
           lastViewed: Date.now()
         }
       })
+      entry = await strapi.entityService.findOne(noteUid, noteId, {
+        populate: ['owners'],
+      });
       return JSON.stringify(entry);
     } else {
       ctx.response.status = 403;
@@ -63,22 +66,26 @@ module.exports = createCoreController(noteUid, ({strapi}) => ({
   async update(ctx) {
     const noteId = getNoteIdFromUrl(ctx.request.url)
     const userId = ctx.state.user.id;
-    const requestBody = ctx.request.body;
+    const requestBody = JSON.parse(ctx.request.body);
+    console.log(JSON.stringify(requestBody, null, 2))
     const entry = await strapi.entityService.findOne(noteUid, noteId, {
       populate: ['owners'],
     });
     const authorized = entry.owners.some(owner => owner.id === userId)
-    let allPreviousOwnersKept = false;
+    let allPreviousOwnersKept = true;
     if (requestBody.data.hasOwnProperty("owners")) {
       allPreviousOwnersKept = entry.owners.every(owner => requestBody.data.owners.includes(owner));
     }
+    console.log({
+      "auth": authorized,
+      "allprev": allPreviousOwnersKept,
+    })
     if (!authorized) {
       ctx.response.status = 403;
     } else if (!allPreviousOwnersKept) {
       ctx.response.status = 400;
-    } else {
-      return super.update(ctx);
     }
+    return await strapi.entityService.update(noteUid, noteId, requestBody);
   },
   /**
    * Creates a new note, automatically sets owners to the user making the request and lastViewed

backend/strapi/src/extensions/users-permissions/content-types/user/schema.json

@@ -0,0 +1,73 @@
+{
+  "kind": "collectionType",
+  "collectionName": "up_users",
+  "info": {
+    "name": "user",
+    "description": "",
+    "singularName": "user",
+    "pluralName": "users",
+    "displayName": "User"
+  },
+  "options": {
+    "draftAndPublish": false,
+    "timestamps": true
+  },
+  "attributes": {
+    "username": {
+      "type": "string",
+      "minLength": 3,
+      "unique": true,
+      "configurable": false,
+      "required": true
+    },
+    "email": {
+      "type": "email",
+      "minLength": 6,
+      "configurable": false,
+      "required": true
+    },
+    "provider": {
+      "type": "string",
+      "configurable": false
+    },
+    "password": {
+      "type": "password",
+      "minLength": 6,
+      "configurable": false,
+      "private": true
+    },
+    "resetPasswordToken": {
+      "type": "string",
+      "configurable": false,
+      "private": true
+    },
+    "confirmationToken": {
+      "type": "string",
+      "configurable": false,
+      "private": true
+    },
+    "confirmed": {
+      "type": "boolean",
+      "default": false,
+      "configurable": false
+    },
+    "blocked": {
+      "type": "boolean",
+      "default": false,
+      "configurable": false
+    },
+    "role": {
+      "type": "relation",
+      "relation": "manyToOne",
+      "target": "plugin::users-permissions.role",
+      "inversedBy": "users",
+      "configurable": false
+    },
+    "notes": {
+      "type": "relation",
+      "relation": "manyToMany",
+      "target": "api::note.note",
+      "inversedBy": "owners"
+    }
+  }
+}

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/NoteRepository.ts

@@ -1,4 +1,4 @@
-import type {Note} from "./types";
+import type {Note} from "../../types";
 
 export interface NoteRepository {
     getNotes(): Promise<Note[]>;

frontend/svelte/src/models/repos/note/StrapiNoteRepository.ts

@@ -1,6 +1,8 @@
-import type {Note} from "./types";
+import type {Note} from "../../types";
 import {parseCookies} from "nookies";
 import type {NoteRepository} from "./NoteRepository";
+import {currentNoteId} from "../../../stores";
+
 
 type HttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE'
 
@@ -13,13 +15,19 @@ export class StrapiNoteRepository implements NoteRepository {
         return this.instance;
     }
 
-    private constructor() {}
+    private constructor() {
+        currentNoteId.subscribe((value) => (this._currentNoteId = value));
+    }
 
-    private _currentNoteId: number | undefined;
+    private _currentNoteId: unknown;
     private static apiNoteEndpoint: string = "http://localhost:1337/api/notes"
 
     public set currentNoteId(value: number | undefined) {
-        this._currentNoteId = value;
+        currentNoteId.set(value || -1);
+    }
+
+    public get currentNoteId(): number {
+        return <number>this._currentNoteId;
     }
 
     public async getNotes(): Promise<Note[]>{
@@ -36,7 +44,7 @@ export class StrapiNoteRepository implements NoteRepository {
         if (this._currentNoteId === null || this._currentNoteId === undefined) {
             return;
         }
-        return await this.getNote(this._currentNoteId);
+        return await this.getNote(this.currentNoteId);
     }
 
     public async updateNote(id: number, note: Partial<Note>): Promise<Note> {
@@ -70,8 +78,8 @@ export class StrapiNoteRepository implements NoteRepository {
         return "bearer TOKEN"
     }
 
-    private static getAuthorizationHeader() {
+    static getAuthorizationHeader() {
-        const jwt = parseCookies().jwt;
+        const jwt = parseCookies('/').jwt;
         return `bearer ${jwt}`
     }
 }

frontend/svelte/src/models/repos/user/StrapiUserRepo.ts

@@ -0,0 +1,93 @@
+import type {UserRepository} from "./UserRepository";
+import type {Authentication} from "../../authentication";
+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(verification: boolean = true): StrapiUserRepo {
+        if (this.instance === undefined || this.instance === null) {
+            this.instance = new StrapiUserRepo();
+            this.instance.verify().then(() => {
+                if (verification && !this.instance.verified) {
+                    window.location.href = "/login";
+                }
+            });
+        }
+        return this.instance;
+    }
+
+    private verified: boolean = false;
+
+    private constructor() {
+    }
+
+    private static api: string = "http://localhost:1337/api"
+
+    private static apiUserEndpoint: string = StrapiUserRepo.api + "/auth/local"
+
+    /**
+     * Verifies the current users jwt.
+     * @private
+     */
+    private async verify() {
+        this.verified = false;
+        let result = await this.getMe();
+        if (!result.error) {
+            this.verified = true;
+        }
+    }
+
+    async getMe(): 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 && 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(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 {StrapiNoteRepository} from "../models/StrapiNoteRepository";
+    import {StrapiNoteRepository} from "../models/repos/note/StrapiNoteRepository";
+    import {StrapiUserRepo} from "../models/repos/user/StrapiUserRepo";
     import {Content, Modal, Trigger} from "sv-popup";
 
     const sleep = (ms) => new Promise(r => setTimeout(r, ms));
@@ -9,6 +10,7 @@
     let notes: Note[];
 
     onMount(async () => {
+        StrapiUserRepo.getInstance();
         notes = await noteRepo.getNotes();
         notes.forEach(note => {
             note.lastViewed = new Date(note.lastViewed);
@@ -84,11 +86,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>
@@ -103,8 +105,8 @@
 
     <div class="row">
         <div class="offset-md-4 col-md-4">
-            {#if notes?.length > 0}
+            {#if notes}
-                <!-- Notes compact listing -->
+                <!-- Notes listing -->
                 <ul>
                     {#each notes as note}
                         <li on:mouseover={() => handleMouseOverLi(note.id)}

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;
+    // StrapiUserRepo.getInstance();
-
-    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";
-        }
-    }
 }

frontend/svelte/src/routes/editor/+page.svelte

@@ -1,24 +1,71 @@
 <script lang="ts">
     import type {Note} from "../../models/types";
+    import {StrapiNoteRepository} from "../../models/repos/note/StrapiNoteRepository";
+    import {onMount} from "svelte";
 
-    let notes: Note[] = JSON.parse(window.localStorage.getItem("notes"));
+    let noteRepo: StrapiNoteRepository;
-    const clickedNoteId = window.localStorage.getItem("clickedNoteId");
+    let currentNote: Note;
+    onMount(async () => {
+        noteRepo = StrapiNoteRepository.getInstance();
+        try {
+            currentNote = await noteRepo.getNote(noteRepo.currentNoteId);
+        } catch {
+            returnToListing();
+        }
+        title = (<Note>currentNote).title;
+        content = (<Note>currentNote).content;
+    })
+
+    function save() {
+        noteRepo.updateNote(currentNote.id, {
+            "title": title,
+            "content": content
+        })
+        returnToListing();
+    }
+
+    function returnToListing() {
+        window.location = "/";
+    }
+
+
+    export let title: string, content: string;
 
-    const currNote = notes.find((note)=>{
-        return note.id === parseInt(clickedNoteId);
-    });
 </script>
 
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{"Pomelonote | Edit " + currNote.title}</title>
+    <title>Editor</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">
 </head>
 
 <html lang="en">
-<div class="offset-3 col-6">
+<div class="offset-3 col-6 wrapper">
-    {currNote.content}
+    <h1 class="">{title}</h1>
+    <input bind:value={title} class="input"> <br />
+    <textarea bind:value={content} class="input textarea"></textarea>
+    <div class="button-container">
+        <button on:click={() => save()} class="btn btn-primary">Save</button>
+        <button on:click={() => returnToListing()} class="btn btn-outline-danger">Cancel</button>
+    </div>
 </div>
 </html>
+
+<style>
+    @import "../../customBootstrap.css";
+    .wrapper {
+        margin-top: 20px;
+    }
+    .input {
+        margin-bottom: 10px;
+        width: 100%;
+    }
+    .button-container {
+        float: right;
+    }
+    .textarea {
+        height: 300px;
+    }
+</style>

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(false);
-        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="text" 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="text">
         <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>
@@ -94,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>

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(false);
-        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>

frontend/svelte/src/stores.ts

@@ -0,0 +1,7 @@
+import {writable} from "svelte/store";
+import {browser} from "$app/environment"
+export const currentNoteId = writable<number>();
+if (browser) {
+    currentNoteId.set(Number(localStorage.getItem("currentNoteId") || ""))
+    currentNoteId.subscribe(val => localStorage.setItem("currentNoteId", String(val)));
+}