handle array paths better

trashhalo · Nov 14, 2021 · 20ab956 · 20ab956
1 parent d3d9110
commit 20ab956
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/functions/src/index.ts b/functions/src/index.ts
@@ -19,9 +19,25 @@ webhookApp.post("/:key", async (req: any, res: any) => {
     today.getDate() + 7
   );
 
+  let path: string;
+  const qPath: unknown = req.query.path;
+  if (typeof qPath === "string") {
+    path = qPath;
+  } else if (Array.isArray(qPath)) {
+    path = qPath[0];
+  } else {
+    return res
+      .status(422)
+      .send(
+        `path not a valid format. expected string recieved ${JSON.stringify(
+          qPath
+        )}`
+      );
+  }
+
   const buffer = {
     id: crypto.randomBytes(16).toString("hex"),
-    path: req.query.path,
+    path,
     exp,
     data: req.body,
   };

diff --git a/plugin/main.ts b/plugin/main.ts
@@ -95,8 +95,21 @@ export default class ObsidianWebhooksPlugin extends Plugin {
     await wipe(value);
   }
 
-  async applyEvent({ data, path }: { data: string; path: string }) {
+  async applyEvent({
+    data,
+    path: pathOrArr,
+  }: {
+    data: string;
+    path: string | Array<string>;
+  }) {
     const fs = this.app.vault.adapter;
+    let path: string;
+    if (typeof pathOrArr === "string") {
+      path = pathOrArr;
+    } else {
+      path = Object.values(pathOrArr).first();
+    }
+
     let dirPath = path.replace(/\/*$/, "").replace(/^(.+)\/[^\/]*?$/, "$1");
     if (dirPath !== path) {
       // == means its in the root