From 2b3b8bc0dee6d4c8bc9ab225317c0cf8ee2954b7 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <me@sebastinez.dev>
Date: Tue, 30 Jan 2024 09:51:29 +0100
Subject: [PATCH] Add redirection to project depending on rad-web cwd

---
 flake.lock                                | 10 +++++-----
 flake.nix                                 |  2 +-
 src/components/ConnectInstructions.svelte |  7 +++++--
 src/lib/router.ts                         |  1 +
 src/lib/router/definitions.ts             |  8 +++++++-
 src/views/session/Index.svelte            |  9 ++++++++-
 tests/support/heartwood-version           |  2 +-
 7 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index d8d3ee611..d4fb64aa6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -88,17 +88,17 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1706704813,
-        "narHash": "sha256-o0F1Bm1eUtDyz28hQdyktaW8dDnQl4bLeZhDUbP9dgM=",
+        "lastModified": 1707134016,
+        "narHash": "sha256-Cu8fHlircqH6qY9fN7Q5EWFgOZN1751BTKAKUI0AVQo=",
         "ref": "master",
-        "rev": "15d17098315469bb180157d1c20344faa10f4f73",
-        "revCount": 1658,
+        "rev": "5abd7bf55a093341231c8b71953777068eade0e2",
+        "revCount": 1667,
         "type": "git",
         "url": "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"
       },
       "original": {
         "ref": "master",
-        "rev": "15d17098315469bb180157d1c20344faa10f4f73",
+        "rev": "5abd7bf55a093341231c8b71953777068eade0e2",
         "type": "git",
         "url": "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"
       }
diff --git a/flake.nix b/flake.nix
index 20e8078c5..27625f399 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
     nixpkgs.follows = "heartwood/nixpkgs";
     flake-utils.follows = "heartwood/flake-utils";
     heartwood = {
-      url = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?ref=master&rev=15d17098315469bb180157d1c20344faa10f4f73";
+      url = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?ref=master&rev=5abd7bf55a093341231c8b71953777068eade0e2";
     };
   };
 
diff --git a/src/components/ConnectInstructions.svelte b/src/components/ConnectInstructions.svelte
index 638fba31c..243fd2766 100644
--- a/src/components/ConnectInstructions.svelte
+++ b/src/components/ConnectInstructions.svelte
@@ -1,6 +1,9 @@
 <script>
   import { api, httpdStore } from "@app/lib/httpd";
   import Command from "./Command.svelte";
+
+  $: path = window.location.href.replace(window.location.origin, "");
+  $: pathParam = path === "/" ? "" : `--path "${path}"`;
 </script>
 
 <style>
@@ -31,14 +34,14 @@
     <div class="label">Authenticate with your local node to make changes.</div>
     <Command
       fullWidth
-      command={`rad web ${window.origin} --connect ${api.hostname}:${api.port}`} />
+      command={`rad web ${window.origin} --connect ${api.hostname}:${api.port} ${pathParam}`} />
   {:else}
     <div class="heading">Connect & Authenticate</div>
     <div class="label">
       Connect to your local node to browse projects on your local machine,
       create issues, and participate in discussions.
     </div>
-    <Command fullWidth command={`rad web ${window.origin}`} />
+    <Command fullWidth command={`rad web ${window.origin} ${pathParam}`} />
 
     <div class="divider" />
     <div class="heading">New to Radicle?</div>
diff --git a/src/lib/router.ts b/src/lib/router.ts
index 93cb7cdd6..246a01e7b 100644
--- a/src/lib/router.ts
+++ b/src/lib/router.ts
@@ -221,6 +221,7 @@ export function urlToRoute(url: URL): Route | null {
             signature: url.searchParams.get("sig") ?? "",
             publicKey: url.searchParams.get("pk") ?? "",
             apiAddr: url.searchParams.get("addr") ?? "127.0.0.1:8080",
+            path: url.searchParams.get("path") || undefined,
           },
         };
       }
diff --git a/src/lib/router/definitions.ts b/src/lib/router/definitions.ts
index a1a47f3ab..132a41c33 100644
--- a/src/lib/router/definitions.ts
+++ b/src/lib/router/definitions.ts
@@ -20,7 +20,13 @@ export interface NotFoundRoute {
 
 interface SessionRoute {
   resource: "session";
-  params: { id: string; signature: string; publicKey: string; apiAddr: string };
+  params: {
+    id: string;
+    signature: string;
+    publicKey: string;
+    apiAddr: string;
+    path?: string;
+  };
 }
 
 export interface LoadErrorRoute {
diff --git a/src/views/session/Index.svelte b/src/views/session/Index.svelte
index 950b8401a..b7bc79a0f 100644
--- a/src/views/session/Index.svelte
+++ b/src/views/session/Index.svelte
@@ -35,7 +35,14 @@
         },
       });
     }
-    void router.push({ resource: "home" });
+    const route = router.urlToRoute(
+      new URL(activeRoute.params.path || "", window.location.origin),
+    );
+    if (route) {
+      void router.push(route);
+    } else {
+      void router.push({ resource: "home" });
+    }
   });
 </script>
 
diff --git a/tests/support/heartwood-version b/tests/support/heartwood-version
index ea76d2b35..687a02cc3 100644
--- a/tests/support/heartwood-version
+++ b/tests/support/heartwood-version
@@ -1 +1 @@
-15d17098315469bb180157d1c20344faa10f4f73
+5abd7bf55a093341231c8b71953777068eade0e2
\ No newline at end of file