chore: rebase

Author: o-az

src/core/internal/modes/relay.ts

@@ -19,6 +19,7 @@ import * as Erc8010 from '../erc8010.js'
 import * as Mode from '../mode.js'
 import * as PermissionsRequest from '../permissionsRequest.js'
 import * as RequiredFunds from '../requiredFunds.js'
+import type * as Capabilities from '../schema/capabilities.js'
 import * as Siwe from '../siwe.js'
 import * as Tokens from '../tokens.js'
 import * as U from '../utils.js'
@@ -106,10 +107,16 @@ export function relay(parameters: relay.Parameters = {}) {
 
         const signInWithEthereum_response = await (async () => {
           if (!signInWithEthereum) return undefined
+          const resolvedSignInWithEthereum =
+            resolveSiweDefaults(signInWithEthereum)
 
-          const message = await Siwe.buildMessage(client, signInWithEthereum, {
-            address: account.address,
-          })
+          const message = await Siwe.buildMessage(
+            client,
+            resolvedSignInWithEthereum,
+            {
+              address: account.address,
+            },
+          )
           const signature = await Account.sign(eoa, {
             payload: PersonalMessage.getSignPayload(Hex.fromString(message)),
             storage: config.storage,
@@ -120,7 +127,21 @@ export function relay(parameters: relay.Parameters = {}) {
             signature,
           })
 
-          return { message, signature: signature_erc8010 }
+          // If authUrl is provided, authenticate with the server
+          const authUrl = signInWithEthereum.authUrl
+            ? Siwe.resolveAuthUrl(signInWithEthereum.authUrl)
+            : undefined
+
+          if (!authUrl) return { message, signature: signature_erc8010 }
+
+          const { token } = await Siwe.authenticate({
+            address: account.address,
+            authUrl,
+            message,
+            signature: signature_erc8010,
+          })
+
+          return { message, signature: signature_erc8010, token }
         })()
 
         return {
@@ -346,9 +367,11 @@ export function relay(parameters: relay.Parameters = {}) {
         // prepareCalls requires the EOA address, but we don't know it here.
         const { digest, digestType, message } = await (async () => {
           if (signInWithEthereum && parameters.address) {
+            const resolvedSignInWithEthereum =
+              resolveSiweDefaults(signInWithEthereum)
             const message = await Siwe.buildMessage(
               client,
-              signInWithEthereum,
+              resolvedSignInWithEthereum,
               {
                 address: parameters.address,
               },
@@ -489,6 +512,8 @@ export function relay(parameters: relay.Parameters = {}) {
 
         const signInWithEthereum_response = await (async () => {
           if (!signInWithEthereum) return undefined
+          const resolvedSignInWithEthereum =
+            resolveSiweDefaults(signInWithEthereum)
 
           if (digestType === 'siwe' && message && signature) {
             const signature_erc8010 = await Erc8010.wrap(client, {
@@ -498,28 +523,39 @@ export function relay(parameters: relay.Parameters = {}) {
             return { message, signature: signature_erc8010 }
           }
 
-          {
-            const message = await Siwe.buildMessage(
-              client,
-              signInWithEthereum,
-              {
-                address: account.address,
-              },
-            )
-            const signature = await Account.sign(account, {
-              payload: PersonalMessage.getSignPayload(Hex.fromString(message)),
-              role: 'admin',
-              webAuthn,
-            })
-            const signature_erc8010 = await Erc8010.wrap(client, {
+          const message_ = await Siwe.buildMessage(
+            client,
+            resolvedSignInWithEthereum,
+            {
               address: account.address,
-              signature,
-            })
-            return {
-              message,
-              signature: signature_erc8010,
-            }
-          }
+            },
+          )
+          const signature_ = await Account.sign(account, {
+            payload: PersonalMessage.getSignPayload(Hex.fromString(message_)),
+            role: 'admin',
+            webAuthn,
+          })
+          const signature_erc8010 = await Erc8010.wrap(client, {
+            address: account.address,
+            signature: signature_,
+          })
+
+          // If authUrl is provided, authenticate with the server
+          const authUrl = signInWithEthereum.authUrl
+            ? Siwe.resolveAuthUrl(signInWithEthereum.authUrl)
+            : undefined
+
+          if (!authUrl)
+            return { message: message_, signature: signature_erc8010 }
+
+          const { token } = await Siwe.authenticate({
+            address: account.address,
+            authUrl,
+            message: message_,
+            signature: signature_erc8010,
+          })
+
+          return { message: message_, signature: signature_erc8010, token }
         })()
 
         return {