faire-auth 1.0.3 → 1.1.0

package/dist/{test-utils/node-sqlite-dialect-BgJqjBOu.cjs → node-sqlite-dialect-D3QPFROH.cjs}

@@ -1,7 +1,5 @@
-const require_index = require('./index.cjs');
 let kysely = require("kysely");
-
-//#region src/adapters/kysely-adapter/node-sqlite-dialect.ts
+// src/adapters/kysely-adapter/node-sqlite-dialect.ts
 var NodeSqliteAdapter = class {
 	get supportsCreateIfNotExists() {
 		return true;
@@ -57,8 +55,8 @@ var NodeSqliteConnection = class {
 		this.#db = db;
 	}
 	executeQuery(compiledQuery) {
-		const { sql: sql$1, parameters } = compiledQuery;
-		const rows = this.#db.prepare(sql$1).all(...parameters);
+		const { sql, parameters } = compiledQuery;
+		const rows = this.#db.prepare(sql).all(...parameters);
 		return Promise.resolve({ rows });
 	}
 	async *streamQuery() {
@@ -69,7 +67,7 @@ var ConnectionMutex = class {
 	#promise;
 	#resolve;
 	async lock() {
-		while (this.#promise) await this.#promise;
+		while (this.#promise !== void 0) await this.#promise;
 		this.#promise = new Promise((resolve) => {
 			this.#resolve = resolve;
 		});
@@ -151,6 +149,4 @@ var NodeSqliteDialect = class {
 		return new NodeSqliteIntrospector(db);
 	}
 };
-
-//#endregion
-exports.NodeSqliteDialect = NodeSqliteDialect;
+exports.NodeSqliteDialect = NodeSqliteDialect;

package/dist/oauth2/index.cjs

@@ -1,25 +1,169 @@
-require('../hono-C14rpOEa.cjs');
-require('../crypto-DpSCnrTp.cjs');
-require('../json--tl7Grvs.cjs');
-require('../cookies-BTl72THv.cjs');
-require('../logged-Dv3st5qc.cjs');
-require('../url-Ce7CVaQD.cjs');
-require('../middleware-CWvRH4EW.cjs');
-require('../session-Cwrj4GfV.cjs');
-require('../origin-check-DjLTuZQ8.cjs');
-require('../email-verification-DI_0H4JC.cjs');
-const require_oauth2 = require('../oauth2-5RL4cVNS.cjs');
-const require_state = require('../state-CvSihlVT.cjs');
-
-exports.decryptOAuthToken = require_oauth2.decryptOAuthToken;
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_crypto = require("../crypto-BITfWVwD.cjs");
+const require_state = require("../state-2OrNjOO-.cjs");
+const require_email_verification = require("../email-verification-DOPnSgbI.cjs");
+let _faire_auth_core_env = require("@faire-auth/core/env");
+let _faire_auth_core_error = require("@faire-auth/core/error");
+// src/oauth2/utils.ts
+const decryptOAuthToken = (token, ctx, options) => {
+	if (!token) return token;
+	if (options.account?.encryptOAuthTokens) return (0, require_crypto.crypto_exports.symmetricDecrypt)({
+		key: ctx.get("context").secret,
+		data: token
+	});
+	return token;
+};
+const setTokenUtil = (token, ctx, options) => {
+	if (options.account?.encryptOAuthTokens && token) return (0, require_crypto.crypto_exports.symmetricEncrypt)({
+		key: ctx.get("context").secret,
+		data: token
+	});
+	return token;
+};
+// src/oauth2/link-account.ts
+const handleOAuthUserInfo = async (ctx, { userInfo, account, callbackURL, disableSignUp, overrideUserInfo }, options) => {
+	const context = ctx.get("context");
+	const redirectOnError = (reason) => {
+		const errorURL = options.onAPIError?.errorURL ?? `${context.baseURL}/error`;
+		return {
+			type: "redirect",
+			response: ctx.redirect(`${errorURL}?error=${reason}`, 302)
+		};
+	};
+	const dbUser = await context.internalAdapter.findOAuthUser(userInfo.email.toLowerCase(), account.accountId, account.providerId).catch((e) => {
+		_faire_auth_core_env.logger.error("Better auth was unable to query your database.\nError: ", e);
+		return "error";
+	});
+	if (dbUser === "error") return redirectOnError("internal_server_error");
+	let user = dbUser?.user ?? null;
+	const isRegister = user == null;
+	if (dbUser) {
+		const hasBeenLinked = dbUser.accounts.find((a) => a.providerId === account.providerId && a.accountId === account.accountId);
+		if (!hasBeenLinked) {
+			if (!(options.account?.accountLinking?.trustedProviders)?.includes(account.providerId) && !userInfo.emailVerified || options.account?.accountLinking?.enabled === false) {
+				if ((0, _faire_auth_core_env.isDevelopment)()) _faire_auth_core_env.logger.warn(`User already exist but account isn't linked to ${account.providerId}. To read more about how account linking works in Faire Auth see https://www.faire-auth.com/docs/concepts/users-accounts#account-linking.`);
+				return {
+					type: "error",
+					reason: "account_not_linked"
+				};
+			}
+			try {
+				await context.internalAdapter.linkAccount({
+					providerId: account.providerId,
+					accountId: userInfo.id.toString(),
+					userId: dbUser.user.id,
+					accessToken: await setTokenUtil(account.accessToken, ctx, options),
+					refreshToken: await setTokenUtil(account.refreshToken, ctx, options),
+					idToken: account.idToken,
+					accessTokenExpiresAt: account.accessTokenExpiresAt,
+					refreshTokenExpiresAt: account.refreshTokenExpiresAt,
+					scope: account.scope
+				});
+			} catch (e) {
+				_faire_auth_core_env.logger.error("Unable to link account", e);
+				return {
+					type: "error",
+					reason: "unable_to_link_account"
+				};
+			}
+			if (userInfo.emailVerified && !dbUser.user.emailVerified && userInfo.email.toLowerCase() === dbUser.user.email) await context.internalAdapter.updateUser(dbUser.user.id, { emailVerified: true });
+		} else {
+			if (options.account?.updateAccountOnSignIn !== false) {
+				const updateData = Object.fromEntries(Object.entries({
+					idToken: account.idToken,
+					accessToken: await setTokenUtil(account.accessToken, ctx, options),
+					refreshToken: await setTokenUtil(account.refreshToken, ctx, options),
+					accessTokenExpiresAt: account.accessTokenExpiresAt,
+					refreshTokenExpiresAt: account.refreshTokenExpiresAt,
+					scope: account.scope
+				}).filter(([, value]) => value !== void 0 && value !== ""));
+				if (Object.keys(updateData).length > 0) await context.internalAdapter.updateAccount(hasBeenLinked.id, updateData);
+			}
+			if (userInfo.emailVerified && !dbUser.user.emailVerified && userInfo.email.toLowerCase() === dbUser.user.email) await context.internalAdapter.updateUser(dbUser.user.id, { emailVerified: true });
+		}
+		if (overrideUserInfo === true) {
+			const { id: _, ...restUserInfo } = userInfo;
+			await context.internalAdapter.updateUser(dbUser.user.id, {
+				...restUserInfo,
+				email: userInfo.email.toLowerCase(),
+				emailVerified: userInfo.email.toLowerCase() === dbUser.user.email ? dbUser.user.emailVerified || userInfo.emailVerified : userInfo.emailVerified
+			});
+		}
+	} else {
+		if (disableSignUp === true) return {
+			type: "error",
+			reason: "signup_disabled",
+			isRegister: false
+		};
+		try {
+			const { id: _, ...restUserInfo } = userInfo;
+			user = await context.internalAdapter.createOAuthUser({
+				...restUserInfo,
+				email: userInfo.email.toLowerCase()
+			}, {
+				accessToken: await setTokenUtil(account.accessToken, ctx, options),
+				refreshToken: await setTokenUtil(account.refreshToken, ctx, options),
+				idToken: account.idToken,
+				accessTokenExpiresAt: account.accessTokenExpiresAt,
+				refreshTokenExpiresAt: account.refreshTokenExpiresAt,
+				scope: account.scope,
+				providerId: account.providerId,
+				accountId: userInfo.id.toString()
+			}).then((res) => res.user);
+			if (!userInfo.emailVerified && user && options.emailVerification?.sendOnSignUp === true) {
+				const token = await require_email_verification.createEmailVerificationToken(context.secret, user.email, void 0, options.emailVerification.expiresIn);
+				const url = `${context.baseURL}/verify-email?token=${token}${callbackURL ? `&callbackURL=${callbackURL}` : ""}`;
+				await options.emailVerification.sendVerificationEmail?.({
+					user,
+					url,
+					token
+				}, ctx);
+			}
+		} catch (e) {
+			_faire_auth_core_env.logger.error(e instanceof Error ? e.message : String(e), e);
+			if (e instanceof _faire_auth_core_error.APIError) return {
+				type: "error",
+				reason: e.message,
+				isRegister: false
+			};
+			return {
+				type: "error",
+				reason: "unable_to_create_user",
+				isRegister: false
+			};
+		}
+	}
+	if (!user) return {
+		type: "error",
+		reason: "unable_to_create_user",
+		isRegister: false
+	};
+	const session = await context.internalAdapter.createSession(user.id);
+	if (!session) return {
+		type: "error",
+		reason: "unable_to_create_session",
+		isRegister: false
+	};
+	return {
+		type: "success",
+		data: {
+			session,
+			user
+		},
+		isRegister
+	};
+};
+exports.decryptOAuthToken = decryptOAuthToken;
 exports.generateState = require_state.generateState;
-exports.handleOAuthUserInfo = require_oauth2.handleOAuthUserInfo;
+exports.handleOAuthUserInfo = handleOAuthUserInfo;
 exports.parseState = require_state.parseState;
-exports.setTokenUtil = require_oauth2.setTokenUtil;
-var __faire_auth_core_oauth2 = require("@faire-auth/core/oauth2");
-Object.keys(__faire_auth_core_oauth2).forEach(function (k) {
-  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
-    enumerable: true,
-    get: function () { return __faire_auth_core_oauth2[k]; }
-  });
+exports.setTokenUtil = setTokenUtil;
+var _faire_auth_core_oauth2 = require("@faire-auth/core/oauth2");
+Object.keys(_faire_auth_core_oauth2).forEach(function(k) {
+	if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function() {
+			return _faire_auth_core_oauth2[k];
+		}
+	});
 });

package/dist/oauth2/index.d.cts

@@ -1,23 +1,12 @@
-import { I as FaireAuthOptions$1, M as generateState, N as parseState } from "../index-CsWF3f7U.cjs";
-import { t as ContextVars } from "../hono-DOM31WQz.cjs";
+import { P as ContextVars, ht as FaireAuthOptions$1, v as generateState, y as parseState } from "../shared.cjs";
 import { ExK } from "@faire-auth/core/types";
 import { Context, TypedResponse } from "hono";
 import { Account, Session, User } from "@faire-auth/core/db";
 export * from "@faire-auth/core/oauth2";
-
-//#region src/oauth2/utils.d.ts
-declare const decryptOAuthToken: <V extends object>(token: string, ctx: Context<ContextVars<V>>, options: Pick<FaireAuthOptions$1, "account">) => string | Promise<string>;
-declare const setTokenUtil: <V extends object>(token: string | null | undefined, ctx: Context<ContextVars<V>>, options: Pick<FaireAuthOptions$1, "account">) => string | Promise<string> | null | undefined;
-//#endregion
-//#region src/oauth2/link-account.d.ts
+export declare const decryptOAuthToken: <V extends object>(token: string, ctx: Context<ContextVars<V>>, options: Pick<FaireAuthOptions$1, "account">) => any;
+export declare const setTokenUtil: <V extends object>(token: string | null | undefined, ctx: Context<ContextVars<V>>, options: Pick<FaireAuthOptions$1, "account">) => any;
 type OAuthError = "account_not_linked" | "unable_to_link_account" | "unable_to_create_user" | "unable_to_create_session" | "internal_server_error" | "signup_disabled" | (string & {});
-declare const handleOAuthUserInfo: (ctx: Context<ContextVars>, {
-  userInfo,
-  account,
-  callbackURL,
-  disableSignUp,
-  overrideUserInfo
-}: {
+export declare const handleOAuthUserInfo: (ctx: Context<ContextVars>, { userInfo, account, callbackURL, disableSignUp, overrideUserInfo }: {
   userInfo: ExK<User, "createdAt" | "updatedAt">;
   account: ExK<Account, "createdAt" | "id" | "updatedAt" | "userId">;
   callbackURL?: string;
@@ -38,5 +27,4 @@ declare const handleOAuthUserInfo: (ctx: Context<ContextVars>, {
   reason: OAuthError;
   isRegister?: false;
 }>;
-//#endregion
-export { decryptOAuthToken, generateState, handleOAuthUserInfo, parseState, setTokenUtil };
+export { generateState, parseState };

package/dist/oauth2/index.d.mts

@@ -1,23 +1,12 @@
-import { I as FaireAuthOptions$1, M as generateState, N as parseState } from "../index-rFv8Hxld.mjs";
-import { t as ContextVars } from "../hono-D0VqxVy1.mjs";
+import { A as generateState, gt as FaireAuthOptions$1, j as parseState, t as ContextVars } from "../shared.mjs";
 import { Context, TypedResponse } from "hono";
 import { Account, Session, User } from "@faire-auth/core/db";
 import { ExK } from "@faire-auth/core/types";
 export * from "@faire-auth/core/oauth2";
-
-//#region src/oauth2/utils.d.ts
-declare const decryptOAuthToken: <V extends object>(token: string, ctx: Context<ContextVars<V>>, options: Pick<FaireAuthOptions$1, "account">) => string | Promise<string>;
-declare const setTokenUtil: <V extends object>(token: string | null | undefined, ctx: Context<ContextVars<V>>, options: Pick<FaireAuthOptions$1, "account">) => string | Promise<string> | null | undefined;
-//#endregion
-//#region src/oauth2/link-account.d.ts
+export declare const decryptOAuthToken: <V extends object>(token: string, ctx: Context<ContextVars<V>>, options: Pick<FaireAuthOptions$1, "account">) => any;
+export declare const setTokenUtil: <V extends object>(token: string | null | undefined, ctx: Context<ContextVars<V>>, options: Pick<FaireAuthOptions$1, "account">) => any;
 type OAuthError = "account_not_linked" | "unable_to_link_account" | "unable_to_create_user" | "unable_to_create_session" | "internal_server_error" | "signup_disabled" | (string & {});
-declare const handleOAuthUserInfo: (ctx: Context<ContextVars>, {
-  userInfo,
-  account,
-  callbackURL,
-  disableSignUp,
-  overrideUserInfo
-}: {
+export declare const handleOAuthUserInfo: (ctx: Context<ContextVars>, { userInfo, account, callbackURL, disableSignUp, overrideUserInfo }: {
   userInfo: ExK<User, "createdAt" | "updatedAt">;
   account: ExK<Account, "createdAt" | "id" | "updatedAt" | "userId">;
   callbackURL?: string;
@@ -38,5 +27,4 @@ declare const handleOAuthUserInfo: (ctx: Context<ContextVars>, {
   reason: OAuthError;
   isRegister?: false;
 }>;
-//#endregion
-export { decryptOAuthToken, generateState, handleOAuthUserInfo, parseState, setTokenUtil };
+export { generateState, parseState };

package/dist/oauth2/index.mjs

@@ -1,16 +1,156 @@
-import "../hono-CoKYWnXA.mjs";
-import "../crypto-DH2Aa7jN.mjs";
-import "../json-B1v2qRTQ.mjs";
-import "../cookies-BTs1o992.mjs";
-import "../logged-CyGfp8_H.mjs";
-import "../url-BoUuoIwZ.mjs";
-import "../middleware-CE6OhDkq.mjs";
-import "../session-CM3rmOYF.mjs";
-import "../origin-check-8Gajklvh.mjs";
-import "../email-verification-C_lBu_JY.mjs";
-import { n as decryptOAuthToken, r as setTokenUtil, t as handleOAuthUserInfo } from "../oauth2-C56wz-n9.mjs";
-import { n as parseState, t as generateState } from "../state-CQghgH9I.mjs";
-
-export * from "@faire-auth/core/oauth2"
-
-export { decryptOAuthToken, generateState, handleOAuthUserInfo, parseState, setTokenUtil };
+import { n as crypto_exports } from "../crypto-BH-hD0lJ.mjs";
+import { n as parseState, t as generateState } from "../state-Dooeisfq.mjs";
+import { t as createEmailVerificationToken } from "../email-verification-YSR5n5lb.mjs";
+import { isDevelopment, logger } from "@faire-auth/core/env";
+import { APIError } from "@faire-auth/core/error";
+export * from "@faire-auth/core/oauth2";
+// src/oauth2/utils.ts
+const decryptOAuthToken = (token, ctx, options) => {
+	if (!token) return token;
+	if (options.account?.encryptOAuthTokens) return (0, crypto_exports.symmetricDecrypt)({
+		key: ctx.get("context").secret,
+		data: token
+	});
+	return token;
+};
+const setTokenUtil = (token, ctx, options) => {
+	if (options.account?.encryptOAuthTokens && token) return (0, crypto_exports.symmetricEncrypt)({
+		key: ctx.get("context").secret,
+		data: token
+	});
+	return token;
+};
+// src/oauth2/link-account.ts
+const handleOAuthUserInfo = async (ctx, { userInfo, account, callbackURL, disableSignUp, overrideUserInfo }, options) => {
+	const context = ctx.get("context");
+	const redirectOnError = (reason) => {
+		const errorURL = options.onAPIError?.errorURL ?? `${context.baseURL}/error`;
+		return {
+			type: "redirect",
+			response: ctx.redirect(`${errorURL}?error=${reason}`, 302)
+		};
+	};
+	const dbUser = await context.internalAdapter.findOAuthUser(userInfo.email.toLowerCase(), account.accountId, account.providerId).catch((e) => {
+		logger.error("Better auth was unable to query your database.\nError: ", e);
+		return "error";
+	});
+	if (dbUser === "error") return redirectOnError("internal_server_error");
+	let user = dbUser?.user ?? null;
+	const isRegister = user == null;
+	if (dbUser) {
+		const hasBeenLinked = dbUser.accounts.find((a) => a.providerId === account.providerId && a.accountId === account.accountId);
+		if (!hasBeenLinked) {
+			if (!(options.account?.accountLinking?.trustedProviders)?.includes(account.providerId) && !userInfo.emailVerified || options.account?.accountLinking?.enabled === false) {
+				if (isDevelopment()) logger.warn(`User already exist but account isn't linked to ${account.providerId}. To read more about how account linking works in Faire Auth see https://www.faire-auth.com/docs/concepts/users-accounts#account-linking.`);
+				return {
+					type: "error",
+					reason: "account_not_linked"
+				};
+			}
+			try {
+				await context.internalAdapter.linkAccount({
+					providerId: account.providerId,
+					accountId: userInfo.id.toString(),
+					userId: dbUser.user.id,
+					accessToken: await setTokenUtil(account.accessToken, ctx, options),
+					refreshToken: await setTokenUtil(account.refreshToken, ctx, options),
+					idToken: account.idToken,
+					accessTokenExpiresAt: account.accessTokenExpiresAt,
+					refreshTokenExpiresAt: account.refreshTokenExpiresAt,
+					scope: account.scope
+				});
+			} catch (e) {
+				logger.error("Unable to link account", e);
+				return {
+					type: "error",
+					reason: "unable_to_link_account"
+				};
+			}
+			if (userInfo.emailVerified && !dbUser.user.emailVerified && userInfo.email.toLowerCase() === dbUser.user.email) await context.internalAdapter.updateUser(dbUser.user.id, { emailVerified: true });
+		} else {
+			if (options.account?.updateAccountOnSignIn !== false) {
+				const updateData = Object.fromEntries(Object.entries({
+					idToken: account.idToken,
+					accessToken: await setTokenUtil(account.accessToken, ctx, options),
+					refreshToken: await setTokenUtil(account.refreshToken, ctx, options),
+					accessTokenExpiresAt: account.accessTokenExpiresAt,
+					refreshTokenExpiresAt: account.refreshTokenExpiresAt,
+					scope: account.scope
+				}).filter(([, value]) => value !== void 0 && value !== ""));
+				if (Object.keys(updateData).length > 0) await context.internalAdapter.updateAccount(hasBeenLinked.id, updateData);
+			}
+			if (userInfo.emailVerified && !dbUser.user.emailVerified && userInfo.email.toLowerCase() === dbUser.user.email) await context.internalAdapter.updateUser(dbUser.user.id, { emailVerified: true });
+		}
+		if (overrideUserInfo === true) {
+			const { id: _, ...restUserInfo } = userInfo;
+			await context.internalAdapter.updateUser(dbUser.user.id, {
+				...restUserInfo,
+				email: userInfo.email.toLowerCase(),
+				emailVerified: userInfo.email.toLowerCase() === dbUser.user.email ? dbUser.user.emailVerified || userInfo.emailVerified : userInfo.emailVerified
+			});
+		}
+	} else {
+		if (disableSignUp === true) return {
+			type: "error",
+			reason: "signup_disabled",
+			isRegister: false
+		};
+		try {
+			const { id: _, ...restUserInfo } = userInfo;
+			user = await context.internalAdapter.createOAuthUser({
+				...restUserInfo,
+				email: userInfo.email.toLowerCase()
+			}, {
+				accessToken: await setTokenUtil(account.accessToken, ctx, options),
+				refreshToken: await setTokenUtil(account.refreshToken, ctx, options),
+				idToken: account.idToken,
+				accessTokenExpiresAt: account.accessTokenExpiresAt,
+				refreshTokenExpiresAt: account.refreshTokenExpiresAt,
+				scope: account.scope,
+				providerId: account.providerId,
+				accountId: userInfo.id.toString()
+			}).then((res) => res.user);
+			if (!userInfo.emailVerified && user && options.emailVerification?.sendOnSignUp === true) {
+				const token = await createEmailVerificationToken(context.secret, user.email, void 0, options.emailVerification.expiresIn);
+				const url = `${context.baseURL}/verify-email?token=${token}${callbackURL ? `&callbackURL=${callbackURL}` : ""}`;
+				await options.emailVerification.sendVerificationEmail?.({
+					user,
+					url,
+					token
+				}, ctx);
+			}
+		} catch (e) {
+			logger.error(e instanceof Error ? e.message : String(e), e);
+			if (e instanceof APIError) return {
+				type: "error",
+				reason: e.message,
+				isRegister: false
+			};
+			return {
+				type: "error",
+				reason: "unable_to_create_user",
+				isRegister: false
+			};
+		}
+	}
+	if (!user) return {
+		type: "error",
+		reason: "unable_to_create_user",
+		isRegister: false
+	};
+	const session = await context.internalAdapter.createSession(user.id);
+	if (!session) return {
+		type: "error",
+		reason: "unable_to_create_session",
+		isRegister: false
+	};
+	return {
+		type: "success",
+		data: {
+			session,
+			user
+		},
+		isRegister
+	};
+};
+export { decryptOAuthToken, generateState, handleOAuthUserInfo, parseState, setTokenUtil };

package/dist/{origin-check-DjLTuZQ8.cjs → origin-check-BflGhEEN.cjs}

@@ -1,10 +1,8 @@
-const require_chunk = require('./chunk-fPmz2rbM.cjs');
-const require_url = require('./url-Ce7CVaQD.cjs');
-const require_middleware = require('./middleware-CWvRH4EW.cjs');
-let __faire_auth_core_env = require("@faire-auth/core/env");
-let __faire_auth_core_static = require("@faire-auth/core/static");
-
-//#region src/utils/wildcard.ts
+const require_url = require("./url-DjCmCUHS.cjs");
+const require_middleware = require("./middleware-Cd-VkNxB.cjs");
+let _faire_auth_core_env = require("@faire-auth/core/env");
+let _faire_auth_core_static = require("@faire-auth/core/static");
+// src/utils/wildcard.ts
 /**
 * Escapes a character if it has a special meaning in regular expressions
 * and returns the character as is if it doesn't
@@ -51,9 +49,11 @@ const transform = (pattern, separator = true) => {
 		const nextSegment = segments[s + 1];
 		let currentSeparator = "";
 		if (segment == null && s > 0) continue;
-		if (truthySeparator) if (s === segments.length - 1) currentSeparator = optionalSeparator;
-		else if (nextSegment !== "**") currentSeparator = requiredSeparator;
-		else currentSeparator = "";
+		if (truthySeparator) {
+			if (s === segments.length - 1) currentSeparator = optionalSeparator;
+			else if (nextSegment !== "**") currentSeparator = requiredSeparator;
+			else currentSeparator = "";
+		}
 		if (truthySeparator && segment === "**") {
 			if (currentSeparator) {
 				result += s === 0 ? "" : currentSeparator;
@@ -116,9 +116,7 @@ function wildcardMatch(pattern, options) {
 	fn.regexp = regexp;
 	return fn;
 }
-
-//#endregion
-//#region src/api/middleware/origin-check.ts
+// src/api/middleware/origin-check.ts
 const RELATIVE_PATH_RE = /^\/(?!\/|\\|%2f|%5c)[\w\-.\+/@]*(?:\?[\w\-.\+/=&%@]*)?$/;
 const matchesPattern = (url, pattern) => {
 	if (url.startsWith("/")) return false;
@@ -129,17 +127,17 @@ const matchesPattern = (url, pattern) => {
 	const protocol = require_url.getProtocol(url);
 	return protocol === "http:" || protocol === "https:" || !protocol ? pattern === require_url.getOrigin(url) : url.startsWith(pattern);
 };
-const validateURL = (url, label, trustedOrigins, logger$1, ctx) => {
+const validateURL = (url, label, trustedOrigins, logger, ctx) => {
 	if (url == null) return null;
 	let isTrustedOrigin = false;
 	trustedOrigins.forEach((origin) => {
 		if (isTrustedOrigin === false && (matchesPattern(url, origin) || url.startsWith("/") && label !== "origin" && RELATIVE_PATH_RE.test(url))) isTrustedOrigin = true;
 	});
 	if (!isTrustedOrigin) {
-		logger$1.error(`Invalid ${label}: ${url}`);
-		logger$1.info(`If it's a valid URL, please add ${url} to trustedOrigins in your auth config\n`, `Current list of trustedOrigins: ${[...trustedOrigins].join(", ")}`);
+		logger.error(`Invalid ${label}: ${url}`);
+		logger.info(`If it's a valid URL, please add ${url} to trustedOrigins in your auth config\n`, `Current list of trustedOrigins: ${[...trustedOrigins].join(", ")}`);
 		return ctx.json({
-			success: __faire_auth_core_static.False,
+			success: _faire_auth_core_static.False,
 			message: `Invalid ${label}`
 		}, 403);
 	}
@@ -151,8 +149,8 @@ const validateURL = (url, label, trustedOrigins, logger$1, ctx) => {
 */
 const initOriginCheckMiddleware = (options, context) => {
 	const log = {
-		info: (message, ...args) => options.logger?.log?.("info", message, ...args) ?? __faire_auth_core_env.logger.info,
-		error: (message, ...args) => options.logger?.log?.("error", message, ...args) ?? __faire_auth_core_env.logger.error
+		info: (message, ...args) => options.logger?.log?.("info", message, ...args) ?? _faire_auth_core_env.logger.info,
+		error: (message, ...args) => options.logger?.log?.("error", message, ...args) ?? _faire_auth_core_env.logger.error
 	};
 	return require_middleware.createMiddleware()(async (ctx, next) => {
 		if (ctx.get("isServer") === true || ctx.req.method !== "POST") return await next();
@@ -213,7 +211,7 @@ const originCheck = (getValue) => {
 		if (ctx.get("isServer") === true) return await next();
 		const context = ctx.get("context");
 		let callbackURL = getValue(ctx);
-		if ((0, __faire_auth_core_static.isPromise)(callbackURL)) callbackURL = await callbackURL;
+		if ((0, _faire_auth_core_static.isPromise)(callbackURL)) callbackURL = await callbackURL;
 		if (!callbackURL) return await next();
 		const callbacks = Array.isArray(callbackURL) ? callbackURL : [callbackURL];
 		let ret;
@@ -224,23 +222,21 @@ const originCheck = (getValue) => {
 		return await next();
 	});
 };
-
-//#endregion
-Object.defineProperty(exports, 'initOriginCheckMiddleware', {
-  enumerable: true,
-  get: function () {
-    return initOriginCheckMiddleware;
-  }
+Object.defineProperty(exports, "initOriginCheckMiddleware", {
+	enumerable: true,
+	get: function() {
+		return initOriginCheckMiddleware;
+	}
 });
-Object.defineProperty(exports, 'originCheck', {
-  enumerable: true,
-  get: function () {
-    return originCheck;
-  }
+Object.defineProperty(exports, "originCheck", {
+	enumerable: true,
+	get: function() {
+		return originCheck;
+	}
+});
+Object.defineProperty(exports, "wildcardMatch", {
+	enumerable: true,
+	get: function() {
+		return wildcardMatch;
+	}
 });
-Object.defineProperty(exports, 'wildcardMatch', {
-  enumerable: true,
-  get: function () {
-    return wildcardMatch;
-  }
-});

package/dist/{origin-check-8Gajklvh.mjs → origin-check-CRgs1M7k.mjs}

@@ -1,9 +1,8 @@
-import { a as getTrustedOrigins, i as getProtocol, n as getHost, r as getOrigin } from "./url-BoUuoIwZ.mjs";
-import { r as createMiddleware } from "./middleware-CE6OhDkq.mjs";
+import { a as getTrustedOrigins, i as getProtocol, n as getHost, r as getOrigin } from "./url-CJtdrrUu.mjs";
+import { r as createMiddleware } from "./middleware-Cakg4e1D.mjs";
 import { logger } from "@faire-auth/core/env";
 import { False, isPromise } from "@faire-auth/core/static";
-
-//#region src/utils/wildcard.ts
+// src/utils/wildcard.ts
 /**
 * Escapes a character if it has a special meaning in regular expressions
 * and returns the character as is if it doesn't
@@ -50,9 +49,11 @@ const transform = (pattern, separator = true) => {
 		const nextSegment = segments[s + 1];
 		let currentSeparator = "";
 		if (segment == null && s > 0) continue;
-		if (truthySeparator) if (s === segments.length - 1) currentSeparator = optionalSeparator;
-		else if (nextSegment !== "**") currentSeparator = requiredSeparator;
-		else currentSeparator = "";
+		if (truthySeparator) {
+			if (s === segments.length - 1) currentSeparator = optionalSeparator;
+			else if (nextSegment !== "**") currentSeparator = requiredSeparator;
+			else currentSeparator = "";
+		}
 		if (truthySeparator && segment === "**") {
 			if (currentSeparator) {
 				result += s === 0 ? "" : currentSeparator;
@@ -115,9 +116,7 @@ function wildcardMatch(pattern, options) {
 	fn.regexp = regexp;
 	return fn;
 }
-
-//#endregion
-//#region src/api/middleware/origin-check.ts
+// src/api/middleware/origin-check.ts
 const RELATIVE_PATH_RE = /^\/(?!\/|\\|%2f|%5c)[\w\-.\+/@]*(?:\?[\w\-.\+/=&%@]*)?$/;
 const matchesPattern = (url, pattern) => {
 	if (url.startsWith("/")) return false;
@@ -128,15 +127,15 @@ const matchesPattern = (url, pattern) => {
 	const protocol = getProtocol(url);
 	return protocol === "http:" || protocol === "https:" || !protocol ? pattern === getOrigin(url) : url.startsWith(pattern);
 };
-const validateURL = (url, label, trustedOrigins, logger$1, ctx) => {
+const validateURL = (url, label, trustedOrigins, logger, ctx) => {
 	if (url == null) return null;
 	let isTrustedOrigin = false;
 	trustedOrigins.forEach((origin) => {
 		if (isTrustedOrigin === false && (matchesPattern(url, origin) || url.startsWith("/") && label !== "origin" && RELATIVE_PATH_RE.test(url))) isTrustedOrigin = true;
 	});
 	if (!isTrustedOrigin) {
-		logger$1.error(`Invalid ${label}: ${url}`);
-		logger$1.info(`If it's a valid URL, please add ${url} to trustedOrigins in your auth config\n`, `Current list of trustedOrigins: ${[...trustedOrigins].join(", ")}`);
+		logger.error(`Invalid ${label}: ${url}`);
+		logger.info(`If it's a valid URL, please add ${url} to trustedOrigins in your auth config\n`, `Current list of trustedOrigins: ${[...trustedOrigins].join(", ")}`);
 		return ctx.json({
 			success: False,
 			message: `Invalid ${label}`
@@ -223,6 +222,4 @@ const originCheck = (getValue) => {
 		return await next();
 	});
 };
-
-//#endregion
-export { originCheck as n, wildcardMatch as r, initOriginCheckMiddleware as t };
+export { originCheck as n, wildcardMatch as r, initOriginCheckMiddleware as t };