@rhinestone/1auth 0.7.4 → 0.7.6

package/dist/index.mjs

@@ -5,10 +5,10 @@ import {
   ETHEREUM_MESSAGE_PREFIX,
   hashMessage,
   verifyMessageHash
-} from "./chunk-IHBVEU33.mjs";
+} from "./chunk-6AHEN3FA.mjs";
 import {
   createOneAuthProvider
-} from "./chunk-UXBBB7AV.mjs";
+} from "./chunk-E4YZS7FZ.mjs";
 import {
   buildTransactionReview,
   encodeWebAuthnSignature,
@@ -750,7 +750,6 @@ var OneAuthClient = class {
    * call — the modal shows the appropriate flow based on whether the user
    * has a passkey registered.
    *
-   * @param options.username - Pre-fill the username field
    * @param options.theme - Override the theme for this modal invocation
    * @param options.oauthEnabled - Set to false to hide OAuth sign-in buttons
    * @param options.flow - Force the login or account-creation route instead
@@ -762,7 +761,7 @@ var OneAuthClient = class {
    * const result = await client.authWithModal();
    *
    * if (result.success) {
-   *   console.log('Signed in as:', result.user?.username);
+   *   console.log('Signed in as:', result.user?.address);
    *   console.log('Address:', result.user?.address); // typed `0x${string}`
    * } else if (result.error?.code === 'USER_CANCELLED') {
    *   // User closed the modal
@@ -780,7 +779,6 @@ var OneAuthClient = class {
    * is creating a login session, for example after an app-level "Log in"
    * button. The result intentionally matches {@link authWithModal}.
    *
-   * @param options.username - Optional account hint for the sign-in ceremony
    * @param options.theme - Override the theme for this modal invocation
    * @returns {@link AuthResult} with user details and typed address
    */
@@ -810,8 +808,7 @@ var OneAuthClient = class {
    */
   async openAuthModal(options) {
     const telemetry = this.createTelemetryOperation("auth", {
-      flow: options?.flow ?? "auto",
-      hasUsernameHint: !!options?.username
+      flow: options?.flow ?? "auto"
     });
     const dialogUrl = this.getDialogUrl();
     const requestId = this.createDialogRequestId();
@@ -822,12 +819,12 @@ var OneAuthClient = class {
     if (this.config.clientId) {
       params.set("clientId", this.config.clientId);
     }
-    if (options?.username) {
-      params.set("username", options.username);
-    }
     if (options?.oauthEnabled === false) {
       params.set("oauth", "0");
     }
+    if (options?.eoaConnect) {
+      params.set("eoaConnect", "1");
+    }
     if (options?.flow === "create-account") {
       params.set("switch", "1");
     }
@@ -896,7 +893,7 @@ var OneAuthClient = class {
    * const result = await client.connectWithModal();
    *
    * if (result.success) {
-   *   console.log('Connected as:', result.user?.username);
+   *   console.log('Connected as:', result.user?.address);
    * } else if (result.action === 'switch') {
    *   // User needs to sign in first
    *   const authResult = await client.authWithModal();
@@ -981,14 +978,14 @@ var OneAuthClient = class {
    * `{ success: false, action: "cancel", error: { code: "USER_CANCELLED", … } }`.
    *
    * @param options - Forwarded to whichever underlying modal is shown.
-   *   `username` and `oauthEnabled` only apply to the auth-modal fallback path.
+   *   `oauthEnabled` only applies to the auth-modal fallback path.
    * @returns A {@link ConnectResult} discriminated union.
    *
    * @example
    * ```typescript
    * const result = await client.connect();
    * if (result.success) {
-   *   console.log("Connected as", result.user?.username ?? result.user?.address);
+   *   console.log("Connected as", result.user?.address);
    * }
    * ```
    */
@@ -1003,9 +1000,12 @@ var OneAuthClient = class {
         return {
           success: true,
           user: {
-            username: authResult.user.username,
             address: authResult.user.address
           },
+          // Preserve the signer type from the auth modal — a wallet-picked
+          // (EOA) signup must not be silently normalized to "passkey", or the
+          // provider would route its transactions through intents.
+          signerType: authResult.signerType ?? "passkey",
           autoConnected: false
         };
       }
@@ -1173,17 +1173,17 @@ var OneAuthClient = class {
       targetChains: normalizeGrantTargetChains(options).join(","),
       sponsor: options.sponsor !== false
     });
-    if (!options.username && !options.accountAddress) {
+    if (!options.accountAddress) {
       this.emitTelemetry("grant_permission.failed", telemetry, {
         outcome: "failure",
         errorCode: "INVALID_OPTIONS",
-        errorMessage: "Either username or accountAddress is required"
+        errorMessage: "accountAddress is required"
       });
       return {
         success: false,
         error: {
           code: "INVALID_OPTIONS",
-          message: "Either username or accountAddress is required"
+          message: "accountAddress is required"
         }
       };
     }
@@ -1247,7 +1247,6 @@ var OneAuthClient = class {
       mode: "iframe",
       clientId: this.config.clientId,
       grant: cloneGrantPayload({
-        username: options.username,
         accountAddress: options.accountAddress,
         targetChain: targetChains[0],
         targetChains,
@@ -1302,17 +1301,16 @@ var OneAuthClient = class {
    * not send `clientId` for this lookup because grants are origin-scoped.
    */
   async listSessionGrants(options) {
-    if (!options.username && !options.accountAddress) {
+    if (!options.accountAddress) {
       return {
         success: false,
         error: {
           code: "INVALID_OPTIONS",
-          message: "Either username or accountAddress is required"
+          message: "accountAddress is required"
         }
       };
     }
     const params = new URLSearchParams();
-    if (options.username) params.set("username", options.username);
     if (options.accountAddress) params.set("accountAddress", options.accountAddress);
     if (options.includeRevoked) params.set("includeRevoked", "true");
     try {
@@ -1365,7 +1363,7 @@ var OneAuthClient = class {
    * if (result.success && result.challenge) {
    *   // Verify signature server-side
    *   const isValid = await verifyOnServer(
-   *     result.user?.username,
+   *     result.user?.address,
    *     result.challenge.signature,
    *     result.challenge.signedHash
    *   );
@@ -1396,15 +1394,14 @@ var OneAuthClient = class {
       return authResult;
     }
     const accountAddress = authResult.user?.address;
-    const username = authResult.user?.username;
-    if (!accountAddress && !username) {
+    if (!accountAddress) {
       const result2 = {
         success: false,
         user: authResult.user,
         signerType: authResult.signerType,
         error: {
           code: "AUTHENTICATE_USER_MISSING",
-          message: "Authentication succeeded but no username or account address was returned for challenge signing"
+          message: "Authentication succeeded but no account address was returned for challenge signing"
         }
       };
       this.emitTelemetry("auth.failed", telemetry, {
@@ -1414,7 +1411,6 @@ var OneAuthClient = class {
       return result2;
     }
     const signResult = await this.signMessage({
-      username,
       accountAddress,
       message: options.challenge,
       description: "Verify your identity",
@@ -1482,7 +1478,6 @@ var OneAuthClient = class {
     const ready = await this.waitForDialogReady(dialog, iframe, cleanup, {
       mode: "iframe",
       challenge: options.challenge,
-      username: options.username,
       accountAddress: options.accountAddress,
       description: options.description,
       transaction: options.transaction,
@@ -1534,7 +1529,7 @@ var OneAuthClient = class {
    * @example
    * ```typescript
    * const result = await client.sendIntent({
-   *   username: 'alice',
+   *   accountAddress: '0x...',
    *   targetChain: 8453, // Base
    *   calls: [
    *     {
@@ -1552,7 +1547,7 @@ var OneAuthClient = class {
    * ```
    */
   async sendIntent(options) {
-    const { username, accountAddress, targetChain } = options;
+    const { accountAddress, targetChain } = options;
     const calls = capCallLabels(options.calls);
     const sponsor = options.sponsor !== false;
     const telemetry = this.createTelemetryOperation("intent", {
@@ -1577,11 +1572,11 @@ var OneAuthClient = class {
         }
       };
     }
-    if (!username && !accountAddress) {
+    if (!accountAddress) {
       this.emitTelemetry("intent.completed", telemetry, {
         outcome: "failure",
         errorCode: "INVALID_OPTIONS",
-        errorMessage: "Either username or accountAddress is required"
+        errorMessage: "accountAddress is required"
       });
       return {
         success: false,
@@ -1589,7 +1584,7 @@ var OneAuthClient = class {
         status: "failed",
         error: {
           code: "INVALID_OPTIONS",
-          message: "Either username or accountAddress is required"
+          message: "accountAddress is required"
         }
       };
     }
@@ -1739,7 +1734,6 @@ var OneAuthClient = class {
     }
     let accessToken = accessTokenResult.ok ? accessTokenResult.accessToken : "";
     const requestBody = {
-      username,
       accountAddress,
       targetChain,
       calls,
@@ -1981,7 +1975,6 @@ var OneAuthClient = class {
             chainId: targetChain,
             transaction: prepareResponse.transaction,
             challenge: prepareResponse.challenge,
-            username,
             accountAddress: prepareResponse.accountAddress,
             originMessages: prepareResponse.originMessages,
             tokenRequests: serializedTokenRequests,
@@ -2036,7 +2029,6 @@ var OneAuthClient = class {
         signingMode: "transaction",
         calls,
         chainId: targetChain,
-        username,
         accountAddress: options.accountAddress,
         tokenRequests: serializedTokenRequests,
         telemetry: this.telemetryPayload(telemetry)
@@ -2112,7 +2104,6 @@ var OneAuthClient = class {
           chainId: targetChain,
           transaction: prepareResponse.transaction,
           challenge: prepareResponse.challenge,
-          username,
           accountAddress: prepareResponse.accountAddress,
           originMessages: prepareResponse.originMessages,
           tokenRequests: serializedTokenRequests,
@@ -2507,7 +2498,7 @@ var OneAuthClient = class {
    * @example
    * ```typescript
    * const result = await client.sendBatchIntent({
-   *   username: 'alice',
+   *   accountAddress: '0x...',
    *   intents: [
    *     {
    *       targetChain: 8453, // Base
@@ -2544,11 +2535,11 @@ var OneAuthClient = class {
         error: "Batch intents are not supported for EOA sessions. Use the connected wallet's native RPC instead."
       };
     }
-    if (!options.username && !options.accountAddress) {
+    if (!options.accountAddress) {
       this.emitTelemetry("batch.completed", telemetry, {
         outcome: "failure",
         errorCode: "INVALID_OPTIONS",
-        errorMessage: "Either username or accountAddress is required"
+        errorMessage: "accountAddress is required"
       });
       return {
         success: false,
@@ -2613,7 +2604,6 @@ var OneAuthClient = class {
       moduleInstall: intent.moduleInstall
     }));
     const requestBody = {
-      ...options.username && { username: options.username },
       ...options.accountAddress && { accountAddress: options.accountAddress },
       intents: serializedIntents,
       auth: { accessToken },
@@ -2739,7 +2729,6 @@ var OneAuthClient = class {
         batchFailedIntents: prepareResponse.failedIntents,
         challenge: prepareResponse.challenge,
         binding: prepareResponse.binding,
-        username: options.username,
         accountAddress: prepareResponse.accountAddress,
         userId: prepareResponse.userId,
         expiresAt: prepareResponse.expiresAt,
@@ -2758,7 +2747,6 @@ var OneAuthClient = class {
           calls: JSON.stringify(intent.calls)
           // No: transaction, intentOp, expiresAt, originMessages
         })),
-        username: options.username,
         accountAddress: options.accountAddress,
         telemetry: this.telemetryPayload(telemetry)
       };
@@ -2783,7 +2771,6 @@ var OneAuthClient = class {
         batchFailedIntents: prepareResponse.failedIntents,
         challenge: prepareResponse.challenge,
         binding: prepareResponse.binding,
-        username: options.username,
         accountAddress: prepareResponse.accountAddress,
         userId: prepareResponse.userId,
         expiresAt: prepareResponse.expiresAt,
@@ -3835,7 +3822,7 @@ var OneAuthClient = class {
    * ```typescript
    * // Sign a login challenge
    * const result = await client.signMessage({
-   *   username: 'alice',
+   *   accountAddress: '0x...',
    *   message: `Sign in to MyApp\nTimestamp: ${Date.now()}\nNonce: ${crypto.randomUUID()}`,
    *   description: 'Verify your identity to continue',
    * });
@@ -3897,7 +3884,6 @@ var OneAuthClient = class {
       mode: "iframe",
       message: options.message,
       challenge: options.challenge || options.message,
-      username: options.username,
       accountAddress: options.accountAddress,
       description: options.description,
       metadata: options.metadata,
@@ -3957,7 +3943,7 @@ var OneAuthClient = class {
    * ```typescript
    * // Sign an ERC-2612 Permit
    * const result = await client.signTypedData({
-   *   username: 'alice',
+   *   accountAddress: '0x...',
    *   domain: {
    *     name: 'Dai Stablecoin',
    *     version: '1',
@@ -4046,7 +4032,6 @@ var OneAuthClient = class {
         message: options.message
       },
       challenge: signedHash,
-      username: options.username,
       accountAddress: options.accountAddress,
       description: options.description,
       telemetry: this.telemetryPayload(telemetry)
@@ -4311,11 +4296,14 @@ var OneAuthClient = class {
     return this.fetchSigningResult(requestId);
   }
   /**
-   * Fetch passkeys for a user from the auth provider
+   * Fetch passkeys for a user from the auth provider.
+   *
+   * The account address is the sole identity; the backend `resolveUserWhere`
+   * accepts an address as a globally-unique path identifier.
    */
-  async getPasskeys(username) {
+  async getPasskeys(accountAddress) {
     const response = await fetch(
-      `${this.config.providerUrl}/api/users/${encodeURIComponent(username)}/passkeys`,
+      `${this.config.providerUrl}/api/users/${encodeURIComponent(accountAddress)}/passkeys`,
       {
         headers: this.config.clientId ? { "x-client-id": this.config.clientId } : {}
       }
@@ -4336,7 +4324,7 @@ var OneAuthClient = class {
    * them by `requestId` without relying on URL parameters alone. This avoids
    * exposing potentially large challenge payloads in query strings.
    *
-   * @param options - The signing options (challenge, username, description, etc.).
+   * @param options - The signing options (challenge, accountAddress, description, etc.).
    * @param mode - How the dialog will be opened (`"popup"`, `"redirect"`, or `"embed"`).
    * @param redirectUrl - Only required for `"redirect"` mode; the URL the dialog
    *   will navigate back to after signing.
@@ -4353,7 +4341,6 @@ var OneAuthClient = class {
         },
         body: JSON.stringify({
           ...this.config.clientId && { clientId: this.config.clientId },
-          username: options.username,
           accountAddress: options.accountAddress,
           challenge: options.challenge,
           description: options.description,
@@ -4681,6 +4668,7 @@ var OneAuthClient = class {
     iframe.setAttribute(
       "allow",
       [
+        "payment",
         `publickey-credentials-get ${hostUrl.origin}`,
         `publickey-credentials-create ${hostUrl.origin}`,
         "clipboard-write",
@@ -4845,7 +4833,6 @@ var OneAuthClient = class {
               success: true,
               user: {
                 id: data.data?.user?.id,
-                username: data.data?.username,
                 address: data.data?.address
               },
               signerType: data.data?.signerType ?? "passkey"
@@ -4899,7 +4886,6 @@ var OneAuthClient = class {
               success: true,
               user: {
                 id: data.data?.user?.id,
-                username: data.data?.username,
                 address: data.data?.address
               },
               signerType: data.data?.signerType ?? "passkey"
@@ -4931,7 +4917,7 @@ var OneAuthClient = class {
    *
    * The connect flow is a lightweight "are you still you?" confirmation that
    * does not require a new passkey ceremony. On success, the dialog returns the
-   * user's username, address, and an `autoConnected` flag indicating whether the
+   * user's address and an `autoConnected` flag indicating whether the
    * user had previously enabled auto-connect (in which case no UI was shown).
    *
    * On failure with `action: "switch"`, the caller should redirect to the full
@@ -4955,9 +4941,12 @@ var OneAuthClient = class {
             resolve({
               success: true,
               user: {
-                username: data.data?.username,
                 address: data.data?.address
               },
+              // Carry the signer type through so the SDK/provider can route EOA
+              // sessions to the connected wallet (plain tx, no intents) instead
+              // of defaulting to passkey intents. Absent = legacy passkey.
+              signerType: data.data?.signerType ?? "passkey",
               autoConnected: data.data?.autoConnected
             });
           } else {
@@ -5325,6 +5314,87 @@ function createCrossChainPermission(input) {
   };
 }
 
+// src/connection.ts
+var DEFAULT_CHAIN_ID = 8453;
+function readStoredSession(storageKey, provider, chainId) {
+  if (typeof window === "undefined") return null;
+  try {
+    const raw = localStorage.getItem(storageKey);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw);
+    if (!parsed?.address) return null;
+    return {
+      // Absent signerType = legacy passkey session (backwards compatible).
+      signerType: parsed.signerType === "eoa" ? "eoa" : "passkey",
+      address: parsed.address,
+      provider,
+      chainId,
+      autoConnected: false
+    };
+  } catch {
+    return null;
+  }
+}
+function createOneAuthConnection(config) {
+  const {
+    defaultChainId,
+    storageKey: storageKeyOption,
+    closeOn,
+    waitForHash,
+    hashTimeoutMs,
+    hashIntervalMs,
+    eoaConnect: eoaConnectConfig,
+    ...clientConfig
+  } = config;
+  const client = "client" in config && config.client ? config.client : new OneAuthClient(clientConfig);
+  const chainId = defaultChainId ?? DEFAULT_CHAIN_ID;
+  const storageKey = storageKeyOption ?? "1auth-user";
+  const provider = createOneAuthProvider({
+    client,
+    chainId,
+    storageKey,
+    closeOn,
+    waitForHash,
+    hashTimeoutMs,
+    hashIntervalMs
+  });
+  const getSession = () => readStoredSession(storageKey, provider, chainId);
+  const connect = async (options) => {
+    const eoaConnect = options?.eoaConnect ?? eoaConnectConfig ?? false;
+    const result = await client.connect({ ...options, eoaConnect });
+    if (!result.success || !result.user?.address) {
+      const error = result.error ?? {
+        code: "USER_CANCELLED",
+        message: "Connection was cancelled"
+      };
+      throw Object.assign(new Error(error.message), { code: error.code });
+    }
+    const signerType = result.signerType === "eoa" ? "eoa" : "passkey";
+    provider.setSession({ address: result.user.address, signerType });
+    return {
+      signerType,
+      address: result.user.address,
+      provider,
+      chainId,
+      autoConnected: result.autoConnected ?? false
+    };
+  };
+  const disconnect = async () => {
+    await provider.disconnect();
+  };
+  const subscribe = (listener) => {
+    const onAccountsChanged = (...args) => {
+      const accounts = args[0];
+      listener(
+        accounts && accounts.length > 0 ? getSession() : null
+      );
+    };
+    provider.on("accountsChanged", onAccountsChanged);
+    return () => provider.removeListener("accountsChanged", onAccountsChanged);
+  };
+  return { client, provider, connect, getSession, disconnect, subscribe };
+}
+
 // src/account.ts
 import {
   bytesToString,
@@ -5333,7 +5403,7 @@ import {
 } from "viem";
 import { toAccount } from "viem/accounts";
 function createPasskeyAccount(client, params) {
-  const { address, username } = params;
+  const { address } = params;
   const normalizeMessage = (message) => {
     if (typeof message === "string") return message;
     const raw = message.raw;
@@ -5350,7 +5420,6 @@ function createPasskeyAccount(client, params) {
     address,
     signMessage: async ({ message }) => {
       const result = await client.signMessage({
-        username: username || void 0,
         accountAddress: address,
         message: normalizeMessage(message)
       });
@@ -5386,7 +5455,6 @@ function createPasskeyAccount(client, params) {
         ])
       );
       const result = await client.signTypedData({
-        username: username || void 0,
         accountAddress: address,
         domain,
         types: normalizedTypes,
@@ -5401,7 +5469,6 @@ function createPasskeyAccount(client, params) {
   });
   return {
     ...account,
-    ...username ? { username } : {},
     accountAddress: address
   };
 }
@@ -5409,13 +5476,16 @@ function createPasskeyAccount(client, params) {
 // src/walletClient/index.ts
 import {
   createWalletClient,
-  hashMessage as hashMessage2,
-  hashTypedData as hashTypedData2
+  hashTypedData as hashTypedData2,
+  toHex
 } from "viem";
 import { toAccount as toAccount2 } from "viem/accounts";
+function formatSignableMessage(message) {
+  if (typeof message === "string") return message;
+  return typeof message.raw === "string" ? message.raw : toHex(message.raw);
+}
 function createPasskeyWalletClient(config) {
   const identity = {
-    ...config.username ? { username: config.username } : {},
     accountAddress: config.accountAddress
   };
   const provider = new OneAuthClient({
@@ -5428,20 +5498,10 @@ function createPasskeyWalletClient(config) {
     sponsorship: config.sponsorship
   });
   const signMessageImpl = async (message) => {
-    const hash = hashMessage2(message);
-    const result = await provider.signWithModal({
-      challenge: hash,
+    const result = await provider.signMessage({
       ...identity,
-      description: "Sign message",
-      transaction: {
-        actions: [
-          {
-            type: "custom",
-            label: "Sign Message",
-            sublabel: typeof message === "string" ? message.slice(0, 50) + (message.length > 50 ? "..." : "") : "Raw message"
-          }
-        ]
-      }
+      message: formatSignableMessage(message),
+      description: "Sign message"
     });
     if (!result.success) {
       throw new Error(result.error?.message || "Signing failed");
@@ -5510,7 +5570,6 @@ function createPasskeyWalletClient(config) {
       abi: call.abi
     }));
     return {
-      ...config.username ? { username: config.username } : {},
       accountAddress: config.accountAddress,
       targetChain,
       calls: intentCalls
@@ -5594,21 +5653,19 @@ function generateId() {
   return `${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
 }
 function getStorageKey(identity) {
-  const key = identity?.accountAddress || identity?.username;
+  const key = identity?.accountAddress;
   return key ? `1auth_batch_queue_${key.toLowerCase()}` : "1auth_batch_queue_anonymous";
 }
 function resolveIdentity(passedIdentity, providerIdentity) {
   if (typeof passedIdentity === "string") {
-    return { username: passedIdentity, accountAddress: providerIdentity.accountAddress };
+    return { accountAddress: passedIdentity };
   }
   return {
-    username: passedIdentity?.username ?? providerIdentity.username,
     accountAddress: passedIdentity?.accountAddress ?? providerIdentity.accountAddress
   };
 }
 function BatchQueueProvider({
   client,
-  username,
   accountAddress,
   children
 }) {
@@ -5617,8 +5674,8 @@ function BatchQueueProvider({
   const [isSigning, setIsSigning] = React.useState(false);
   const [animationTrigger, setAnimationTrigger] = React.useState(0);
   const providerIdentity = React.useMemo(
-    () => ({ username, accountAddress }),
-    [username, accountAddress]
+    () => ({ accountAddress }),
+    [accountAddress]
   );
   const batchChainId = queue.length > 0 ? queue[0].targetChain : null;
   React.useEffect(() => {
@@ -5684,14 +5741,14 @@ function BatchQueueProvider({
       };
     }
     const signer = resolveIdentity(identity, providerIdentity);
-    if (!signer.username && !signer.accountAddress) {
+    if (!signer.accountAddress) {
       return {
         success: false,
         intentId: "",
         status: "failed",
         error: {
           code: "MISSING_IDENTITY",
-          message: "Batch signing requires an accountAddress or username"
+          message: "Batch signing requires an accountAddress"
         }
       };
     }
@@ -5700,7 +5757,6 @@ function BatchQueueProvider({
     setIsSigning(true);
     try {
       const result = await client.sendIntent({
-        username: signer.username,
         accountAddress: signer.accountAddress,
         targetChain,
         calls
@@ -6036,6 +6092,7 @@ export {
   ETHEREUM_MESSAGE_PREFIX,
   OneAuthClient,
   createCrossChainPermission,
+  createOneAuthConnection,
   createOneAuthProvider,
   createPasskeyAccount,
   createPasskeyWalletClient,