better-auth 1.7.20 → 1.7.22

package/dist/plugins/captcha/error-codes.mjs

@@ -1,5 +1,5 @@
 import { defineErrorCodes } from "@better-auth/core/utils/error-codes";
-//#region src/plugins/captcha/error-codes.ts
+// src/plugins/captcha/error-codes.ts
 const EXTERNAL_ERROR_CODES = defineErrorCodes({
 	VERIFICATION_FAILED: "Captcha verification failed",
 	MISSING_RESPONSE: "Missing CAPTCHA response",
@@ -9,5 +9,4 @@ const INTERNAL_ERROR_CODES = defineErrorCodes({
 	MISSING_SECRET_KEY: "Missing secret key",
 	SERVICE_UNAVAILABLE: "CAPTCHA service unavailable"
 });
-//#endregion
 export { EXTERNAL_ERROR_CODES, INTERNAL_ERROR_CODES };

package/dist/plugins/captcha/index.d.mts

@@ -1,5 +1,4 @@
 import { BaseCaptchaOptions, BotIdVerification, CaptchaFoxOptions, CaptchaOptions, CloudflareTurnstileOptions, GoogleRecaptchaOptions, HCaptchaOptions, Provider, ValidateRequestContext, VercelBotIdOptions } from "./types.mjs";
-//#region src/plugins/captcha/index.d.ts
 declare module "@better-auth/core" {
   interface BetterAuthPluginRegistry<AuthOptions, Options> {
     captcha: {
@@ -20,5 +19,4 @@ export declare const captcha: (options: CaptchaOptions) => {
   } | undefined>;
   options: CaptchaOptions;
 };
-//#endregion
 export type { BaseCaptchaOptions, BotIdVerification, CaptchaFoxOptions, CaptchaOptions, CloudflareTurnstileOptions, GoogleRecaptchaOptions, HCaptchaOptions, Provider, ValidateRequestContext, VercelBotIdOptions };

package/dist/plugins/captcha/index.mjs

@@ -1,6 +1,6 @@
+import { middlewareResponse } from "../../utils/middleware-response.mjs";
 import { wildcardMatch } from "../../utils/wildcard.mjs";
 import { PACKAGE_VERSION } from "../../version.mjs";
-import { middlewareResponse } from "../../utils/middleware-response.mjs";
 import { Providers, defaultEndpoints, siteVerifyMap } from "./constants.mjs";
 import { EXTERNAL_ERROR_CODES, INTERNAL_ERROR_CODES } from "./error-codes.mjs";
 import { captchaFox } from "./verify-handlers/captchafox.mjs";
@@ -9,7 +9,7 @@ import { googleRecaptcha } from "./verify-handlers/google-recaptcha.mjs";
 import { hCaptcha } from "./verify-handlers/h-captcha.mjs";
 import { vercelBotId } from "./verify-handlers/vercel-botid.mjs";
 import { getIP } from "@better-auth/core/utils/ip";
-//#region src/plugins/captcha/index.ts
+// src/plugins/captcha/index.ts
 const normalizeEndpointPath = (pathname, basePath) => {
 	let normalizedPathname = (pathname.startsWith(basePath) ? pathname.slice(basePath.length) : pathname).replace(/\/{2,}/g, "/");
 	if (!normalizedPathname.startsWith("/")) normalizedPathname = `/${normalizedPathname}`;
@@ -81,5 +81,4 @@ const captcha = (options) => ({
 	},
 	options
 });
-//#endregion
 export { captcha };

package/dist/plugins/captcha/types.d.mts

@@ -1,5 +1,4 @@
 import { Providers } from "./constants.mjs";
-//#region src/plugins/captcha/types.d.ts
 export type Provider = (typeof Providers)[keyof typeof Providers];
 export interface BaseCaptchaOptions {
   secretKey: string;
@@ -88,5 +87,4 @@ export interface VercelBotIdOptions {
    */
   validateRequest?: (ctx: ValidateRequestContext) => boolean | Promise<boolean>;
 }
-export type CaptchaOptions = GoogleRecaptchaOptions | CloudflareTurnstileOptions | HCaptchaOptions | CaptchaFoxOptions | VercelBotIdOptions;
-//#endregion
+export type CaptchaOptions = GoogleRecaptchaOptions | CloudflareTurnstileOptions | HCaptchaOptions | CaptchaFoxOptions | VercelBotIdOptions;

package/dist/plugins/captcha/utils.mjs

@@ -1,4 +1,4 @@
-//#region src/plugins/captcha/utils.ts
+// src/plugins/captcha/utils.ts
 const encodeToURLParams = (obj) => {
 	if (typeof obj !== "object" || obj === null || Array.isArray(obj)) throw new Error("Input must be a non-null object.");
 	const params = new URLSearchParams();
@@ -15,5 +15,4 @@ const withTimeout = (promise, timeoutMs) => {
 	});
 	return Promise.race([promise, timeout]).finally(() => clearTimeout(timer));
 };
-//#endregion
 export { encodeToURLParams, withTimeout };

package/dist/plugins/captcha/verify-handlers/captchafox.mjs

@@ -3,7 +3,7 @@ import { CAPTCHA_VERIFY_TIMEOUT_MS } from "../constants.mjs";
 import { EXTERNAL_ERROR_CODES, INTERNAL_ERROR_CODES } from "../error-codes.mjs";
 import { encodeToURLParams } from "../utils.mjs";
 import { betterFetch } from "@better-fetch/fetch";
-//#region src/plugins/captcha/verify-handlers/captchafox.ts
+// src/plugins/captcha/verify-handlers/captchafox.ts
 const captchaFox = async ({ siteVerifyURL, captchaResponse, secretKey, siteKey, remoteIP }) => {
 	const response = await betterFetch(siteVerifyURL, {
 		method: "POST",
@@ -23,5 +23,4 @@ const captchaFox = async ({ siteVerifyURL, captchaResponse, secretKey, siteKey,
 		status: 403
 	});
 };
-//#endregion
 export { captchaFox };

package/dist/plugins/captcha/verify-handlers/cloudflare-turnstile.mjs

@@ -2,7 +2,7 @@ import { middlewareResponse } from "../../../utils/middleware-response.mjs";
 import { CAPTCHA_VERIFY_TIMEOUT_MS } from "../constants.mjs";
 import { EXTERNAL_ERROR_CODES, INTERNAL_ERROR_CODES } from "../error-codes.mjs";
 import { betterFetch } from "@better-fetch/fetch";
-//#region src/plugins/captcha/verify-handlers/cloudflare-turnstile.ts
+// src/plugins/captcha/verify-handlers/cloudflare-turnstile.ts
 const cloudflareTurnstile = async ({ siteVerifyURL, captchaResponse, secretKey, logger, remoteIP, expectedAction, allowedHostnames }) => {
 	const response = await betterFetch(siteVerifyURL, {
 		method: "POST",
@@ -43,5 +43,4 @@ const cloudflareTurnstile = async ({ siteVerifyURL, captchaResponse, secretKey,
 		actualHostname: response.data.hostname
 	});
 };
-//#endregion
 export { cloudflareTurnstile };

package/dist/plugins/captcha/verify-handlers/google-recaptcha.mjs

@@ -3,7 +3,7 @@ import { CAPTCHA_VERIFY_TIMEOUT_MS } from "../constants.mjs";
 import { EXTERNAL_ERROR_CODES, INTERNAL_ERROR_CODES } from "../error-codes.mjs";
 import { encodeToURLParams } from "../utils.mjs";
 import { betterFetch } from "@better-fetch/fetch";
-//#region src/plugins/captcha/verify-handlers/google-recaptcha.ts
+// src/plugins/captcha/verify-handlers/google-recaptcha.ts
 const isV3 = (response) => {
 	return "score" in response && typeof response.score === "number";
 };
@@ -28,5 +28,4 @@ const googleRecaptcha = async ({ siteVerifyURL, captchaResponse, secretKey, minS
 	if (expectedAction && response.data.action !== expectedAction) return verificationFailed();
 	if (allowedHostnames && allowedHostnames.length > 0 && !allowedHostnames.includes(response.data.hostname)) return verificationFailed();
 };
-//#endregion
 export { googleRecaptcha };

package/dist/plugins/captcha/verify-handlers/h-captcha.mjs

@@ -3,7 +3,7 @@ import { CAPTCHA_VERIFY_TIMEOUT_MS } from "../constants.mjs";
 import { EXTERNAL_ERROR_CODES, INTERNAL_ERROR_CODES } from "../error-codes.mjs";
 import { encodeToURLParams } from "../utils.mjs";
 import { betterFetch } from "@better-fetch/fetch";
-//#region src/plugins/captcha/verify-handlers/h-captcha.ts
+// src/plugins/captcha/verify-handlers/h-captcha.ts
 const hCaptcha = async ({ siteVerifyURL, captchaResponse, secretKey, siteKey, remoteIP }) => {
 	const response = await betterFetch(siteVerifyURL, {
 		method: "POST",
@@ -23,5 +23,4 @@ const hCaptcha = async ({ siteVerifyURL, captchaResponse, secretKey, siteKey, re
 		status: 403
 	});
 };
-//#endregion
 export { hCaptcha };

package/dist/plugins/captcha/verify-handlers/vercel-botid.mjs

@@ -2,7 +2,7 @@ import { middlewareResponse } from "../../../utils/middleware-response.mjs";
 import { CAPTCHA_VERIFY_TIMEOUT_MS } from "../constants.mjs";
 import { EXTERNAL_ERROR_CODES, INTERNAL_ERROR_CODES } from "../error-codes.mjs";
 import { withTimeout } from "../utils.mjs";
-//#region src/plugins/captcha/verify-handlers/vercel-botid.ts
+// src/plugins/captcha/verify-handlers/vercel-botid.ts
 const vercelBotId = async ({ request, checkBotId, validateRequest }) => {
 	let isValid;
 	try {
@@ -23,5 +23,4 @@ const vercelBotId = async ({ request, checkBotId, validateRequest }) => {
 		status: 403
 	});
 };
-//#endregion
 export { vercelBotId };

package/dist/plugins/custom-session/client.d.mts

@@ -1,6 +1,5 @@
 import { BetterAuthOptions } from "../../types/index.mjs";
 import { Auth } from "better-auth";
-//#region src/plugins/custom-session/client.d.ts
 export declare const customSessionClient: <A extends Auth | {
   options: BetterAuthOptions;
 }>() => {
@@ -11,5 +10,4 @@ export declare const customSessionClient: <A extends Auth | {
   } ? O : A)["plugins"] extends (infer P)[] ? P extends {
     id: "custom-session";
   } ? P : never : never;
-};
-//#endregion
+};

package/dist/plugins/custom-session/client.mjs

@@ -1,7 +1,6 @@
 import { InferServerPlugin } from "../../client/plugins/infer-plugin.mjs";
-//#region src/plugins/custom-session/client.ts
+// src/plugins/custom-session/client.ts
 const customSessionClient = () => {
 	return InferServerPlugin();
 };
-//#endregion
 export { customSessionClient };

package/dist/plugins/custom-session/index.d.mts

@@ -1,6 +1,5 @@
 import { BetterAuthOptions, GenericEndpointContext } from "@better-auth/core";
 import { Session, User } from "@better-auth/core/db";
-//#region src/plugins/custom-session/index.d.ts
 declare module "@better-auth/core" {
   interface BetterAuthPluginRegistry<AuthOptions, Options> {
     "custom-session": {
@@ -63,5 +62,4 @@ export declare const customSession: <Returns extends Record<string, any>, O exte
     Session: Awaited<ReturnType<typeof fn>>;
   };
   options: CustomSessionPluginOptions | undefined;
-};
-//#endregion
+};

package/dist/plugins/custom-session/index.mjs

@@ -1,10 +1,10 @@
+import { getSession } from "../../api/routes/session.mjs";
 import { parseSetCookieHeader, toCookieOptions } from "../../cookies/cookie-utils.mjs";
 import { getSessionQuerySchema } from "../../cookies/session-store.mjs";
-import { getSession } from "../../api/routes/session.mjs";
-import { PACKAGE_VERSION } from "../../version.mjs";
 import { getEndpointResponse } from "../../utils/plugin-helper.mjs";
+import { PACKAGE_VERSION } from "../../version.mjs";
 import { createAuthEndpoint, createAuthMiddleware } from "@better-auth/core/api";
-//#region src/plugins/custom-session/index.ts
+// src/plugins/custom-session/index.ts
 const customSession = (fn, options, pluginOptions) => {
 	return {
 		id: "custom-session",
@@ -54,5 +54,4 @@ const customSession = (fn, options, pluginOptions) => {
 		options: pluginOptions
 	};
 };
-//#endregion
 export { customSession };

package/dist/plugins/device-authorization/client.d.mts

@@ -1,5 +1,4 @@
 import { DeviceAuthorizationGrant, deviceAuthorization } from "./index.mjs";
-//#region src/plugins/device-authorization/client.d.ts
 export declare const deviceAuthorizationClient: <Grant extends DeviceAuthorizationGrant | undefined = undefined>() => {
   id: "device-authorization";
   version: string;
@@ -11,5 +10,4 @@ export declare const deviceAuthorizationClient: <Grant extends DeviceAuthorizati
     "/device/approve": "POST";
     "/device/deny": "POST";
   };
-};
-//#endregion
+};

package/dist/plugins/device-authorization/client.mjs

@@ -1,5 +1,5 @@
 import { PACKAGE_VERSION } from "../../version.mjs";
-//#region src/plugins/device-authorization/client.ts
+// src/plugins/device-authorization/client.ts
 const deviceAuthorizationClient = () => {
 	return {
 		id: "device-authorization",
@@ -14,5 +14,4 @@ const deviceAuthorizationClient = () => {
 		}
 	};
 };
-//#endregion
 export { deviceAuthorizationClient };

package/dist/plugins/device-authorization/error-codes.mjs

@@ -1,5 +1,5 @@
 import { defineErrorCodes } from "@better-auth/core/utils/error-codes";
-//#region src/plugins/device-authorization/error-codes.ts
+// src/plugins/device-authorization/error-codes.ts
 const DEVICE_AUTHORIZATION_ERROR_CODES = defineErrorCodes({
 	INVALID_DEVICE_CODE: "Invalid device code",
 	EXPIRED_DEVICE_CODE: "Device code has expired",
@@ -15,5 +15,4 @@ const DEVICE_AUTHORIZATION_ERROR_CODES = defineErrorCodes({
 	INVALID_DEVICE_CODE_STATUS: "Invalid device code status",
 	AUTHENTICATION_REQUIRED: "Authentication required"
 });
-//#endregion
 export { DEVICE_AUTHORIZATION_ERROR_CODES };

package/dist/plugins/device-authorization/index.d.mts

@@ -1,10 +1,9 @@
 import { TimeString, ms, sec } from "../../utils/time.mjs";
-import { DeviceCode } from "./schema.mjs";
 import { DeviceCodeRedemptionAuthorization, DeviceCodeRedemptionResult, redeemDeviceCode } from "./routes.mjs";
+import { DeviceCode } from "./schema.mjs";
 import { GenericEndpointContext, StandardSchemaV1 } from "@better-auth/core";
 import { DBFieldAttribute } from "@better-auth/core/db";
 import * as z from "zod";
-//#region src/plugins/device-authorization/index.d.ts
 declare module "@better-auth/core" {
   interface BetterAuthPluginRegistry<AuthOptions, Options> {
     "device-authorization": {
@@ -550,5 +549,4 @@ export declare const deviceAuthorization: <Grant extends DeviceAuthorizationGran
     } | undefined;
   };
 };
-//#endregion
 export { type DeviceCode, type DeviceCodeRedemptionAuthorization, type DeviceCodeRedemptionResult, type TimeString, type ms, redeemDeviceCode, type sec };

package/dist/plugins/device-authorization/index.mjs

@@ -2,11 +2,11 @@ import { mergeSchema } from "../../db/schema.mjs";
 import { ms } from "../../utils/time.mjs";
 import { PACKAGE_VERSION } from "../../version.mjs";
 import { DEVICE_AUTHORIZATION_ERROR_CODES } from "./error-codes.mjs";
-import { schema } from "./schema.mjs";
 import { deviceApprove, deviceCode, deviceDeny, deviceToken, deviceVerify, redeemDeviceCode } from "./routes.mjs";
+import { schema } from "./schema.mjs";
 import { BetterAuthError } from "@better-auth/core/error";
 import * as z from "zod";
-//#region src/plugins/device-authorization/index.ts
+// src/plugins/device-authorization/index.ts
 const timeStringSchema = z.custom((val) => {
 	if (typeof val !== "string") return false;
 	try {
@@ -84,5 +84,4 @@ const deviceAuthorization = (options = {}) => {
 		}
 	};
 };
-//#endregion
 export { deviceAuthorization, deviceAuthorizationOptionsSchema, redeemDeviceCode };

package/dist/plugins/device-authorization/routes.d.mts

@@ -1,11 +1,10 @@
-import { Where } from "../../types/adapter.mjs";
-import { User } from "../../types/models.mjs";
 import "../../types/index.mjs";
-import { DeviceCode } from "./schema.mjs";
+import { User } from "../../types/models.mjs";
+import { Where } from "../../types/adapter.mjs";
 import "./index.mjs";
+import { DeviceCode } from "./schema.mjs";
 import { GenericEndpointContext } from "@better-auth/core";
 import "zod";
-//#region src/plugins/device-authorization/routes.d.ts
 export interface DeviceCodeRedemptionAuthorization<AuthorizationContext> {
   /** Additional ownership predicate used by the atomic claim. */
   ownershipWhere: Where;
@@ -30,5 +29,4 @@ export declare function redeemDeviceCode<DeviceCodeFields extends Record<string,
   deviceCode: string;
   authorizeRedemption: (deviceCode: DeviceCode & DeviceCodeFields) => DeviceCodeRedemptionAuthorization<AuthorizationContext> | Promise<DeviceCodeRedemptionAuthorization<AuthorizationContext>>;
   prepareRedemption: (deviceCode: DeviceCode & DeviceCodeFields, authorizationContext: AuthorizationContext) => RedemptionContext | Promise<RedemptionContext>;
-}): Promise<DeviceCodeRedemptionResult<DeviceCodeFields, AuthorizationContext, RedemptionContext>>;
-//#endregion
+}): Promise<DeviceCodeRedemptionResult<DeviceCodeFields, AuthorizationContext, RedemptionContext>>;

package/dist/plugins/device-authorization/routes.mjs

@@ -1,11 +1,11 @@
-import { ms } from "../../utils/time.mjs";
-import { generateRandomString } from "../../crypto/random.mjs";
 import { getAuthoritativeSessionFromCtx } from "../../api/routes/session.mjs";
+import { generateRandomString } from "../../crypto/random.mjs";
+import { ms } from "../../utils/time.mjs";
 import { DEVICE_AUTHORIZATION_ERROR_CODES } from "./error-codes.mjs";
 import { APIError } from "@better-auth/core/error";
 import { createAuthEndpoint } from "@better-auth/core/api";
 import * as z from "zod";
-//#region src/plugins/device-authorization/routes.ts
+// src/plugins/device-authorization/routes.ts
 const defaultCharset = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
 const MAX_DEVICE_CODE_GENERATION_ATTEMPTS = 3;
 const UNIQUE_CONSTRAINT_ERROR_IDENTIFIERS = /* @__PURE__ */ new Set([
@@ -550,6 +550,21 @@ const deviceVerify = (grant) => createAuthEndpoint("/device", {
 			increment: {},
 			set: { userId: session.user.id }
 		})) deviceCodeRecord.userId = session.user.id;
+		else {
+			const current = await ctx.context.adapter.findOne({
+				model: "deviceCode",
+				where: [{
+					field: "id",
+					value: deviceCodeRecord.id
+				}]
+			});
+			if (!current) throw new APIError("BAD_REQUEST", {
+				error: "invalid_request",
+				error_description: DEVICE_AUTHORIZATION_ERROR_CODES.INVALID_USER_CODE.message
+			});
+			deviceCodeRecord.userId = current.userId;
+			deviceCodeRecord.status = current.status;
+		}
 	}
 	const canReviewRequest = session?.user.id !== void 0 && deviceCodeRecord.userId === session.user.id;
 	const grantContext = canReviewRequest ? grant?.getVerificationContext(deviceCodeRecord) : void 0;
@@ -724,5 +739,4 @@ const defaultGenerateUserCode = (length) => {
 	const chars = new Uint8Array(length);
 	return Array.from(crypto.getRandomValues(chars)).map((byte) => defaultCharset[byte % 32]).join("");
 };
-//#endregion
 export { deviceApprove, deviceCode, deviceDeny, deviceToken, deviceVerify, redeemDeviceCode };

package/dist/plugins/device-authorization/schema.d.mts

@@ -1,5 +1,4 @@
 import * as z from "zod";
-//#region src/plugins/device-authorization/schema.d.ts
 declare const deviceCode: z.ZodObject<{
   id: z.ZodString;
   deviceCode: z.ZodString;
@@ -13,5 +12,4 @@ declare const deviceCode: z.ZodObject<{
   scope: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export type DeviceCode = z.infer<typeof deviceCode>;
-//#endregion
 export {};

package/dist/plugins/device-authorization/schema.mjs

@@ -1,5 +1,5 @@
 import * as z from "zod";
-//#region src/plugins/device-authorization/schema.ts
+// src/plugins/device-authorization/schema.ts
 const schema = { deviceCode: {
 	fields: {
 		deviceCode: {
@@ -59,5 +59,4 @@ z.object({
 	clientId: z.string().optional(),
 	scope: z.string().optional()
 });
-//#endregion
 export { schema };

package/dist/plugins/email-otp/client.d.mts

@@ -1,6 +1,5 @@
 import { emailOTP } from "./index.mjs";
 import { EMAIL_OTP_ERROR_CODES } from "./error-codes.mjs";
-//#region src/plugins/email-otp/client.d.ts
 export declare const emailOTPClient: () => {
   id: "email-otp";
   version: string;
@@ -15,5 +14,4 @@ export declare const emailOTPClient: () => {
     TOO_MANY_ATTEMPTS: import("@better-auth/core/utils/error-codes").RawError<"TOO_MANY_ATTEMPTS">;
   };
 };
-//#endregion
 export { EMAIL_OTP_ERROR_CODES };

package/dist/plugins/email-otp/client.mjs

@@ -1,6 +1,6 @@
 import { PACKAGE_VERSION } from "../../version.mjs";
 import { EMAIL_OTP_ERROR_CODES } from "./error-codes.mjs";
-//#region src/plugins/email-otp/client.ts
+// src/plugins/email-otp/client.ts
 const emailOTPClient = () => {
 	return {
 		id: "email-otp",
@@ -13,5 +13,4 @@ const emailOTPClient = () => {
 		$ERROR_CODES: EMAIL_OTP_ERROR_CODES
 	};
 };
-//#endregion
 export { EMAIL_OTP_ERROR_CODES, emailOTPClient };

package/dist/plugins/email-otp/error-codes.d.mts

@@ -1,7 +1,5 @@
-//#region src/plugins/email-otp/error-codes.d.ts
 export declare const EMAIL_OTP_ERROR_CODES: {
   OTP_EXPIRED: import("@better-auth/core/utils/error-codes").RawError<"OTP_EXPIRED">;
   INVALID_OTP: import("@better-auth/core/utils/error-codes").RawError<"INVALID_OTP">;
   TOO_MANY_ATTEMPTS: import("@better-auth/core/utils/error-codes").RawError<"TOO_MANY_ATTEMPTS">;
-};
-//#endregion
+};

package/dist/plugins/email-otp/error-codes.mjs

@@ -1,9 +1,8 @@
 import { defineErrorCodes } from "@better-auth/core/utils/error-codes";
-//#region src/plugins/email-otp/error-codes.ts
+// src/plugins/email-otp/error-codes.ts
 const EMAIL_OTP_ERROR_CODES = defineErrorCodes({
 	OTP_EXPIRED: "OTP expired",
 	INVALID_OTP: "Invalid OTP",
 	TOO_MANY_ATTEMPTS: "Too many attempts"
 });
-//#endregion
 export { EMAIL_OTP_ERROR_CODES };

package/dist/plugins/email-otp/index.d.mts

@@ -1,5 +1,4 @@
 import { EmailOTPOptions } from "./types.mjs";
-//#region src/plugins/email-otp/index.d.ts
 declare module "@better-auth/core" {
   interface BetterAuthPluginRegistry<AuthOptions, Options> {
     "email-otp": {
@@ -540,5 +539,4 @@ export declare const emailOTP: (options: EmailOTPOptions) => {
     TOO_MANY_ATTEMPTS: import("@better-auth/core/utils/error-codes").RawError<"TOO_MANY_ATTEMPTS">;
   };
 };
-//#endregion
 export type { EmailOTPOptions };

package/dist/plugins/email-otp/index.mjs

@@ -1,13 +1,13 @@
-import { getDate } from "../../utils/date.mjs";
 import { generateRandomString } from "../../crypto/random.mjs";
+import { getDate } from "../../utils/date.mjs";
+import { getEndpointResponse } from "../../utils/plugin-helper.mjs";
 import { PACKAGE_VERSION } from "../../version.mjs";
 import { EMAIL_OTP_ERROR_CODES } from "./error-codes.mjs";
-import { getEndpointResponse } from "../../utils/plugin-helper.mjs";
-import { toOTPIdentifier } from "./utils.mjs";
 import { storeOTP } from "./otp-token.mjs";
 import { changeEmailEmailOTP, checkVerificationOTP, createVerificationOTP, forgetPasswordEmailOTP, getVerificationOTP, requestEmailChangeEmailOTP, requestPasswordResetEmailOTP, resetPasswordEmailOTP, sendVerificationOTP, signInEmailOTP, verifyEmailOTP } from "./routes.mjs";
+import { toOTPIdentifier } from "./utils.mjs";
 import { createAuthMiddleware } from "@better-auth/core/api";
-//#region src/plugins/email-otp/index.ts
+// src/plugins/email-otp/index.ts
 const defaultOTPGenerator = (options) => generateRandomString(options.otpLength ?? 6, "0-9");
 const emailOTP = (options) => {
 	const opts = {
@@ -141,5 +141,4 @@ const emailOTP = (options) => {
 		$ERROR_CODES: EMAIL_OTP_ERROR_CODES
 	};
 };
-//#endregion
 export { emailOTP };

package/dist/plugins/email-otp/otp-token.mjs

@@ -1,8 +1,8 @@
-import { getDate } from "../../utils/date.mjs";
-import { constantTimeEqual } from "../../crypto/buffer.mjs";
 import { symmetricDecrypt, symmetricEncrypt } from "../../crypto/index.mjs";
+import { constantTimeEqual } from "../../crypto/buffer.mjs";
+import { getDate } from "../../utils/date.mjs";
 import { defaultKeyHasher, splitAtLastColon } from "./utils.mjs";
-//#region src/plugins/email-otp/otp-token.ts
+// src/plugins/email-otp/otp-token.ts
 async function storeOTP(ctx, opts, otp) {
 	if (opts.storeOTP === "encrypted") return await symmetricEncrypt({
 		key: ctx.context.secretConfig,
@@ -63,5 +63,4 @@ async function tryReuseOTP(ctx, opts, identifier) {
 	await ctx.context.internalAdapter.updateVerificationByIdentifier(identifier, { expiresAt: getDate(opts.expiresIn, "sec") });
 	return plainOtp;
 }
-//#endregion
 export { storeOTP, tryReuseOTP, verifyStoredOTP };

package/dist/plugins/email-otp/routes.mjs

@@ -1,21 +1,21 @@
 import { formCsrfMiddleware } from "../../api/middlewares/origin-check.mjs";
-import { parseUserInput, parseUserOutput } from "../../db/schema.mjs";
-import { getDate } from "../../utils/date.mjs";
+import { APIError as APIError$1 } from "../../api/index.mjs";
+import { setCookieCache, setSessionCookie } from "../../cookies/index.mjs";
 import { generateRandomString } from "../../crypto/random.mjs";
 import { symmetricDecrypt } from "../../crypto/index.mjs";
-import { setCookieCache, setSessionCookie } from "../../cookies/index.mjs";
 import { revokeUnprovenAccountAccess } from "../../db/revoke-unproven-account-access.mjs";
+import { parseUserInput, parseUserOutput } from "../../db/schema.mjs";
 import { getSessionFromCtx, sensitiveSessionMiddleware } from "../../api/routes/session.mjs";
+import { getDate } from "../../utils/date.mjs";
 import { assertPasswordNotTooLong, assertPasswordNotTooShort, resetCredentialPassword } from "../../utils/password.mjs";
-import { APIError as APIError$1 } from "../../api/index.mjs";
 import { EMAIL_OTP_ERROR_CODES } from "./error-codes.mjs";
-import { splitAtLastColon, toOTPIdentifier } from "./utils.mjs";
 import { storeOTP, tryReuseOTP, verifyStoredOTP } from "./otp-token.mjs";
+import { splitAtLastColon, toOTPIdentifier } from "./utils.mjs";
 import { BASE_ERROR_CODES } from "@better-auth/core/error";
 import { createAuthEndpoint } from "@better-auth/core/api";
 import { deprecate } from "@better-auth/core/utils/deprecate";
 import * as z from "zod";
-//#region src/plugins/email-otp/routes.ts
+// src/plugins/email-otp/routes.ts
 const types = [
 	"email-verification",
 	"sign-in",
@@ -771,5 +771,4 @@ async function atomicVerifyOTP(ctx, opts, identifier, providedOTP, successDispos
 		expiresAt: consumed.expiresAt
 	})) throw APIError$1.fromStatus("INTERNAL_SERVER_ERROR", { message: "Unable to complete OTP verification" });
 }
-//#endregion
 export { changeEmailEmailOTP, checkVerificationOTP, createVerificationOTP, forgetPasswordEmailOTP, getVerificationOTP, requestEmailChangeEmailOTP, requestPasswordResetEmailOTP, resetPasswordEmailOTP, sendVerificationOTP, signInEmailOTP, verifyEmailOTP };

package/dist/plugins/email-otp/types.d.mts

@@ -1,5 +1,4 @@
 import { GenericEndpointContext } from "@better-auth/core";
-//#region src/plugins/email-otp/types.d.ts
 export interface EmailOTPOptions {
   /**
    * Function to send email verification.
@@ -103,5 +102,4 @@ export interface EmailOTPOptions {
     window: number;
     max: number;
   };
-}
-//#endregion
+}

package/dist/plugins/email-otp/utils.mjs

@@ -1,6 +1,6 @@
 import { base64Url } from "@better-auth/utils/base64";
 import { createHash } from "@better-auth/utils/hash";
-//#region src/plugins/email-otp/utils.ts
+// src/plugins/email-otp/utils.ts
 function toOTPIdentifier(type, email) {
 	return `${type}-otp-${email}`;
 }
@@ -13,5 +13,4 @@ function splitAtLastColon(input) {
 	if (idx === -1) return [input, ""];
 	return [input.slice(0, idx), input.slice(idx + 1)];
 }
-//#endregion
 export { defaultKeyHasher, splitAtLastColon, toOTPIdentifier };

package/dist/plugins/generic-oauth/error-codes.mjs

@@ -1,8 +1,7 @@
 import { defineErrorCodes } from "@better-auth/core/utils/error-codes";
-//#region src/plugins/generic-oauth/error-codes.ts
+// src/plugins/generic-oauth/error-codes.ts
 const GENERIC_OAUTH_ERROR_CODES = defineErrorCodes({
 	INVALID_OAUTH_CONFIGURATION: "Invalid OAuth configuration",
 	TOKEN_URL_NOT_FOUND: "Invalid OAuth configuration. Token URL not found."
 });
-//#endregion
 export { GENERIC_OAUTH_ERROR_CODES };

package/dist/plugins/generic-oauth/index.d.mts

@@ -12,7 +12,6 @@ import { YandexOptions, yandex } from "./providers/yandex.mjs";
 import "./providers/index.mjs";
 import { AuthContext } from "@better-auth/core";
 import { OAuthProvider } from "@better-auth/core/oauth2";
-//#region src/plugins/generic-oauth/index.d.ts
 declare module "@better-auth/core" {
   interface BetterAuthPluginRegistry<AuthOptions, Options> {
     "generic-oauth": {
@@ -25,10 +24,7 @@ declare module "@better-auth/core" {
  * Extracts common fields from GenericOAuthConfig for provider helpers.
  */
 export type BaseOAuthProviderOptions = Pick<GenericOAuthConfig, "clientId" | "clientSecret" | "tokenEndpointAuth" | "scopes" | "redirectURI" | "endSessionEndpoint" | "postLogoutRedirectURI" | "disableProviderLogout" | "pkce" | "disableImplicitSignUp" | "disableSignUp" | "overrideUserInfo">;
-type PendingDiscovery = Map<string, {
-  config: GenericOAuthConfig;
-  attempt?: Promise<void> | undefined;
-}>;
+type PendingDiscovery = Map<string, GenericOAuthConfig>;
 /**
  * A generic OAuth plugin that registers any OAuth/OIDC provider
  * as a first-class social provider.
@@ -57,5 +53,4 @@ export declare const genericOAuth: <const ID extends string>(options: GenericOAu
     TOKEN_URL_NOT_FOUND: import("@better-auth/core/utils/error-codes").RawError<"TOKEN_URL_NOT_FOUND">;
   };
 };
-//#endregion
 export { type Auth0Options, type GenericOAuthConfig, type GenericOAuthOptions, type GenericOAuthUserInfo, type GumroadOptions, type HubSpotOptions, type KeycloakOptions, type LineOptions, type MicrosoftEntraIdOptions, type OktaOptions, type PatreonOptions, type SlackOptions, type YandexOptions, auth0, gumroad, hubspot, keycloak, line, microsoftEntraId, okta, patreon, slack, yandex };