Added /file/ prefix to all routes used for file like actions

Signed-off-by: LarsVomMars <lars@kroenner.eu>

4 files changed, 15 insertions, 15 deletions

diff --git a/src/main/kotlin/App.kt b/src/main/kotlin/App.kt
index b6b5a14..181149d 100644
--- a/src/main/kotlin/App.kt
+++ b/src/main/kotlin/App.kt
@@ -12,7 +12,7 @@ import org.slf4j.*
 import java.net.*
 import kotlin.system.*
 
-const val debug = false
+const val debug = true
 var silent = true
 var port = 7000
 // TODO: Add abstract and secure file home support for windows/BSD/macOS
@@ -146,32 +146,32 @@ fun main(args: Array<String>) {
         /**
          * Receives and saves multipart media data
          */
-        post("/upload/*", fileController::upload, roles(Roles.USER))
+        post("/file/upload/*", fileController::upload, roles(Roles.USER))
 
         /**
          * Indexes every file of the user into the database
          */
-        get("/index", fileController::indexAll, roles(Roles.USER))
+        get("/file/index", fileController::indexAll, roles(Roles.USER))
 
         /**
          * Deletes file
          */
-        post("/delete/*", fileController::delete, roles(Roles.USER))
+        post("/file/delete/*", fileController::delete, roles(Roles.USER))
 
         /**
          * Shares file
          */
-        post("/share/*", fileController::share, roles(Roles.USER))
+        post("/file/share/*", fileController::share, roles(Roles.USER))
 
         /**
          * Shares file in directory
          */
-        post("/share", fileController::handleSharedFile, roles(Roles.USER))
+        post("/file/share", fileController::handleSharedFile, roles(Roles.USER))
 
         /**
          * Shows the shared file
          */
-        get("/shared", fileController::renderShared, roles(Roles.GUEST, Roles.USER))
+        get("/file/shared", fileController::renderShared, roles(Roles.GUEST, Roles.USER))
     }
 }
 
diff --git a/src/main/kotlin/DatabaseController.kt b/src/main/kotlin/DatabaseController.kt
index fc03148..8ae39a3 100644
--- a/src/main/kotlin/DatabaseController.kt
+++ b/src/main/kotlin/DatabaseController.kt
@@ -507,7 +507,7 @@ class DatabaseController {
     }
 }
 
-data class ReturnFileData(
+data class ReturnFileData (
     val userId: Int,
     val fileLocation: String,
     val isDirectory: Boolean
diff --git a/src/main/kotlin/FileController.kt b/src/main/kotlin/FileController.kt
index d1e1870..1b48b4c 100644
--- a/src/main/kotlin/FileController.kt
+++ b/src/main/kotlin/FileController.kt
@@ -176,7 +176,7 @@ class FileController {
         if (userId > 0) {
             val path = "$firstParam${if (shareType == "dir") "/" else ""}"
             val accessId = databaseController.getAccessId(path, userId)
-            ctx.result("${ctx.host()}/shared?id=$accessId")
+            ctx.result("${ctx.host()}/file/shared?id=$accessId")
         }
     }
 
diff --git a/src/main/resources/js/files.js b/src/main/resources/js/files.js
index d3ce6c4..6b761ae 100644
--- a/src/main/resources/js/files.js
+++ b/src/main/resources/js/files.js
@@ -92,7 +92,7 @@ document.getElementById("file").addEventListener("change", () => {
  */
 function setListeners() {
     if (isShared === "true") {
-        const accessId = location.pathname === '/shared' ? location.search.split('=')[1] : undefined;
+        const accessId = location.pathname === '/file/shared' ? location.search.split('=')[1] : undefined;
         document.querySelectorAll('[data-path], [data-href]').forEach(element => {
             element.addEventListener('click', () => {
                 const filename = '/' + (element.getAttribute('data-path') || element.getAttribute('data-href'));
@@ -101,11 +101,11 @@ function setListeners() {
                     const formData = new FormData();
                     formData.append('accessId', accessId);
                     formData.append('filename', filename);
-                    request.open('POST', '/share', true);
+                    request.open('POST', '/file/share', true);
                     request.onload = () => {
                         if (request.status === 200 && request.readyState === 4) {
                             if (request.responseText)
-                                window.location = `/shared?id=${request.responseText}`;
+                                window.location = `/file/shared?id=${request.responseText}`;
                             else alert('File not found!');
                         }
                     };
@@ -187,7 +187,7 @@ function setListeners() {
             const parent = e.target.closest("tr");
             const filename = parent.getAttribute("data-href") || parent.getAttribute("data-path");
             if (confirm(`Do you really want to delete: ${filename}?`)) {
-                request.open("POST", `/delete/${path}/${filename}`.clean(), true);
+                request.open("POST", `/file/delete/${path}/${filename}`.clean(), true);
                 request.send();
                 parent.remove();
             } else console.log("File not deleted!")
@@ -217,7 +217,7 @@ function setListeners() {
             const filename = parent.getAttribute("data-href") || parent.getAttribute("data-path");
             const type = filename.endsWith('/') ? 'dir' : 'file';
 
-            request.open("POST", `/share/${path}/${filename}?type=${type}`.clean());
+            request.open("POST", `/file/share/${path}/${filename}?type=${type}`.clean());
             request.onload = () => {
                 if (request.readyState === 4) {
                     if (request.status === 200) {
@@ -265,7 +265,7 @@ function upload(files) {
         }
     };
 
-    request.open('POST', `/upload/${path}`.clean(), true);
+    request.open('POST', `/file/upload/${path}`.clean(), true);
     request.send(formData);
 }