From 4bd5c4bf2aee807ad9564e2cbe271b2aac0dfa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Sun, 19 Apr 2026 11:08:55 +0400
Subject: [PATCH] Load signer on launch, disconnect or switch pubkey if
 necessary

---
 app/services/nostr-auth.js | 44 +++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/app/services/nostr-auth.js b/app/services/nostr-auth.js
index 8963aa0..a90e971 100644
--- a/app/services/nostr-auth.js
+++ b/app/services/nostr-auth.js
@@ -6,13 +6,33 @@ const STORAGE_KEY = 'marco:nostr_pubkey';
 
 export default class NostrAuthService extends Service {
   @tracked pubkey = null;
-  signer = null;
 
   constructor() {
     super(...arguments);
     const saved = localStorage.getItem(STORAGE_KEY);
     if (saved) {
       this.pubkey = saved;
+      this._verifyPubkey();
+    }
+  }
+
+  async _verifyPubkey() {
+    if (typeof window.nostr === 'undefined') {
+      this.logout();
+      return;
+    }
+
+    try {
+      const signer = new ExtensionSigner();
+      const extensionPubkey = await signer.getPublicKey();
+
+      if (extensionPubkey !== this.pubkey) {
+        this.pubkey = extensionPubkey;
+        localStorage.setItem(STORAGE_KEY, this.pubkey);
+      }
+    } catch (e) {
+      console.warn('Failed to verify nostr pubkey, logging out', e);
+      this.logout();
     }
   }
 
@@ -20,15 +40,18 @@ export default class NostrAuthService extends Service {
     return !!this.pubkey;
   }
 
+  get signer() {
+    if (typeof window.nostr !== 'undefined') {
+      return new ExtensionSigner();
+    }
+    return null;
+  }
+
   async login() {
     if (typeof window.nostr === 'undefined') {
       throw new Error('No NIP-07 Nostr extension found (e.g., Alby, nos2x).');
     }
 
-    if (!this.signer) {
-      this.signer = new ExtensionSigner();
-    }
-
     try {
       this.pubkey = await this.signer.getPublicKey();
       localStorage.setItem(STORAGE_KEY, this.pubkey);
@@ -41,20 +64,15 @@ export default class NostrAuthService extends Service {
 
   async signEvent(event) {
     if (!this.signer) {
-      if (this.pubkey && typeof window.nostr !== 'undefined') {
-        this.signer = new ExtensionSigner();
-      } else {
-        throw new Error(
-          'Not connected or extension missing. Please connect Nostr again.'
-        );
-      }
+      throw new Error(
+        'Not connected or extension missing. Please connect Nostr again.'
+      );
     }
     return await this.signer.signEvent(event);
   }
 
   logout() {
     this.pubkey = null;
-    this.signer = null;
     localStorage.removeItem(STORAGE_KEY);
   }
 }