From f9d12da7d34a7eb3ac96439fc6d9b7bfcf86ef41 Mon Sep 17 00:00:00 2001
From: ekzyis <ekzyis@ekzyis.com>
Date: Tue, 7 Nov 2023 10:15:53 +0100
Subject: [PATCH] Wait until session is initialized

---
 vue/src/components/LoginQRCode.vue | 32 +++++++++++++++++++-----------
 vue/src/stores/session.js          |  4 +++-
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/vue/src/components/LoginQRCode.vue b/vue/src/components/LoginQRCode.vue
index a6e525e..5c4123b 100644
--- a/vue/src/components/LoginQRCode.vue
+++ b/vue/src/components/LoginQRCode.vue
@@ -8,18 +8,26 @@
 import { ref } from 'vue'
 import { useSession } from '@/stores/session'
 
-let qr = ref(null)
-let lnurl = ref(null)
+const qr = ref(null)
+const lnurl = ref(null)
+
+const login = async () => {
+  const s = await session.login()
+  qr.value = s.qr
+  lnurl.value = s.lnurl
+}
 
 const session = useSession()
-await (async () => {
-  try {
-    if (session.isAuthenticated) return
-    const s = await session.login()
-    qr = s.qr
-    lnurl = s.lnurl
-  } catch (err) {
-    console.error('error:', err.reason || err)
-  }
-})()
+// wait until session is initialized
+if (session.initialized && !session.isAuthenticated) {
+  await login()
+} else {
+  // else subscribe to changes
+  session.$subscribe(async (_, s) => {
+    if (s.initialized && !s.isAuthenticated) {
+      await login()
+    }
+  })
+}
+
 </script>
diff --git a/vue/src/stores/session.js b/vue/src/stores/session.js
index 466feae..90f5c1b 100644
--- a/vue/src/stores/session.js
+++ b/vue/src/stores/session.js
@@ -4,6 +4,7 @@ import { computed, ref } from 'vue'
 export const useSession = defineStore('session', () => {
   const pubkey = ref(null)
   const isAuthenticated = computed(() => !!pubkey.value)
+  const initialized = ref(false)
 
   async function init () {
     try {
@@ -16,6 +17,7 @@ export const useSession = defineStore('session', () => {
     } catch (err) {
       console.error('error:', err.reason || err)
     }
+    initialized.value = true
   }
 
   function checkSession () {
@@ -35,5 +37,5 @@ export const useSession = defineStore('session', () => {
     return fetch(url, { credentials: 'include' }).then(r => r.json())
   }
 
-  return { pubkey, isAuthenticated, init, checkSession, login }
+  return { pubkey, isAuthenticated, initialized, init, checkSession, login }
 })