From 15735880d7497aeda3b58371549c4f4b69a1944a Mon Sep 17 00:00:00 2001
From: Dominic Grimm <dominic.grimm@gmail.com>
Date: Sun, 13 Feb 2022 12:39:29 +0100
Subject: [PATCH] Fix session refresh on login

---
 docker/frontend/src/app.d.ts               | 2 +-
 docker/frontend/src/routes/__layout.svelte | 1 +
 docker/frontend/src/routes/login.svelte    | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker/frontend/src/app.d.ts b/docker/frontend/src/app.d.ts
index 1bb39f1..d28c56a 100644
--- a/docker/frontend/src/app.d.ts
+++ b/docker/frontend/src/app.d.ts
@@ -13,7 +13,7 @@ declare namespace App {
   interface Platform {}
 
   interface Session {
-    user: Locals.user;
+    user: Locals["user"];
   }
 
   // eslint-disable-next-line @typescript-eslint/no-empty-interface
diff --git a/docker/frontend/src/routes/__layout.svelte b/docker/frontend/src/routes/__layout.svelte
index c2b9180..975e8a8 100644
--- a/docker/frontend/src/routes/__layout.svelte
+++ b/docker/frontend/src/routes/__layout.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { initClient } from "@urql/svelte";
+
   import { session } from "$app/stores";
 
   initClient({
diff --git a/docker/frontend/src/routes/login.svelte b/docker/frontend/src/routes/login.svelte
index aaa0254..307d8b5 100644
--- a/docker/frontend/src/routes/login.svelte
+++ b/docker/frontend/src/routes/login.svelte
@@ -3,8 +3,9 @@
   import * as validators from "svelte-forms/validators";
   import { setCookie, removeCookie } from "typescript-cookie";
   import { operationStore, mutation, gql } from "@urql/svelte";
-  import { goto } from "$app/navigation";
 
+  import { session } from "$app/stores";
+  import { goto } from "$app/navigation";
   import * as cookieNames from "$lib/cookieNames";
   import type { LoginPayload } from "$lib/graphql";
 
@@ -43,7 +44,8 @@
     if ($loginStore.error) {
       removeCookie(cookieNames.TOKEN);
     } else {
-      setCookie(cookieNames.TOKEN, $loginStore.data.login.token, {
+      $session.user.token = $loginStore.data.login.token;
+      setCookie(cookieNames.TOKEN, $session.user.token, {
         expires: 1,
       });
       goto("/");