@account-kit/signer 4.0.0-beta.8 → 4.0.0

package/src/session/manager.ts

@@ -8,8 +8,8 @@ import {
 import { createStore, type Mutate, type StoreApi } from "zustand/vanilla";
 import type { BaseSignerClient } from "../client/base";
 import type { User } from "../client/types";
-import type { Session, SessionManagerEvents } from "./types";
 import { assertNever } from "../utils/typeAssertions.js";
+import type { Session, SessionManagerEvents } from "./types";
 
 export const DEFAULT_SESSION_MS = 15 * 60 * 1000; // 15 minutes
 
@@ -93,6 +93,7 @@ export class SessionManager {
           .completeAuthWithBundle({
             bundle: existingSession.bundle,
             orgId: existingSession.user.orgId,
+            authenticatingType: existingSession.type,
             connectedEventName,
           })
           .catch((e) => {

package/src/signer.ts

@@ -31,7 +31,12 @@ export type AuthParams =
       claims?: string;
     } & OauthProviderConfig &
       OauthRedirectConfig)
-  | { type: "oauthReturn"; bundle: string; orgId: string };
+  | {
+      type: "oauthReturn";
+      bundle: string;
+      orgId: string;
+      idToken: string;
+    };
 
 export type OauthProviderConfig =
   | {
@@ -105,9 +110,59 @@ export class AlchemyWebSigner extends BaseAlchemySigner<AlchemySignerWebClient>
     } else {
       client = params_.client;
     }
-    super({
-      client,
-      sessionConfig,
-    });
+    const { emailBundle, oauthBundle, oauthOrgId, oauthError, idToken } =
+      getAndRemoveQueryParams({
+        emailBundle: "bundle",
+        // We don't need this, but we still want to remove it from the URL.
+        emailOrgId: "orgId",
+        oauthBundle: "alchemy-bundle",
+        oauthOrgId: "alchemy-org-id",
+        oauthError: "alchemy-error",
+        idToken: "alchemy-id-token",
+      });
+
+    const initialError =
+      oauthError != null
+        ? { name: "OauthError", message: oauthError }
+        : undefined;
+
+    super({ client, sessionConfig, initialError });
+
+    if (emailBundle) {
+      this.authenticate({ type: "email", bundle: emailBundle });
+    } else if (oauthBundle && oauthOrgId && idToken) {
+      this.authenticate({
+        type: "oauthReturn",
+        bundle: oauthBundle,
+        orgId: oauthOrgId,
+        idToken,
+      });
+    }
+  }
+}
+
+/**
+ * Reads and removes the specified query params from the URL.
+ *
+ * @param {T} keys object whose values are the query parameter keys to read and
+ * remove
+ * @returns {{ [K in keyof T]: string | undefined }} object with the same keys
+ * as the input whose values are the values of the query params.
+ */
+function getAndRemoveQueryParams<T extends Record<string, string>>(
+  keys: T
+): { [K in keyof T]: string | undefined } {
+  const url = new URL(window.location.href);
+  const result: Record<string, string | undefined> = {};
+  let foundQueryParam = false;
+  for (const [key, param] of Object.entries(keys)) {
+    const value = url.searchParams.get(param) ?? undefined;
+    foundQueryParam ||= value != null;
+    result[key] = value;
+    url.searchParams.delete(param);
+  }
+  if (foundQueryParam) {
+    window.history.replaceState(window.history.state, "", url.toString());
   }
+  return result as { [K in keyof T]: string | undefined };
 }

package/src/types.ts

@@ -4,6 +4,7 @@ export type AlchemySignerEvents = {
   connected(user: User): void;
   disconnected(): void;
   statusChanged(status: AlchemySignerStatus): void;
+  errorChanged(error: ErrorInfo | undefined): void;
 };
 
 export type AlchemySignerEvent = keyof AlchemySignerEvents;
@@ -12,6 +13,13 @@ export enum AlchemySignerStatus {
   INITIALIZING = "INITIALIZING",
   CONNECTED = "CONNECTED",
   DISCONNECTED = "DISCONNECTED",
-  AUTHENTICATING = "AUTHENTICATING",
+  AUTHENTICATING_PASSKEY = "AUTHENTICATING_PASSKEY",
+  AUTHENTICATING_EMAIL = "AUTHENTICATING_EMAIL",
+  AUTHENTICATING_OAUTH = "AUTHENTICATING_OAUTH",
   AWAITING_EMAIL_AUTH = "AWAITING_EMAIL_AUTH",
 }
+
+export interface ErrorInfo {
+  name: string;
+  message: string;
+}

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "4.0.0-beta.8";
+export const VERSION = "4.0.0-beta.10";