From: Adam Dullage <redacted>
Date: Thu, 25 Aug 2022 06:54:40 +0000 (+0100)
Subject: URL encoding improvements
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f6bf4514f9cd12e663540668e33e3a2a1f75550f;p=flatnotes.git

URL encoding improvements
---

diff --git a/flatnotes/src/classes.js b/flatnotes/src/classes.js
index 4349e29..14ce77c 100644
--- a/flatnotes/src/classes.js
+++ b/flatnotes/src/classes.js
@@ -8,7 +8,7 @@ class Note {
   }
 
   get href() {
-    return `${constants.basePaths.note}/${this.title}`;
+    return `${constants.basePaths.note}/${encodeURIComponent(this.title)}`;
   }
 
   get lastModifiedAsDate() {
diff --git a/flatnotes/src/components/App.js b/flatnotes/src/components/App.js
index f9f8314..38e0831 100644
--- a/flatnotes/src/components/App.js
+++ b/flatnotes/src/components/App.js
@@ -74,7 +74,7 @@ export default {
       // Note
       else if (basePath == constants.basePaths.note) {
         this.updateDocumentTitle();
-        this.noteTitle = path[2];
+        this.noteTitle = decodeURIComponent(path[2]);
         this.currentView = this.views.note;
       }
 
diff --git a/flatnotes/src/components/Login.vue b/flatnotes/src/components/Login.vue
index 5d89c79..b7f4f1f 100644
--- a/flatnotes/src/components/Login.vue
+++ b/flatnotes/src/components/Login.vue
@@ -1,12 +1,5 @@
 <template>
-  <div
-    class="
-      d-flex
-      flex-column
-      justify-content-center
-      align-items-center
-    "
-  >
+  <div class="d-flex flex-column justify-content-center align-items-center">
     <!-- Logo -->
     <Logo class="mb-3"></Logo>
 
@@ -95,7 +88,7 @@ export default {
             localStorage.setItem("token", response.data.access_token);
           }
           let redirectPath = helpers.getSearchParam(constants.params.redirect);
-          EventBus.$emit("navigate", redirectPath || "/");
+          EventBus.$emit("navigate", redirectPath || constants.basePaths.home);
         })
         .catch(function (error) {
           if (error.handled) {
diff --git a/flatnotes/src/components/NoteViewerEditor.vue b/flatnotes/src/components/NoteViewerEditor.vue
index 00d027f..6603fdc 100644
--- a/flatnotes/src/components/NoteViewerEditor.vue
+++ b/flatnotes/src/components/NoteViewerEditor.vue
@@ -16,7 +16,9 @@
     <!-- Loaded -->
     <div v-else class="d-flex flex-column h-100">
       <!-- Buttons -->
-      <div class="d-flex justify-content-between flex-wrap align-items-end mb-3">
+      <div
+        class="d-flex justify-content-between flex-wrap align-items-end mb-3"
+      >
         <!-- Title -->
         <h2 v-if="editMode == false" class="title" :title="currentNote.title">
           {{ currentNote.title }}
@@ -166,6 +168,8 @@
 </style>
 
 <script>
+import * as constants from "../constants";
+
 import { Editor } from "@toast-ui/vue-editor";
 import EventBus from "../eventBus";
 import LoadingIndicator from "./LoadingIndicator";
@@ -212,7 +216,7 @@ export default {
       let parent = this;
       this.noteLoadFailed = false;
       api
-        .get(`/api/notes/${title}`)
+        .get(`/api/notes/${encodeURIComponent(title)}`)
         .then(function (response) {
           parent.currentNote = new Note(
             response.data.title,
@@ -375,7 +379,7 @@ export default {
         this.titleInput != this.currentNote.title
       ) {
         api
-          .patch(`/api/notes/${this.currentNote.title}`, {
+          .patch(`/api/notes/${encodeURIComponent(this.currentNote.title)}`, {
             newTitle: this.titleInput,
             newContent: newContent,
           })
@@ -426,7 +430,7 @@ export default {
       localStorage.removeItem(this.currentNote.title);
       if (this.currentNote.lastModified == null) {
         // Cancelling a new note
-        EventBus.$emit("navigate", "/");
+        EventBus.$emit("navigate", constants.basePaths.home);
       } else {
         this.setEditMode(false);
       }
@@ -447,10 +451,12 @@ export default {
         .then(function (response) {
           if (response == true) {
             api
-              .delete(`/api/notes/${parent.currentNote.title}`)
+              .delete(
+                `/api/notes/${encodeURIComponent(parent.currentNote.title)}`
+              )
               .then(function () {
                 parent.$emit("note-deleted");
-                EventBus.$emit("navigate", "/");
+                EventBus.$emit("navigate", constants.basePaths.home);
               })
               .catch(function (error) {
                 if (!error.handled) {
diff --git a/flatnotes/src/components/SearchInput.vue b/flatnotes/src/components/SearchInput.vue
index 561f042..dec533a 100644
--- a/flatnotes/src/components/SearchInput.vue
+++ b/flatnotes/src/components/SearchInput.vue
@@ -74,7 +74,7 @@ export default {
           "navigate",
           `${constants.basePaths.search}?${
             constants.params.searchTerm
-          }=${encodeURI(this.searchTermInput)}`
+          }=${encodeURIComponent(this.searchTermInput)}`
         );
       } else {
         this.$bvToast.toast("Please enter a search term ✘", {