1 files changed, 13 insertions, 15 deletions
diff --git a/src/util/files.ts b/src/util/files.ts
index 49c5ebb..a1ce5d9 100644
--- a/src/util/files.ts
+++ b/src/util/files.ts
@@ -1,27 +1,25 @@
 import { walk, ensureDirSync, existsSync } from "https://deno.land/std/fs/mod.ts";
+import type { Context } from "https://deno.land/x/abc@master/mod.ts";
+import { getUserCookies } from "./user.ts";
 
-const TEMP_USER_ID = 42; // TODO: FIX
-
-export const cleanPath = (path: string): string => {
-    createUserDirectory(TEMP_USER_ID);
-
+export const cleanPath = (path: string, uid: number): string => {
     return (
         "data/" +
-        TEMP_USER_ID +
+        uid +
         "/" +
         path
-            .replace("/files/", "")
+            .replace(/\/files\/?/, "")
             .replace("../", "") // TODO: Fix relative ../
             .replace("./", "")
             .replace(/([^:]\/)\/+/g, "$1")
     );
-};
-
-export const getFiles = async (path: string) => {
-    const newPath = path ? path : "";
+}
 
-    createUserDirectory(TEMP_USER_ID);
-    const dataPath: string = cleanPath(newPath);
+export const getFiles = async (c: Context) => {
+    const path = c.path ? c.path : "";
+    const uid = getUserCookies(c).uid;
+    createUserDirectory(uid);  // TODO: Consider doing this in db/user/createUser => performance?
+    const dataPath: string = cleanPath(path, uid);
 
     if (!existsSync(dataPath)) return [];
 
@@ -30,9 +28,9 @@ export const getFiles = async (path: string) => {
         files.push(entry.path);
     }
     return files;
-};
+}
 
 export const createUserDirectory = (uid: number) => {
     ensureDirSync("data/" + uid);
     // TODO: Give user access to dir
-};
+}