From 54f8ecb2fd95212fe674a9bad1752ff0c7bd54b2 Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Sun, 27 Nov 2022 12:45:05 -0300
Subject: [PATCH] NIP-07 (`window.nostr`) support.

---
 src/routes/Keys.svelte  |  2 ++
 src/routes/Login.svelte | 55 ++++++++++++++++++++++++++++++++---------
 src/state/dispatch.js   |  6 +----
 src/state/nostr.js      | 10 +++++++-
 src/state/user.js       |  6 ++++-
 5 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/src/routes/Keys.svelte b/src/routes/Keys.svelte
index dc1d5c4e..898eaf84 100644
--- a/src/routes/Keys.svelte
+++ b/src/routes/Keys.svelte
@@ -45,6 +45,7 @@
           trying to find you on nostr.
         </p>
       </div>
+      {#if $user.privkey}
       <div class="flex flex-col gap-1">
         <strong>Private Key</strong>
         <Input disabled type="password" value={$user.privkey}>
@@ -57,6 +58,7 @@
           using <Anchor external href={delegationUrl}>delegation keys</Anchor> instead.
         </p>
       </div>
+      {/if}
     </div>
   </div>
 </div>
diff --git a/src/routes/Login.svelte b/src/routes/Login.svelte
index e45c4643..461098fc 100644
--- a/src/routes/Login.svelte
+++ b/src/routes/Login.svelte
@@ -1,6 +1,7 @@
 <script>
+  import {onMount} from 'svelte';
   import {navigate} from 'svelte-routing'
-  import {generatePrivateKey} from 'nostr-tools'
+  import {generatePrivateKey, getPublicKey} from 'nostr-tools'
   import {copyToClipboard} from "src/util/html"
   import Anchor from "src/partials/Anchor.svelte"
   import Input from "src/partials/Input.svelte"
@@ -8,23 +9,43 @@
   import {dispatch} from "src/state/dispatch"
   import {relays} from "src/state/nostr"
 
-  let privKey = ''
+  let privkey = ''
+  let pubkey = ''
+  let hasExtension = false
+
+  onMount(() => {
+    setTimeout(() => {
+      hasExtension = !!window.nostr
+    }, 1000)
+  })
 
   const copyKey = () => {
-    copyToClipboard(privKey)
+    copyToClipboard(privkey)
     toast.show("info", "Your private key has been copied to the clipboard.")
   }
 
   const generateKey = () => {
-    privKey = generatePrivateKey()
+    privkey = generatePrivateKey()
     toast.show("info", "Your private key has been re-generated.")
   }
 
+  const getKeyFromExtension = async () => {
+    pubkey = await window.nostr.getPublicKey()
+    privkey = ''
+  }
+
   const logIn = async () => {
-    if (!privKey.match(/[a-z0-9]{64}/)) {
+    if (!privkey.match(/[a-z0-9]{64}/) && pubkey === '') {
       toast.show("error", "Sorry, but that's an invalid private key.")
+    } else if (!pubkey.match(/[a-z0-9]{64}/)) {
+      toast.show("error", "Sorry, but that's an invalid public key.")
     } else {
-      const {found} = await dispatch("account/init", privKey)
+      // Generate a public key from the private key
+      if (!pubkey && privkey) {
+        pubkey = getPublicKey(privkey)
+      }
+
+      const {found} = await dispatch("account/init", { privkey, pubkey })
 
       if ($relays.length === 0) {
         navigate('/settings/relays')
@@ -50,17 +71,29 @@
       </small>
       <div class="flex flex-col gap-1">
         <strong>Private Key</strong>
-        <Input type="password" bind:value={privKey} placeholder="Enter your private key">
+        <Input type="password" bind:value={privkey} placeholder="Enter your private key">
           <i slot="after" class="fa-solid fa-copy" on:click={copyKey} />
         </Input>
         <Anchor on:click={generateKey} class="text-right">
           <small>Generate new key</small>
         </Anchor>
+        <small>
+          Your private key is a string of random letters and numbers that allow you to prove
+          you own your account. Write it down and keep it secret!
+        </small>
       </div>
-      <small>
-        Your private key is a string of random letters and numbers that allow you to prove
-        you own your account. Write it down and keep it secret!
-      </small>
+      {#if hasExtension}
+      <div class="flex flex-col gap-1">
+        <strong>Public Key</strong>
+        <Input readonly bind:value={pubkey} placeholder="Your public key will show up here" />
+        <Anchor on:click={getKeyFromExtension} class="text-right">
+          <small>Get from extension</small>
+        </Anchor>
+        <small>
+          You can also use a <Anchor href="https://github.com/nostr-protocol/nips/blob/master/07.md" external>compatible browser extension</Anchor> to sign events without having to paste your private key here.
+        </small>
+      </div>
+      {/if}
     </div>
     <Anchor class="text-center" type="button" on:click={logIn}>Log In</Anchor>
   </div>
diff --git a/src/state/dispatch.js b/src/state/dispatch.js
index 57ea9bb7..56fb1902 100644
--- a/src/state/dispatch.js
+++ b/src/state/dispatch.js
@@ -1,5 +1,4 @@
 import {identity, last, without} from 'ramda'
-import {getPublicKey} from 'nostr-tools'
 import {get} from 'svelte/store'
 import {first, defmulti} from "hurdak/lib/hurdak"
 import {user} from "src/state/user"
@@ -13,10 +12,7 @@ import {ensureAccounts} from 'src/state/app'
 
 export const dispatch = defmulti("dispatch", identity)
 
-dispatch.addMethod("account/init", async (topic, privkey) => {
-  // Generate a public key
-  const pubkey = getPublicKey(privkey)
-
+dispatch.addMethod("account/init", async (topic, { privkey, pubkey }) => {
   // Set what we know about the user to our store
   user.set({name: pubkey.slice(0, 8), privkey, pubkey})
 
diff --git a/src/state/nostr.js b/src/state/nostr.js
index d10200c5..6160e923 100644
--- a/src/state/nostr.js
+++ b/src/state/nostr.js
@@ -84,8 +84,16 @@ nostr.login = privkey => {
   nostr._privkey = privkey
 }
 
+nostr.pubkeyLogin = pubkey => {
+  nostr.registerSigningFunction( async (event) => {
+    const {sig} = await window.nostr.signEvent(event)
+    return sig
+  })
+  nostr._pubkey = pubkey
+}
+
 nostr.event = (kind, content = '', tags = []) => {
-  const pubkey = getPublicKey(nostr._privkey)
+  const pubkey = nostr._pubkey || getPublicKey(nostr._privkey)
   const createdAt = Math.round(new Date().valueOf() / 1000)
 
   return {kind, content, tags, pubkey, created_at: createdAt}
diff --git a/src/state/user.js b/src/state/user.js
index b3fe39f3..31dc2df9 100644
--- a/src/state/user.js
+++ b/src/state/user.js
@@ -8,6 +8,10 @@ user.subscribe($user => {
   setLocalJson("coracle/user", $user)
 
   // Keep nostr in sync
-  nostr.login($user?.privkey)
+  if ($user?.privkey) {
+    nostr.login($user.privkey)
+  } else if ($user?.pubkey) {
+    nostr.pubkeyLogin($user.pubkey)
+  }
 })