From b4e54d679f82debf5d6d6100c5e029878d1db333 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Mon, 12 Feb 2024 16:06:20 -0300
Subject: [PATCH] nip46: fix checking event that comes from bunker call
 sign_event and bump version.

---
 nip46.ts     | 16 ++++++++++------
 package.json |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/nip46.ts b/nip46.ts
index 1c3caa4..6a26192 100644
--- a/nip46.ts
+++ b/nip46.ts
@@ -115,12 +115,16 @@ export class BunkerSigner {
       [{ kinds: [NostrConnect, NostrConnectAdmin], '#p': [getPublicKey(this.secretKey)] }],
       {
         async onevent(event: NostrEvent) {
-          const decryptedContent = await decrypt(clientSecretKey, event.pubkey, event.content)
-          const parsedContent = JSON.parse(decryptedContent)
-          const { id, result, error } = parsedContent
+          const { id, result, error } = JSON.parse(await decrypt(clientSecretKey, event.pubkey, event.content))
 
           if (result === 'auth_url') {
-            params.onauth?.(error)
+            if (params.onauth) {
+              params.onauth(error)
+            } else {
+              console.warn(
+                `nostr-tools/nip46: remote signer ${bp.pubkey} tried to send an "auth_url"='${error}' but there was no onauth() callback configured.`,
+              )
+            }
             return
           }
 
@@ -207,10 +211,10 @@ export class BunkerSigner {
   async signEvent(event: UnsignedEvent): Promise<VerifiedEvent> {
     let resp = await this.sendRequest('sign_event', [JSON.stringify(event)])
     let signed: NostrEvent = JSON.parse(resp)
-    if (signed.pubkey === getPublicKey(this.secretKey) && verifyEvent(signed)) {
+    if (signed.pubkey === this.remotePubkey && verifyEvent(signed)) {
       return signed
     } else {
-      throw new Error(`event returned from bunker is improperly signed: ${signed}`)
+      throw new Error(`event returned from bunker is improperly signed: ${JSON.stringify(signed)}`)
     }
   }
 }
diff --git a/package.json b/package.json
index b690505..dbb5e6c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "nostr-tools",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "Tools for making a Nostr client.",
   "repository": {
     "type": "git",