From 8ac5609c6012d020903538d5bc0501c5d016ba87 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastinez@me.com>
Date: Thu, 12 May 2022 15:33:52 +0200
Subject: [PATCH] Improve session handling for SIWE

Signed-off-by: Sebastian Martinez <sebastinez@me.com>
---
 src/App.svelte               | 2 +-
 src/base/seeds/Routes.svelte | 4 +++-
 src/base/seeds/View.svelte   | 9 +++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 937bcb2c3..c5b06358b 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -89,7 +89,7 @@
         </Route>
         <Registrations {config} session={$session} />
         <Orgs {config} />
-        <Seeds {config} />
+        <Seeds {config} session={$session} />
         <Faucet {config} />
         <Users />
         <Resolver {config} />
diff --git a/src/base/seeds/Routes.svelte b/src/base/seeds/Routes.svelte
index 59c9cb19f..4d3240a0e 100644
--- a/src/base/seeds/Routes.svelte
+++ b/src/base/seeds/Routes.svelte
@@ -2,10 +2,12 @@
   import { Route } from "svelte-routing";
   import View from '@app/base/seeds/View.svelte';
   import type { Config } from '@app/config';
+  import type { Session } from "@app/session";
 
   export let config: Config;
+  export let session: Session | null;
 </script>
 
 <Route path="/seeds/:seed" let:params>
-  <View {config} host={params.seed}/>
+  <View {config} {session} host={params.seed}/>
 </Route>
diff --git a/src/base/seeds/View.svelte b/src/base/seeds/View.svelte
index 9b4c54b7a..51140ff6d 100644
--- a/src/base/seeds/View.svelte
+++ b/src/base/seeds/View.svelte
@@ -7,18 +7,19 @@
   import NotFound from "@app/NotFound.svelte";
   import Clipboard from "@app/Clipboard.svelte";
   import Projects from "@app/base/orgs/View/Projects.svelte";
-  import { session } from "@app/session";
+  import type { Session } from "@app/session";
   import Address from "@app/Address.svelte";
   import SiweConnect from "@app/SiweConnect.svelte";
   import type { SeedSession } from "@app/siwe";
 
   export let config: Config;
+  export let session: Session | null;
   export let host: string;
 
   let siweSession: SeedSession | null = null;
 
-  $: if ($session?.siwe) {
-    const entries = Object.entries($session.siwe);
+  $: if (session?.siwe) {
+    const entries = Object.entries(session.siwe);
     const result = entries.find(([, session]) => session.domain === host);
     if (result) {
       siweSession = result[1];
@@ -122,7 +123,7 @@
       <!-- User Session -->
       <div class="label">Connection</div>
       <div>
-        {#if $session?.signer}
+        {#if session?.signer}
           {#if siweSession}
             <div class="desktop">
               <Address address={siweSession.address} {config} resolve />