@better-auth/passkey 1.7.0-beta.2 → 1.7.0-beta.4

package/dist/client.d.mts

@@ -1,4 +1,4 @@
-import { a as PasskeyExtensionsResolver, c as PasskeyRegistrationUser, i as PasskeyAuthenticationOptions, l as WebAuthnChallengeValue, n as PASSKEY_ERROR_CODES, o as PasskeyOptions, r as Passkey, s as PasskeyRegistrationOptions, t as passkey } from "./index-Ci55sGSw.mjs";
+import { a as PasskeyExtensionsResolver, c as PasskeyRegistrationUser, i as PasskeyAuthenticationOptions, l as WebAuthnChallengeValue, n as PASSKEY_ERROR_CODES, o as PasskeyOptions, r as Passkey, s as PasskeyRegistrationOptions, t as passkey } from "./index-BoC1i3hA.mjs";
 import { AuthenticationExtensionsClientInputs, AuthenticationExtensionsClientOutputs, AuthenticationResponseJSON, RegistrationResponseJSON } from "@simplewebauthn/server";
 import * as better_auth_client0 from "better-auth/client";
 import * as nanostores from "nanostores";
@@ -39,6 +39,14 @@ declare const getPasskeyActions: ($fetch: BetterFetch, {
         user: User;
       };
       error: null;
+    } | {
+      data: null;
+      error: {
+        code: string;
+        message: string;
+        status: number;
+        statusText: string;
+      };
     } | {
       webauthn: {
         response: AuthenticationResponseJSON;
@@ -60,14 +68,6 @@ declare const getPasskeyActions: ($fetch: BetterFetch, {
         user: User;
       };
       error: null;
-    } | {
-      data: null;
-      error: {
-        code: string;
-        message: string;
-        status: number;
-        statusText: string;
-      };
     }>;
   };
   passkey: {
@@ -165,6 +165,14 @@ declare const passkeyClient: () => {
           user: User;
         };
         error: null;
+      } | {
+        data: null;
+        error: {
+          code: string;
+          message: string;
+          status: number;
+          statusText: string;
+        };
       } | {
         webauthn: {
           response: AuthenticationResponseJSON;
@@ -186,14 +194,6 @@ declare const passkeyClient: () => {
           user: User;
         };
         error: null;
-      } | {
-        data: null;
-        error: {
-          code: string;
-          message: string;
-          status: number;
-          statusText: string;
-        };
       }>;
     };
     passkey: {

package/dist/client.mjs

@@ -1,4 +1,4 @@
-import { n as PASSKEY_ERROR_CODES, t as PACKAGE_VERSION } from "./version-CD3SIse6.mjs";
+import { n as PASSKEY_ERROR_CODES, t as PACKAGE_VERSION } from "./version-D_0sS5d6.mjs";
 import { WebAuthnError, startAuthentication, startRegistration } from "@simplewebauthn/browser";
 import { useAuthQuery } from "better-auth/client";
 import { atom } from "nanostores";
@@ -10,18 +10,31 @@ const getPasskeyActions = ($fetch, { $listPasskeys, $store }) => {
 			throw: false
 		});
 		if (!response.data) return response;
+		const mergedExtensions = response.data.extensions || opts?.extensions ? {
+			...response.data.extensions || {},
+			...opts?.extensions || {}
+		} : void 0;
+		let res;
 		try {
-			const mergedExtensions = response.data.extensions || opts?.extensions ? {
-				...response.data.extensions || {},
-				...opts?.extensions || {}
-			} : void 0;
-			const res = await startAuthentication({
+			res = await startAuthentication({
 				optionsJSON: {
 					...response.data,
 					extensions: mergedExtensions
 				},
 				useBrowserAutofill: opts?.autoFill
 			});
+		} catch (err) {
+			return {
+				data: null,
+				error: {
+					code: err instanceof WebAuthnError ? err.code : "AUTH_CANCELLED",
+					message: PASSKEY_ERROR_CODES.AUTH_CANCELLED.message,
+					status: 400,
+					statusText: "BAD_REQUEST"
+				}
+			};
+		}
+		try {
 			const { clientExtensionResults, ...responseBody } = res;
 			const verified = await $fetch("/passkey/verify-authentication", {
 				body: { response: responseBody },

package/dist/{index-Ci55sGSw.d.mts → index-BoC1i3hA.d.mts}

@@ -250,7 +250,7 @@ declare const passkey: (options?: PasskeyOptions | undefined) => {
             image?: string | null | undefined;
           };
         };
-      }>)[] | undefined;
+      }>)[];
       query: zod.ZodOptional<zod.ZodObject<{
         authenticatorAttachment: zod.ZodOptional<zod.ZodEnum<{
           platform: "platform";
@@ -503,7 +503,7 @@ declare const passkey: (options?: PasskeyOptions | undefined) => {
             image?: string | null | undefined;
           };
         };
-      }>)[] | undefined;
+      }>)[];
       metadata: {
         openapi: {
           operationId: string;

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-import { n as PASSKEY_ERROR_CODES, o as PasskeyOptions, r as Passkey, t as passkey } from "./index-Ci55sGSw.mjs";
+import { n as PASSKEY_ERROR_CODES, o as PasskeyOptions, r as Passkey, t as passkey } from "./index-BoC1i3hA.mjs";
 export { PASSKEY_ERROR_CODES, Passkey, PasskeyOptions, passkey };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { n as PASSKEY_ERROR_CODES, t as PACKAGE_VERSION } from "./version-CD3SIse6.mjs";
+import { n as PASSKEY_ERROR_CODES, t as PACKAGE_VERSION } from "./version-D_0sS5d6.mjs";
 import { mergeSchema } from "better-auth/db";
 import { createAuthEndpoint } from "@better-auth/core/api";
 import { APIError } from "@better-auth/core/error";
@@ -55,7 +55,7 @@ const generatePasskeyQuerySchema = z.object({
 const generatePasskeyRegistrationOptions = (opts, { maxAgeInSeconds }) => {
 	return createAuthEndpoint("/passkey/generate-register-options", {
 		method: "GET",
-		use: opts.registration?.requireSession ?? true ? [freshSessionMiddleware] : void 0,
+		use: opts.registration?.requireSession ?? true ? [freshSessionMiddleware] : [],
 		query: generatePasskeyQuerySchema,
 		metadata: { openapi: {
 			operationId: "generatePasskeyRegistrationOptions",
@@ -294,7 +294,7 @@ const verifyPasskeyRegistration = (options) => {
 	return createAuthEndpoint("/passkey/verify-registration", {
 		method: "POST",
 		body: verifyPasskeyRegistrationBodySchema,
-		use: requireSession ? [freshSessionMiddleware] : void 0,
+		use: requireSession ? [freshSessionMiddleware] : [],
 		metadata: { openapi: {
 			operationId: "passkeyVerifyRegistration",
 			description: "Verify registration of a new passkey",
@@ -313,7 +313,7 @@ const verifyPasskeyRegistration = (options) => {
 		const webAuthnCookie = ctx.context.createAuthCookie(options.advanced.webAuthnChallengeCookie);
 		const verificationToken = await ctx.getSignedCookie(webAuthnCookie.name, ctx.context.secret);
 		if (!verificationToken) throw APIError.from("BAD_REQUEST", PASSKEY_ERROR_CODES.CHALLENGE_NOT_FOUND);
-		const data = await ctx.context.internalAdapter.findVerificationValue(verificationToken);
+		const data = await ctx.context.internalAdapter.consumeVerificationValue(verificationToken);
 		if (!data) throw APIError.from("BAD_REQUEST", PASSKEY_ERROR_CODES.CHALLENGE_NOT_FOUND);
 		const { expectedChallenge, userData, context } = JSON.parse(data.value);
 		const session = requireSession ? ctx.context.session : await getSessionFromCtx(ctx);
@@ -357,7 +357,7 @@ const verifyPasskeyRegistration = (options) => {
 				publicKey: pubKey,
 				counter: credential.counter,
 				deviceType: credentialDeviceType,
-				transports: resp.response.transports.join(","),
+				transports: resp.response.transports?.join(",") ?? "",
 				backedUp: credentialBackedUp,
 				createdAt: /* @__PURE__ */ new Date(),
 				aaguid
@@ -366,9 +366,9 @@ const verifyPasskeyRegistration = (options) => {
 				model: "passkey",
 				data: newPasskey
 			});
-			await ctx.context.internalAdapter.deleteVerificationByIdentifier(verificationToken);
 			return ctx.json(newPasskeyRes, { status: 200 });
 		} catch (e) {
+			if (e instanceof APIError) throw e;
 			ctx.context.logger.error("Failed to verify registration", e);
 			throw APIError.from("INTERNAL_SERVER_ERROR", PASSKEY_ERROR_CODES.FAILED_TO_VERIFY_REGISTRATION);
 		}
@@ -402,7 +402,7 @@ const verifyPasskeyAuthentication = (options) => createAuthEndpoint("/passkey/ve
 	const webAuthnCookie = ctx.context.createAuthCookie(options.advanced.webAuthnChallengeCookie);
 	const verificationToken = await ctx.getSignedCookie(webAuthnCookie.name, ctx.context.secret);
 	if (!verificationToken) throw APIError.from("BAD_REQUEST", PASSKEY_ERROR_CODES.CHALLENGE_NOT_FOUND);
-	const data = await ctx.context.internalAdapter.findVerificationValue(verificationToken);
+	const data = await ctx.context.internalAdapter.consumeVerificationValue(verificationToken);
 	if (!data) throw APIError.from("BAD_REQUEST", PASSKEY_ERROR_CODES.CHALLENGE_NOT_FOUND);
 	const { expectedChallenge } = JSON.parse(data.value);
 	const passkey = await ctx.context.adapter.findOne({
@@ -450,12 +450,12 @@ const verifyPasskeyAuthentication = (options) => createAuthEndpoint("/passkey/ve
 			session: s,
 			user
 		});
-		await ctx.context.internalAdapter.deleteVerificationByIdentifier(verificationToken);
 		return ctx.json({
 			session: s,
 			user
 		}, { status: 200 });
 	} catch (e) {
+		if (e instanceof APIError) throw e;
 		ctx.context.logger.error("Failed to verify authentication", e);
 		throw APIError.from("BAD_REQUEST", PASSKEY_ERROR_CODES.AUTHENTICATION_FAILED);
 	}

package/dist/{version-CD3SIse6.mjs → version-D_0sS5d6.mjs}

@@ -18,6 +18,6 @@ const PASSKEY_ERROR_CODES = defineErrorCodes({
 });
 //#endregion
 //#region src/version.ts
-const PACKAGE_VERSION = "1.7.0-beta.2";
+const PACKAGE_VERSION = "1.7.0-beta.4";
 //#endregion
 export { PASSKEY_ERROR_CODES as n, PACKAGE_VERSION as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/passkey",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.4",
   "description": "Passkey plugin for Better Auth",
   "type": "module",
   "license": "MIT",
@@ -55,16 +55,16 @@
   },
   "devDependencies": {
     "tsdown": "0.21.1",
-    "@better-auth/core": "1.7.0-beta.2",
-    "better-auth": "1.7.0-beta.2"
+    "@better-auth/core": "1.7.0-beta.4",
+    "better-auth": "1.7.0-beta.4"
   },
   "peerDependencies": {
-    "@better-auth/utils": "0.4.0",
+    "@better-auth/utils": "0.4.1",
     "@better-fetch/fetch": "1.1.21",
     "better-call": "1.3.5",
     "nanostores": "^1.0.1",
-    "@better-auth/core": "^1.7.0-beta.2",
-    "better-auth": "^1.7.0-beta.2"
+    "@better-auth/core": "^1.7.0-beta.4",
+    "better-auth": "^1.7.0-beta.4"
   },
   "scripts": {
     "build": "tsdown",