configurable nostr signer

api/resolvers/user.js

@@ -2,7 +2,7 @@ import { readFile } from 'fs/promises'
 import { join, resolve } from 'path'
 import { decodeCursor, LIMIT, nextCursorEncoded } from '@/lib/cursor'
 import { msatsToSats } from '@/lib/format'
-import { bioSchema, emailSchema, settingsSchema, validateSchema, userSchema } from '@/lib/validate'
+import { bioSchema, emailSchema, settingsSchema, validateSchema, userSchema, encryptedPrivates, encryptedPrivatesVaultEntriesSchema } from '@/lib/validate'
 import { getItem, updateItem, filterClause, createItem, whereClause, muteClause, activeOrMine } from './item'
 import { USER_ID, RESERVED_MAX_USER_ID, SN_NO_REWARDS_IDS, INVOICE_ACTION_NOTIFICATION_TYPES } from '@/lib/constants'
 import { viewGroup } from './growth'
@@ -677,6 +677,33 @@ export default {
         throw error
       }
     },
+    setEncryptedSettings: async (parent, { settings }, { me, models }) => {
+      if (!me) throw new GqlAuthenticationError()
+      await validateSchema(encryptedPrivatesVaultEntriesSchema, settings)
+      for (const vaultEntry of settings) {
+        const { key, iv, value } = vaultEntry
+        await models.vaultEntry.upsert({
+          where: {
+            userId_key: {
+              userId: me.id,
+              key
+            }
+          },
+          update: {
+            iv,
+            value
+          },
+          create: {
+            userId: me.id,
+            key,
+            iv,
+            value
+          }
+        })
+      }
+      const user = await models.user.findUnique({ where: { id: me.id } })
+      return user
+    },
     setSettings: async (parent, { settings: { nostrRelays, ...data } }, { me, models }) => {
       if (!me) {
         throw new GqlAuthenticationError()
@@ -894,6 +921,18 @@ export default {
 
       return user
     },
+    encryptedPrivates: async (user, args, { me, models }) => {
+      if (!me || me.id !== user.id) return null
+      const vaultEntries = await models.vaultEntry.findMany({
+        where: {
+          userId: user.id,
+          key: {
+            in: encryptedPrivates
+          }
+        }
+      })
+      return vaultEntries
+    },
     optional: user => user,
     meSubscriptionPosts: async (user, args, { me, models }) => {
       if (!me) return false

api/typeDefs/user.js

@@ -32,6 +32,7 @@ export default gql`
   extend type Mutation {
     setName(name: String!): String
     setSettings(settings: SettingsInput!): User
+    setEncryptedSettings(settings: [VaultEntryInput!]!): User
     setPhoto(photoId: ID!): Int!
     upsertBio(text: String!): ItemPaidAction!
     setWalkthrough(tipPopover: Boolean, upvotePopover: Boolean): Boolean
@@ -66,6 +67,7 @@ export default gql`
 
     optional: UserOptional!
     privates: UserPrivates
+    encryptedPrivates: [VaultEntry!]
 
     meMute: Boolean!
     meSubscriptionPosts: Boolean!

components/nav/common.js

@@ -25,6 +25,7 @@ import { useHasNewNotes } from '../use-has-new-notes'
 import { useWallets } from '@/wallets/index'
 import SwitchAccountList, { useAccounts } from '@/components/account'
 import { useShowModal } from '@/components/modal'
+import { useEncryptedPrivates } from '@/components/use-encrypted-privates'
 
 export function Brand ({ className }) {
   return (
@@ -266,6 +267,8 @@ function LogoutObstacle ({ onClose }) {
   const { removeLocalWallets } = useWallets()
   const { multiAuthSignout } = useAccounts()
   const router = useRouter()
+  const { me } = useMe()
+  const { clearLocalEncryptedPrivates } = useEncryptedPrivates({ me })
 
   return (
     <div className='d-flex m-auto flex-column w-fit-content'>
@@ -296,6 +299,7 @@ function LogoutObstacle ({ onClose }) {
             }
 
             removeLocalWallets()
+            clearLocalEncryptedPrivates()
 
             await signOut({ callbackUrl: '/' })
           }}

components/nostr-auth.js

@@ -13,6 +13,7 @@ import { Button, Container } from 'react-bootstrap'
 import { Form, Input, SubmitButton } from '@/components/form'
 import Moon from '@/svgs/moon-fill.svg'
 import styles from './lightning-auth.module.css'
+import { useShowModal } from '@/components/modal'
 
 const sanitizeURL = (s) => {
   try {
@@ -33,7 +34,13 @@ function NostrError ({ message }) {
   )
 }
 
-export function NostrAuth ({ text, callbackUrl, multiAuth }) {
+export function useNostrAuthState ({
+  challengeTitle = 'Waiting for confirmation',
+  challengeMessage = 'Please confirm this action on your remote signer',
+  challengeButtonLabel = 'open signer'
+} = {}) {
+  const toaster = useToast()
+
   const [status, setStatus] = useState({
     msg: '',
     error: false,
@@ -42,35 +49,105 @@ export function NostrAuth ({ text, callbackUrl, multiAuth }) {
     button: undefined
   })
 
-  const [suggestion, setSuggestion] = useState(null)
-  const suggestionTimeout = useRef(null)
-  const toaster = useToast()
+  // print an error message
+  const setError = useCallback((e) => {
+    console.error(e)
+    toaster.danger(e.message || e.toString())
+    setStatus({
+      msg: e.message || e.toString(),
+      error: true,
+      loading: false
+    })
+  }, [])
 
   const challengeResolver = useCallback(async (challenge) => {
     const challengeUrl = sanitizeURL(challenge)
     if (challengeUrl) {
       setStatus({
-        title: 'Waiting for confirmation',
-        msg: 'Please confirm this action on your remote signer',
+        title: challengeTitle,
+        msg: challengeMessage,
         error: false,
         loading: true,
         button: {
-          label: 'open signer',
+          label: challengeButtonLabel,
           action: () => {
             window.open(challengeUrl, '_blank')
           }
         }
       })
     } else {
       setStatus({
-        title: 'Waiting for confirmation',
+        title: challengeTitle,
         msg: challenge,
         error: false,
         loading: true
       })
     }
   }, [])
 
+  return { status, setStatus, setError, challengeResolver }
+}
+
+export function useNostrAuthStateModal ({
+  ...args
+}) {
+  const showModal = useShowModal()
+
+  const { status, setStatus, setError, challengeResolver } = useNostrAuthState(args)
+  const closeModalRef = useRef(null)
+
+  useEffect(() => {
+    closeModalRef?.current?.()
+    if (status.loading) {
+      showModal(onClose => {
+        closeModalRef.current = onClose
+        return (
+          <>
+            <h3 className='w-100 pb-2'>{status.title}</h3>
+            <NostrAuthStatus status={status} />
+          </>
+        )
+      })
+    }
+  }, [status])
+
+  return { status, setStatus, setError, challengeResolver }
+}
+
+export function NostrAuthStatus ({ status, suggestion }) {
+  return (
+    <>
+      {status.error && <NostrError message={status.msg} />}
+      {status.loading &&
+      (
+        <>
+          <div className='text-muted py-4 w-100 line-height-1 d-flex align-items-center gap-2'>
+            <Moon className='spin fill-grey flex-shrink-0' width='30' height='30' />
+            {status.msg}
+          </div>
+          {status.button && (
+            <Button
+              className='w-100' variant='primary'
+              onClick={() => status.button.action()}
+            >
+              {status.button.label}
+            </Button>
+          )}
+          {suggestion && (
+            <div className='text-muted text-center small pt-2'>{suggestion}</div>
+          )}
+        </>
+      )}
+    </>
+  )
+}
+
+export function NostrAuth ({ text, callbackUrl, multiAuth }) {
+  const { status, setStatus, setError, challengeResolver } = useNostrAuthState()
+
+  const [suggestion, setSuggestion] = useState(null)
+  const suggestionTimeout = useRef(null)
+
   // create auth challenge
   const [createAuth] = useMutation(gql`
     mutation createAuth {
@@ -82,17 +159,6 @@ export function NostrAuth ({ text, callbackUrl, multiAuth }) {
     fetchPolicy: 'no-cache'
   })
 
-  // print an error message
-  const setError = useCallback((e) => {
-    console.error(e)
-    toaster.danger(e.message || e.toString())
-    setStatus({
-      msg: e.message || e.toString(),
-      error: true,
-      loading: false
-    })
-  }, [])
-
   const clearSuggestionTimer = () => {
     if (suggestionTimeout.current) clearTimeout(suggestionTimeout.current)
   }
@@ -127,7 +193,7 @@ export function NostrAuth ({ text, callbackUrl, multiAuth }) {
       if (!k1) throw new Error('Error generating challenge') // should never happen
 
       const useExtension = !nip46token
-      const signer = nostr.getSigner({ nip46token, supportNip07: useExtension })
+      const signer = nostr.getSigner({ nip46token, nip07: useExtension })
       if (!signer && useExtension) throw new Error('No extension found')
 
       if (signer instanceof NDKNip46Signer) {
@@ -170,69 +236,49 @@ export function NostrAuth ({ text, callbackUrl, multiAuth }) {
 
   return (
     <>
-      {status.error && <NostrError message={status.msg} />}
-      {status.loading
-        ? (
-          <>
-            <div className='text-muted py-4 w-100 line-height-1 d-flex align-items-center gap-2'>
-              <Moon className='spin fill-grey flex-shrink-0' width='30' height='30' />
-              {status.msg}
+      <NostrAuthStatus status={status} suggestion={suggestion} />
+      {!status.loading && (
+        <>
+          <Form
+            initial={{ token: '' }}
+            onSubmit={values => {
+              if (!values.token) {
+                setError(new Error('Token or NIP-05 address is required'))
+              } else {
+                auth(values.token)
+              }
+            }}
+          >
+            <Input
+              label='Connect with token or NIP-05 address'
+              name='token'
+              placeholder='bunker://...  or NIP-05 address'
+              required
+              autoFocus
+            />
+            <div className='mt-2'>
+              <SubmitButton className='w-100' variant='primary'>
+                {text || 'Login'} with token or NIP-05
+              </SubmitButton>
             </div>
-            {status.button && (
-              <Button
-                className='w-100' variant='primary'
-                onClick={() => status.button.action()}
-              >
-                {status.button.label}
-              </Button>
-            )}
-            {suggestion && (
-              <div className='text-muted text-center small pt-2'>{suggestion}</div>
-            )}
-          </>
-          )
-        : (
-          <>
-            <Form
-              initial={{ token: '' }}
-              onSubmit={values => {
-                if (!values.token) {
-                  setError(new Error('Token or NIP-05 address is required'))
-                } else {
-                  auth(values.token)
-                }
-              }}
-            >
-              <Input
-                label='Connect with token or NIP-05 address'
-                name='token'
-                placeholder='bunker://...  or NIP-05 address'
-                required
-                autoFocus
-              />
-              <div className='mt-2'>
-                <SubmitButton className='w-100' variant='primary'>
-                  {text || 'Login'} with token or NIP-05
-                </SubmitButton>
-              </div>
-            </Form>
-            <div className='text-center text-muted fw-bold my-2'>or</div>
-            <Button
-              variant='nostr'
-              className='w-100'
-              type='submit'
-              onClick={async () => {
-                try {
-                  await auth()
-                } catch (e) {
-                  setError(e)
-                }
-              }}
-            >
-              {text || 'Login'} with extension
-            </Button>
-          </>
-          )}
+          </Form>
+          <div className='text-center text-muted fw-bold my-2'>or</div>
+          <Button
+            variant='nostr'
+            className='w-100'
+            type='submit'
+            onClick={async () => {
+              try {
+                await auth()
+              } catch (e) {
+                setError(e)
+              }
+            }}
+          >
+            {text || 'Login'} with extension
+          </Button>
+        </>
+      )}
     </>
   )
 }