4 files changed, 22 insertions, 25 deletions

diff --git a/.editorconfig b/.editorconfig
index d241554..97d37ab 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,12 +1,9 @@
 root = true
 
-[*.ts]
-end_of_line = lf
-insert_final_newline = true
-indent_style = space
-indent_size = 4
+[*]
+charset = utf-8
 
-[*.html]
+[*.{ts, html, ejs}]
 end_of_line = lf
 insert_final_newline = true
 indent_style = space
diff --git a/run b/run
index 9362e9a..edc0161 100755
--- a/run
+++ b/run
@@ -3,12 +3,12 @@
 ARGS=(--allow-net --allow-env --allow-read --allow-write --unstable)
 
 if grep -q "DEBUG=1" .env; then
-    deno lint --unstable &&
+    deno lint --unstable src/ &&
         deno test "${ARGS[@]}" test/ &&
         echo "Tests succeeded!" &&
         deno run "${ARGS[@]}" src/main.ts
 elif grep -q "DEBUG=2" .env; then
-    deno lint --unstable &&
+    deno lint --unstable src/ &&
         deno test "${ARGS[@]}" test/ &&
         echo "Tests succeeded!"
 else
diff --git a/src/handler/fileView.ts b/src/handler/fileView.ts
index eb9c3a1..29bc7a9 100644
--- a/src/handler/fileView.ts
+++ b/src/handler/fileView.ts
@@ -1,6 +1,8 @@
 import type { HandlerFunc, Context } from "https://deno.land/x/abc@master/mod.ts";
 import { getFiles } from "../util/files.ts";
+import { getCurrentUser } from "../util/user.ts";
 
 export const handlePath: HandlerFunc = async (c: Context) => {
-    return await c.render("./src/views/index.html", { files: await getFiles(c.path) });
-};
+    if (!(await getCurrentUser(c))) return c.redirect("/user/login");  // TODO: Handle shared files
+    return await c.render("./src/views/index.ejs", { files: await getFiles(c) });
+}
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
-};
+}