faire-auth 1.0.3 → 1.1.0

package/dist/plugins/index.mjs

@@ -1,36 +1,27 @@
-import "../hono-CoKYWnXA.mjs";
-import "../ip-BjNYspCH.mjs";
-import { n as crypto_exports, r as validatePassword } from "../crypto-DH2Aa7jN.mjs";
-import { t as safeJSONParse } from "../json-B1v2qRTQ.mjs";
-import { n as cookies_exports, o as deleteSessionCookie, y as setSessionCookie } from "../cookies-BTs1o992.mjs";
-import "../logged-CyGfp8_H.mjs";
-import { r as getOrigin } from "../url-BoUuoIwZ.mjs";
-import { n as createHook, r as createMiddleware } from "../middleware-CE6OhDkq.mjs";
-import { a as requestOnlySessionMiddleware, f as createEndpoint, r as getSessionFromCtx, u as sessionMiddleware } from "../session-CM3rmOYF.mjs";
-import { n as originCheck } from "../origin-check-8Gajklvh.mjs";
-import { t as createEmailVerificationToken } from "../email-verification-C_lBu_JY.mjs";
-import "../state-CQghgH9I.mjs";
-import "../request-1NL_1lyJ.mjs";
-import { i as generateRandomString, r as generateId } from "../utils-D4vZd1-9.mjs";
-import { t as mergeSchema } from "../schema-DTIwLLmf.mjs";
-import "../kysely-adapter-CtIdoHa8.mjs";
-import "../adapter-factory-lKIOf2OR.mjs";
-import { i as toZodSchema } from "../db-4tUsQJXd.mjs";
-import "../memory-adapter-Dp4XdCZK.mjs";
-import { n as parser_default } from "../parser-B25ylT5u.mjs";
-import { n as role, t as createAccessControl } from "../access-D0DRqUKC.mjs";
-import { t as bearer } from "../bearer-WZcs7gxL.mjs";
-import { t as passkey } from "../passkey-CzY_W2us.mjs";
+import { createAccessControl, role } from "./access/index.mjs";
+import { bearer } from "./bearer/index.mjs";
+import { a as requestOnlySessionMiddleware, f as createEndpoint, r as getSessionFromCtx, u as sessionMiddleware } from "../session-BGjJgihS.mjs";
+import { n as originCheck } from "../origin-check-CRgs1M7k.mjs";
+import { n as crypto_exports, r as validatePassword } from "../crypto-BH-hD0lJ.mjs";
+import { n as cookies_exports, o as deleteSessionCookie, y as setSessionCookie } from "../cookies-D9aY_gJh.mjs";
+import { n as createHook, r as createMiddleware } from "../middleware-Cakg4e1D.mjs";
+import { r as getOrigin } from "../url-CJtdrrUu.mjs";
+import { t as parseJSON } from "../parser-DcKDjjHO.mjs";
+import { toZodSchema } from "../db/index.mjs";
+import { i as generateRandomString$2, r as generateId } from "../utils-C7OHyfHa.mjs";
+import { passkey } from "./passkey/index.mjs";
+import { t as mergeSchema } from "../schema-CFCpv0tK.mjs";
+import { t as safeJSONParse } from "../json-DooGMtnJ.mjs";
+import { t as createEmailVerificationToken } from "../email-verification-YSR5n5lb.mjs";
 import { env, logger } from "@faire-auth/core/env";
 import { APIError, BASE_ERROR_CODES, FaireAuthError } from "@faire-auth/core/error";
 import { callbackURLSchema, createRoute, createRoute as createRoute$1, dateOrIsoStringSchema, emailSchema, nameSchema, req, res } from "@faire-auth/core/factory";
 import { Definitions, False, SCHEMAS, True } from "@faire-auth/core/static";
 import { getDate, toSuccess } from "@faire-auth/core/utils";
 import { base64Url, createHMAC, createHash, createOTP } from "@faire-auth/core/datatypes";
-import * as z$1 from "zod";
+import * as z from "zod";
 import { looseUserSchema } from "@faire-auth/core/db";
-
-//#region src/plugins/magic-link/index.ts
+// src/plugins/magic-link/index.ts
 const magicLink = (options) => ({
 	id: "magic-link",
 	routes: {
@@ -39,7 +30,7 @@ const magicLink = (options) => ({
 			method: "post",
 			path: "/sign-in/magic-link",
 			description: "Sign in with magic link",
-			request: req().bdy(z$1.object({
+			request: req().bdy(z.object({
 				email: emailSchema.openapi({ description: "Email address to send the magic link" }),
 				name: nameSchema,
 				callbackURL: callbackURLSchema(true).openapi({ description: "URL to redirect after magic link verification" })
@@ -73,8 +64,8 @@ const magicLink = (options) => ({
 			path: "/magic-link/verify",
 			description: "Verify magic link",
 			middleware: [originCheck((ctx) => ctx.req.query("callbackURL"))],
-			request: req().qry(z$1.object({
-				token: z$1.string().openapi({
+			request: req().qry(z.object({
+				token: z.string().openapi({
 					param: {
 						in: "query",
 						name: "token"
@@ -101,15 +92,17 @@ const magicLink = (options) => ({
 			}
 			await ctx.get("context").internalAdapter.deleteVerificationValue(tokenValue.id);
 			const { email, name } = JSON.parse(tokenValue.value);
-			let user = await ctx.get("context").internalAdapter.findUserByEmail(email).then((res$1) => res$1?.user);
-			if (!user) if (!(options.disableSignUp ?? false)) {
-				user = await ctx.get("context").internalAdapter.createUser({
-					email,
-					emailVerified: true,
-					...name != null && { name }
-				});
-				if (user == null) return ctx.redirect(`${toRedirectTo}?error=failed_to_create_user`, 302);
-			} else return ctx.redirect(`${toRedirectTo}?error=failed_to_create_user`, 302);
+			let user = await ctx.get("context").internalAdapter.findUserByEmail(email).then((res) => res?.user);
+			if (!user) {
+				if (!(options.disableSignUp ?? false)) {
+					user = await ctx.get("context").internalAdapter.createUser({
+						email,
+						emailVerified: true,
+						...name != null && { name }
+					});
+					if (user == null) return ctx.redirect(`${toRedirectTo}?error=failed_to_create_user`, 302);
+				} else return ctx.redirect(`${toRedirectTo}?error=failed_to_create_user`, 302);
+			}
 			if (!user.emailVerified) await ctx.get("context").internalAdapter.updateUser(user.id, { emailVerified: true });
 			const session = await ctx.get("context").internalAdapter.createSession(user.id);
 			if (session == null) return ctx.redirect(`${toRedirectTo}?error=failed_to_create_session`, 302);
@@ -130,9 +123,7 @@ const magicLink = (options) => ({
 		max: options.rateLimit?.max ?? 5
 	}]
 });
-
-//#endregion
-//#region src/plugins/oauth-proxy/index.ts
+// src/plugins/oauth-proxy/index.ts
 /**
 * A proxy plugin, that allows you to proxy OAuth requests.
 * Useful for development and preview deployments where
@@ -160,9 +151,9 @@ const oAuthProxy = (opts) => {
 			path: "/oauth-proxy-callback",
 			isAction: false,
 			middleware: [originCheck((ctx) => ctx.req.query("callbackURL"))],
-			request: req().qry(z$1.object({
+			request: req().qry(z.object({
 				callbackURL: callbackURLSchema().openapi({ description: "The URL to redirect to after the proxy" }),
-				cookies: z$1.string().openapi({ description: "The cookies to set after the proxy" })
+				cookies: z.string().openapi({ description: "The cookies to set after the proxy" })
 			})).bld(),
 			responses: res().rdr().bld()
 		}), (options) => async (ctx) => {
@@ -220,51 +211,7 @@ const oAuthProxy = (opts) => {
 		}] }
 	};
 };
-
-//#endregion
-//#region src/plugins/organization/access/statement.ts
-const defaultStatements = {
-	organization: ["update", "delete"],
-	member: [
-		"create",
-		"update",
-		"delete"
-	],
-	invitation: ["create", "cancel"],
-	team: [
-		"create",
-		"update",
-		"delete"
-	],
-	ac: [
-		"create",
-		"read",
-		"update",
-		"delete"
-	]
-};
-const defaultAc = createAccessControl(defaultStatements);
-const adminAc = defaultAc.newRole({
-	organization: ["update"],
-	invitation: ["create", "cancel"],
-	member: [
-		"create",
-		"update",
-		"delete"
-	],
-	team: [
-		"create",
-		"update",
-		"delete"
-	],
-	ac: [
-		"create",
-		"read",
-		"update",
-		"delete"
-	]
-});
-const ownerAc = defaultAc.newRole({
+const defaultAc = createAccessControl({
 	organization: ["update", "delete"],
 	member: [
 		"create",
@@ -284,21 +231,56 @@ const ownerAc = defaultAc.newRole({
 		"delete"
 	]
 });
-const memberAc = defaultAc.newRole({
-	organization: [],
-	member: [],
-	invitation: [],
-	team: [],
-	ac: ["read"]
-});
 const defaultRoles$1 = {
-	admin: adminAc,
-	owner: ownerAc,
-	member: memberAc
+	admin: defaultAc.newRole({
+		organization: ["update"],
+		invitation: ["create", "cancel"],
+		member: [
+			"create",
+			"update",
+			"delete"
+		],
+		team: [
+			"create",
+			"update",
+			"delete"
+		],
+		ac: [
+			"create",
+			"read",
+			"update",
+			"delete"
+		]
+	}),
+	owner: defaultAc.newRole({
+		organization: ["update", "delete"],
+		member: [
+			"create",
+			"update",
+			"delete"
+		],
+		invitation: ["create", "cancel"],
+		team: [
+			"create",
+			"update",
+			"delete"
+		],
+		ac: [
+			"create",
+			"read",
+			"update",
+			"delete"
+		]
+	}),
+	member: defaultAc.newRole({
+		organization: [],
+		member: [],
+		invitation: [],
+		team: [],
+		ac: ["read"]
+	})
 };
-
-//#endregion
-//#region src/plugins/organization/adapter.ts
+// src/plugins/organization/adapter.ts
 const getOrgAdapter = (context, options) => {
 	const adapter = context.adapter;
 	return {
@@ -312,7 +294,7 @@ const getOrgAdapter = (context, options) => {
 			});
 		},
 		createOrganization: async (data) => {
-			const organization$1 = await adapter.create({
+			const organization = await adapter.create({
 				model: "organization",
 				data: {
 					...data.organization,
@@ -320,8 +302,8 @@ const getOrgAdapter = (context, options) => {
 				}
 			});
 			return {
-				...organization$1,
-				...organization$1["metadata"] && typeof organization$1["metadata"] === "string" && { metadata: JSON.parse(organization$1["metadata"]) }
+				...organization,
+				...organization["metadata"] && typeof organization["metadata"] === "string" && { metadata: JSON.parse(organization["metadata"]) }
 			};
 		},
 		findMemberByEmail: async (data) => {
@@ -390,7 +372,7 @@ const getOrgAdapter = (context, options) => {
 			});
 			return {
 				members: members[0].map((member) => {
-					const user = users.find((user$1) => user$1.id === member.userId);
+					const user = users.find((user) => user.id === member.userId);
 					if (!user) throw new FaireAuthError("Unexpected error: User not found for member");
 					return {
 						...member,
@@ -469,14 +451,14 @@ const getOrgAdapter = (context, options) => {
 				}
 			});
 		},
-		updateMember: async (memberId, role$2) => {
+		updateMember: async (memberId, role) => {
 			return await adapter.update({
 				model: "member",
 				where: [{
 					field: "id",
 					value: memberId
 				}],
-				update: { role: role$2 }
+				update: { role }
 			});
 		},
 		deleteMember: async (memberId) => {
@@ -489,7 +471,7 @@ const getOrgAdapter = (context, options) => {
 			});
 		},
 		updateOrganization: async (organizationId, data) => {
-			const organization$1 = await adapter.update({
+			const organization = await adapter.update({
 				model: "organization",
 				where: [{
 					field: "id",
@@ -500,10 +482,10 @@ const getOrgAdapter = (context, options) => {
 					metadata: typeof data["metadata"] === "object" ? JSON.stringify(data["metadata"]) : data["metadata"]
 				}
 			});
-			if (!organization$1) return null;
+			if (!organization) return null;
 			return {
-				...organization$1,
-				metadata: organization$1["metadata"] ? parser_default(organization$1["metadata"]) : void 0
+				...organization,
+				metadata: organization["metadata"] ? parseJSON(organization["metadata"]) : void 0
 			};
 		},
 		deleteOrganization: async (organizationId) => {
@@ -554,6 +536,9 @@ const getOrgAdapter = (context, options) => {
 				}]
 			});
 		},
+		/**
+		* @requires db
+		*/
 		findFullOrganization: async ({ organizationId, isSlug, includeTeams, membersLimit }) => {
 			const org = await adapter.findOne({
 				model: "organization",
@@ -709,13 +694,13 @@ const getOrgAdapter = (context, options) => {
 				}]
 			});
 		},
-		createTeamInvitation: async ({ email, role: role$2, teamId, organizationId, inviterId, expiresIn = 1e3 * 60 * 60 * 48 }) => {
+		createTeamInvitation: async ({ email, role, teamId, organizationId, inviterId, expiresIn = 1728e5 }) => {
 			const expiresAt = getDate(expiresIn);
 			return await adapter.create({
 				model: "invitation",
 				data: {
 					email,
-					role: role$2,
+					role,
 					organizationId,
 					teamId,
 					inviterId,
@@ -835,7 +820,7 @@ const getOrgAdapter = (context, options) => {
 			});
 		},
 		createInvitation: async ({ invitation, user }) => {
-			const expiresAt = getDate(options?.invitationExpiresIn || 3600 * 48, "sec");
+			const expiresAt = getDate(options?.invitationExpiresIn || 172800, "sec");
 			return await adapter.create({
 				model: "invitation",
 				data: {
@@ -908,9 +893,7 @@ const getOrgAdapter = (context, options) => {
 		}
 	};
 };
-
-//#endregion
-//#region src/plugins/organization/call.ts
+// src/plugins/organization/call.ts
 /**
 * the orgMiddleware type-asserts and adds org options, roles, and a getSession function.
 */
@@ -920,16 +903,14 @@ const orgMiddleware = (orgOptions) => createMiddleware()(async (ctx, next) => {
 		...defaultRoles$1,
 		...orgOptions?.roles
 	});
-	ctx.set("getSession", async (ctx$1) => await getSessionFromCtx(ctx$1).then((s) => {
+	ctx.set("getSession", async (ctx) => await getSessionFromCtx(ctx).then((s) => {
 		if (s instanceof Response) return null;
 		return s;
 	}));
 	return await next();
 });
 const orgSessionMiddleware = sessionMiddleware();
-
-//#endregion
-//#region src/plugins/organization/error-codes.ts
+// src/plugins/organization/error-codes.ts
 const ORGANIZATION_ERROR_CODES = {
 	YOU_ARE_NOT_ALLOWED_TO_CREATE_A_NEW_ORGANIZATION: "You are not allowed to create a new organization",
 	YOU_HAVE_REACHED_THE_MAXIMUM_NUMBER_OF_ORGANIZATIONS: "You have reached the maximum number of organizations",
@@ -987,9 +968,7 @@ const ORGANIZATION_ERROR_CODES = {
 	ROLE_NAME_IS_ALREADY_TAKEN: "That role name is already taken",
 	CANNOT_DELETE_A_PRE_DEFINED_ROLE: "Cannot delete a pre-defined role"
 };
-
-//#endregion
-//#region src/plugins/organization/permission.ts
+// src/plugins/organization/permission.ts
 const hasPermissionFn = (input, acRoles) => {
 	if (!input.permissions && !input.permission) return false;
 	const roles = input.role.split(",");
@@ -997,13 +976,11 @@ const hasPermissionFn = (input, acRoles) => {
 	const isCreator = roles.includes(creatorRole);
 	const allowCreatorsAllPermissions = input.allowCreatorAllPermissions || false;
 	if (isCreator && allowCreatorsAllPermissions) return true;
-	for (const role$2 of roles) if ((acRoles[role$2]?.authorize(input.permissions ?? input.permission))?.success) return true;
+	for (const role of roles) if ((acRoles[role]?.authorize(input.permissions ?? input.permission))?.success) return true;
 	return false;
 };
 let cacheAllRoles = /* @__PURE__ */ new Map();
-
-//#endregion
-//#region src/plugins/organization/has-permission.ts
+// src/plugins/organization/has-permission.ts
 const hasPermission = async (input, ctx) => {
 	let acRoles = { ...input.options.roles || defaultRoles$1 };
 	if (ctx && input.organizationId && input.options.dynamicAccessControl?.enabled && input.options.ac && !input.useMemoryCache) {
@@ -1014,25 +991,23 @@ const hasPermission = async (input, ctx) => {
 				value: input.organizationId
 			}]
 		});
-		for (const { role: role$2, permission: permissionsString } of roles) {
-			if (role$2 in acRoles) continue;
-			const result = z$1.record(z$1.string(), z$1.array(z$1.string())).safeParse(JSON.parse(permissionsString));
+		for (const { role, permission: permissionsString } of roles) {
+			if (role in acRoles) continue;
+			const result = z.record(z.string(), z.array(z.string())).safeParse(JSON.parse(permissionsString));
 			if (!result.success) {
-				ctx.get("context").logger.error("[hasPermission] Invalid permissions for role " + role$2, { permissions: JSON.parse(permissionsString) });
-				throw new APIError("INTERNAL_SERVER_ERROR", { message: "Invalid permissions for role " + role$2 });
+				ctx.get("context").logger.error("[hasPermission] Invalid permissions for role " + role, { permissions: JSON.parse(permissionsString) });
+				throw new APIError("INTERNAL_SERVER_ERROR", { message: "Invalid permissions for role " + role });
 			}
-			acRoles[role$2] = input.options.ac.newRole(result.data);
+			acRoles[role] = input.options.ac.newRole(result.data);
 		}
 	}
 	if (input.useMemoryCache) acRoles = cacheAllRoles.get(input.organizationId) || acRoles;
 	cacheAllRoles.set(input.organizationId, acRoles);
 	return hasPermissionFn(input, acRoles);
 };
-
-//#endregion
-//#region src/plugins/organization/schema/base.ts
-const role$1 = z$1.string().openapi({ description: "Role identifier for organization members (e.g., admin, member, owner)" });
-const invitationStatus = z$1.enum([
+// src/plugins/organization/schema/base.ts
+const role$1 = z.string().openapi({ description: "Role identifier for organization members (e.g., admin, member, owner)" });
+const invitationStatus = z.enum([
 	"pending",
 	"accepted",
 	"rejected",
@@ -1043,57 +1018,55 @@ const defaultRoles = [
 	"member",
 	"owner"
 ];
-const defaultRolesSchema = z$1.union([z$1.enum(defaultRoles), z$1.array(z$1.enum(defaultRoles))]).openapi({ description: "Default role options for organization members" });
-const organizationSchema = z$1.looseObject({
-	id: z$1.string().default(generateId).openapi({ description: "Unique identifier for the organization" }),
-	name: z$1.string().openapi({ description: "Display name of the organization" }),
-	slug: z$1.string().openapi({ description: "URL-friendly slug for the organization" }),
-	logo: z$1.string().nullish().openapi({ description: "URL or path to the organization logo image" }),
-	metadata: z$1.record(z$1.string(), z$1.unknown()).or(z$1.string().transform((v) => JSON.parse(v))).nullish().openapi({ description: "Additional metadata for the organization as key-value pairs" }),
+z.union([z.enum(defaultRoles), z.array(z.enum(defaultRoles))]).openapi({ description: "Default role options for organization members" });
+const organizationSchema = z.looseObject({
+	id: z.string().default(generateId).openapi({ description: "Unique identifier for the organization" }),
+	name: z.string().openapi({ description: "Display name of the organization" }),
+	slug: z.string().openapi({ description: "URL-friendly slug for the organization" }),
+	logo: z.string().nullish().openapi({ description: "URL or path to the organization logo image" }),
+	metadata: z.record(z.string(), z.unknown()).or(z.string().transform((v) => JSON.parse(v))).nullish().openapi({ description: "Additional metadata for the organization as key-value pairs" }),
 	createdAt: dateOrIsoStringSchema.openapi({ description: "Timestamp when the organization was created" })
 });
-const organizationRoleSchema = z$1.looseObject({
-	id: z$1.string().default(generateId),
-	organizationId: z$1.string(),
-	role: z$1.string(),
-	permission: z$1.record(z$1.string(), z$1.array(z$1.string())),
+const organizationRoleSchema = z.looseObject({
+	id: z.string().default(generateId),
+	organizationId: z.string(),
+	role: z.string(),
+	permission: z.record(z.string(), z.array(z.string())),
 	createdAt: dateOrIsoStringSchema.default(() => /* @__PURE__ */ new Date()),
 	updatedAt: dateOrIsoStringSchema.optional()
 });
-const memberSchema = z$1.looseObject({
-	id: z$1.string().default(generateId).openapi({ description: "Unique identifier for the organization member" }),
-	organizationId: z$1.string().openapi({ description: "ID of the organization this member belongs to" }),
-	userId: z$1.coerce.string().openapi({ description: "ID of the user who is a member of the organization" }),
+const memberSchema = z.looseObject({
+	id: z.string().default(generateId).openapi({ description: "Unique identifier for the organization member" }),
+	organizationId: z.string().openapi({ description: "ID of the organization this member belongs to" }),
+	userId: z.coerce.string().openapi({ description: "ID of the user who is a member of the organization" }),
 	role: role$1,
 	createdAt: dateOrIsoStringSchema.default(() => /* @__PURE__ */ new Date()).openapi({ description: "Timestamp when the member was added to the organization" })
 });
-const invitationSchema = z$1.looseObject({
-	id: z$1.string().default(generateId).openapi({ description: "Unique identifier for the invitation" }),
-	organizationId: z$1.string().openapi({ description: "The organization ID to invite the user to" }),
+const invitationSchema = z.looseObject({
+	id: z.string().default(generateId).openapi({ description: "Unique identifier for the invitation" }),
+	organizationId: z.string().openapi({ description: "The organization ID to invite the user to" }),
 	email: emailSchema.openapi({ description: "The email address of the user to invite" }),
 	role: role$1.openapi({ description: "The role(s) to assign to the user. It can be `admin`, `member`, or `guest`. Eg: \"member\"" }),
 	status: invitationStatus,
-	teamId: z$1.string().optional().openapi({ description: "The team ID to invite the user to" }),
-	inviterId: z$1.string().openapi({ description: "ID of the user who sent the invitation" }),
+	teamId: z.string().optional().openapi({ description: "The team ID to invite the user to" }),
+	inviterId: z.string().openapi({ description: "ID of the user who sent the invitation" }),
 	expiresAt: dateOrIsoStringSchema.openapi({ description: "Timestamp when the invitation expires" })
 });
-const teamSchema = z$1.looseObject({
-	id: z$1.string().default(generateId).openapi({ description: "Unique identifier of the team" }),
-	name: z$1.string().min(1).openapi({ description: "Name of the team" }),
-	organizationId: z$1.string().openapi({ description: "ID of the organization the team belongs to" }),
+const teamSchema = z.looseObject({
+	id: z.string().default(generateId).openapi({ description: "Unique identifier of the team" }),
+	name: z.string().min(1).openapi({ description: "Name of the team" }),
+	organizationId: z.string().openapi({ description: "ID of the organization the team belongs to" }),
 	createdAt: dateOrIsoStringSchema.openapi({ description: "Timestamp when the team was created" }),
 	updatedAt: dateOrIsoStringSchema.optional().openapi({ description: "Timestamp when the team was last updated" })
 });
-const teamMemberSchema = z$1.looseObject({
-	id: z$1.string().default(generateId).openapi({ description: "Unique identifier for the team member" }),
-	teamId: z$1.string().openapi({ description: "ID of the team this member belongs to" }),
-	userId: z$1.string().openapi({ description: "ID of the user who is a member of the team" }),
+const teamMemberSchema = z.looseObject({
+	id: z.string().default(generateId).openapi({ description: "Unique identifier for the team member" }),
+	teamId: z.string().openapi({ description: "ID of the team this member belongs to" }),
+	userId: z.string().openapi({ description: "ID of the user who is a member of the team" }),
 	createdAt: dateOrIsoStringSchema.default(() => /* @__PURE__ */ new Date()).openapi({ description: "Timestamp when the member was added to the team" })
 });
-
-//#endregion
-//#region src/plugins/organization/routes/crud-access-control.ts
-const normalizeRoleName = (role$2) => role$2.toLowerCase();
+// src/plugins/organization/routes/crud-access-control.ts
+const normalizeRoleName = (role) => role.toLowerCase();
 const DEFAULT_MAXIMUM_ROLES_PER_ORGANIZATION = Number.POSITIVE_INFINITY;
 const getAdditionalFields = (options, shouldBePartial = false) => {
 	let additionalFields = options?.schema?.organizationRole?.additionalFields || {};
@@ -1109,15 +1082,15 @@ const getAdditionalFields = (options, shouldBePartial = false) => {
 };
 const createOrgRole = (options) => {
 	const { additionalFieldsSchema, $AdditionalFields, $ReturnAdditionalFields } = getAdditionalFields(options, false);
-	const createOrgRoleRequestSchema = z$1.object({
-		organizationId: z$1.string().optional().openapi({ description: "The id of the organization to create the role in. If not provided, the user's active organization will be used." }),
-		role: z$1.string().openapi({ description: "The name of the role to create" }),
-		permission: z$1.record(z$1.string(), z$1.array(z$1.string())).openapi({ description: "The permission to assign to the role" }),
-		additionalFields: z$1.object(additionalFieldsSchema.shape).optional()
+	const createOrgRoleRequestSchema = z.object({
+		organizationId: z.string().optional().openapi({ description: "The id of the organization to create the role in. If not provided, the user's active organization will be used." }),
+		role: z.string().openapi({ description: "The name of the role to create" }),
+		permission: z.record(z.string(), z.array(z.string())).openapi({ description: "The permission to assign to the role" }),
+		additionalFields: z.object(additionalFieldsSchema.shape).optional()
 	});
-	const createOrgRoleResponseSchema = z$1.object({
+	const createOrgRoleResponseSchema = z.object({
 		roleData: organizationRoleSchema.extend(additionalFieldsSchema.shape),
-		statements: z$1.record(z$1.string(), z$1.array(z$1.string()))
+		statements: z.record(z.string(), z.array(z.string()))
 	}).transform(toSuccess);
 	return createEndpoint(createRoute$1({
 		operationId: "createOrgRole",
@@ -1125,10 +1098,10 @@ const createOrgRole = (options) => {
 		path: "/organization/create-role",
 		middleware: [orgSessionMiddleware, orgMiddleware(options)],
 		request: req().bdy(createOrgRoleRequestSchema).bld(),
-		responses: res(createOrgRoleResponseSchema).err(400).err(403, "Not a member or not allowed to create a role", SCHEMAS[Definitions.ERROR].default.extend({ missingPermissions: z$1.array(z$1.custom((v) => typeof v === "string" && v.includes(":"))).optional() })).err(501).bld()
+		responses: res(createOrgRoleResponseSchema).err(400).err(403, "Not a member or not allowed to create a role", SCHEMAS[Definitions.ERROR].default.extend({ missingPermissions: z.array(z.custom((v) => typeof v === "string" && v.includes(":"))).optional() })).err(501).bld()
 	}), (_authOptions) => async (ctx) => {
 		const { session, user } = ctx.get("session");
-		const { organizationId = session.activeOrganizationId, role: role$2, permission, additionalFields } = ctx.req.valid("json");
+		const { organizationId = session.activeOrganizationId, role, permission, additionalFields } = ctx.req.valid("json");
 		const ac = options.ac;
 		if (!ac) {
 			ctx.get("context").logger.error(`[Dynamic Access Control] The organization plugin is missing a pre-defined ac instance.`, `\nPlease refer to the documentation here: https://faire-auth.com/docs/plugins/organization#dynamic-access-control`);
@@ -1144,7 +1117,7 @@ const createOrgRole = (options) => {
 				message: ORGANIZATION_ERROR_CODES.YOU_MUST_BE_IN_AN_ORGANIZATION_TO_CREATE_A_ROLE
 			}, 400);
 		}
-		const roleName = normalizeRoleName(role$2);
+		const roleName = normalizeRoleName(role);
 		const takenRes = await checkIfRoleNameIsTakenByPreDefinedRole({
 			role: roleName,
 			organizationId,
@@ -1257,8 +1230,8 @@ const createOrgRole = (options) => {
 	});
 };
 const deleteOrgRole = (options) => {
-	const deleteOrgRoleRequestSchema = z$1.object({ organizationId: z$1.string().optional().openapi({ description: "The id of the organization to create the role in. If not provided, the user's active organization will be used." }) }).and(z$1.union([z$1.object({ roleName: z$1.string().openapi({ description: "The name of the role to delete" }) }), z$1.object({ roleId: z$1.string().openapi({ description: "The id of the role to delete" }) })]));
-	const deleteOrgRoleResponseSchema = z$1.object({ success: z$1.literal(true) });
+	const deleteOrgRoleRequestSchema = z.object({ organizationId: z.string().optional().openapi({ description: "The id of the organization to create the role in. If not provided, the user's active organization will be used." }) }).and(z.union([z.object({ roleName: z.string().openapi({ description: "The name of the role to delete" }) }), z.object({ roleId: z.string().openapi({ description: "The id of the role to delete" }) })]));
+	const deleteOrgRoleResponseSchema = z.object({ success: z.literal(true) });
 	return createEndpoint(createRoute$1({
 		operationId: "deleteOrgRole",
 		method: "post",
@@ -1320,16 +1293,16 @@ const deleteOrgRole = (options) => {
 			}, 403);
 		}
 		if (roleName) {
-			const defaultRoles$2 = options.roles ? Object.keys(options.roles) : [
+			const defaultRoles = options.roles ? Object.keys(options.roles) : [
 				"owner",
 				"admin",
 				"member"
 			];
-			if (defaultRoles$2.includes(roleName)) {
+			if (defaultRoles.includes(roleName)) {
 				ctx.get("context").logger.error(`[Dynamic Access Control] Cannot delete a pre-defined role.`, {
 					roleName,
 					organizationId,
-					defaultRoles: defaultRoles$2
+					defaultRoles
 				});
 				return ctx.render({
 					success: False,
@@ -1384,9 +1357,9 @@ const deleteOrgRole = (options) => {
 };
 const listOrgRoles = (options) => {
 	const { $ReturnAdditionalFields } = getAdditionalFields(options, false);
-	const listOrgRolesRequestSchema = z$1.object({ organizationId: z$1.string().optional().openapi({ description: "The id of the organization to list roles for. If not provided, the user's active organization will be used." }) });
+	const listOrgRolesRequestSchema = z.object({ organizationId: z.string().optional().openapi({ description: "The id of the organization to list roles for. If not provided, the user's active organization will be used." }) });
 	const { additionalFieldsSchema } = getAdditionalFields(options, false);
-	const listOrgRolesResponseSchema = z$1.array(organizationRoleSchema.extend(additionalFieldsSchema.shape)).transform(toSuccess);
+	const listOrgRolesResponseSchema = z.array(organizationRoleSchema.extend(additionalFieldsSchema.shape)).transform(toSuccess);
 	return createEndpoint(createRoute$1({
 		operationId: "listOrgRoles",
 		method: "get",
@@ -1462,10 +1435,10 @@ const listOrgRoles = (options) => {
 };
 const getOrgRole = (options) => {
 	const { $ReturnAdditionalFields } = getAdditionalFields(options, false);
-	const getOrgRoleRequestSchema = z$1.object({
-		organizationId: z$1.string().optional().openapi({ description: "The id of the organization to read a role for. If not provided, the user's active organization will be used." }),
-		roleName: z$1.string().optional().openapi({ description: "The name of the role to read" }),
-		roleId: z$1.string().optional().openapi({ description: "The id of the role to read" })
+	const getOrgRoleRequestSchema = z.object({
+		organizationId: z.string().optional().openapi({ description: "The id of the organization to read a role for. If not provided, the user's active organization will be used." }),
+		roleName: z.string().optional().openapi({ description: "The name of the role to read" }),
+		roleId: z.string().optional().openapi({ description: "The id of the role to read" })
 	});
 	const { additionalFieldsSchema } = getAdditionalFields(options, false);
 	const getOrgRoleResponseSchema = organizationRoleSchema.extend(additionalFieldsSchema.shape).transform(toSuccess);
@@ -1539,7 +1512,7 @@ const getOrgRole = (options) => {
 			operator: "eq",
 			connector: "AND"
 		};
-		let role$2 = await ctx.get("context").adapter.findOne({
+		let role = await ctx.get("context").adapter.findOne({
 			model: "organizationRole",
 			where: [{
 				field: "organizationId",
@@ -1548,7 +1521,7 @@ const getOrgRole = (options) => {
 				connector: "AND"
 			}, condition]
 		});
-		if (!role$2) {
+		if (!role) {
 			ctx.get("context").logger.error(`[Dynamic Access Control] The role name/id does not exist in the database.`, {
 				...roleName ? { roleName } : { roleId },
 				organizationId
@@ -1558,19 +1531,19 @@ const getOrgRole = (options) => {
 				message: ORGANIZATION_ERROR_CODES.ROLE_NOT_FOUND
 			}, 400);
 		}
-		role$2.permission = JSON.parse(role$2.permission);
-		return ctx.render(role$2, 200);
+		role.permission = JSON.parse(role.permission);
+		return ctx.render(role, 200);
 	});
 };
 const updateOrgRole = (options) => {
 	const { additionalFieldsSchema, $AdditionalFields, $ReturnAdditionalFields } = getAdditionalFields(options, true);
-	const updateOrgRoleRequestSchema = z$1.object({
-		organizationId: z$1.string().optional().openapi({ description: "The id of the organization to update the role in. If not provided, the user's active organization will be used." }),
-		data: z$1.object({
-			permission: z$1.record(z$1.string(), z$1.array(z$1.string())).optional().openapi({ description: "The permission to update the role with" }),
-			roleName: z$1.string().optional().openapi({ description: "The name of the role to update" })
+	const updateOrgRoleRequestSchema = z.object({
+		organizationId: z.string().optional().openapi({ description: "The id of the organization to update the role in. If not provided, the user's active organization will be used." }),
+		data: z.object({
+			permission: z.record(z.string(), z.array(z.string())).optional().openapi({ description: "The permission to update the role with" }),
+			roleName: z.string().optional().openapi({ description: "The name of the role to update" })
 		}).extend(additionalFieldsSchema.shape)
-	}).and(z$1.union([z$1.object({ roleName: z$1.string().openapi({ description: "The name of the role to update" }) }), z$1.object({ roleId: z$1.string().openapi({ description: "The id of the role to update" }) })]));
+	}).and(z.union([z.object({ roleName: z.string().openapi({ description: "The name of the role to update" }) }), z.object({ roleId: z.string().openapi({ description: "The id of the role to update" }) })]));
 	const updateOrgRoleResponseSchema = organizationRoleSchema.extend(additionalFieldsSchema.shape).transform(toSuccess);
 	return createEndpoint(createRoute$1({
 		operationId: "updateOrgRole",
@@ -1649,7 +1622,7 @@ const updateOrgRole = (options) => {
 			operator: "eq",
 			connector: "AND"
 		};
-		let role$2 = await ctx.get("context").adapter.findOne({
+		let role = await ctx.get("context").adapter.findOne({
 			model: "organizationRole",
 			where: [{
 				field: "organizationId",
@@ -1658,7 +1631,7 @@ const updateOrgRole = (options) => {
 				connector: "AND"
 			}, condition]
 		});
-		if (!role$2) {
+		if (!role) {
 			ctx.get("context").logger.error(`[Dynamic Access Control] The role name/id does not exist in the database.`, {
 				...roleName ? { roleName } : { roleId },
 				organizationId
@@ -1668,8 +1641,8 @@ const updateOrgRole = (options) => {
 				message: ORGANIZATION_ERROR_CODES.ROLE_NOT_FOUND
 			}, 400);
 		}
-		role$2.permission = role$2.permission ? JSON.parse(role$2.permission) : void 0;
-		const { permission: _, roleName: __,...additionalFields } = data;
+		role.permission = role.permission ? JSON.parse(role.permission) : void 0;
+		const { permission: _, roleName: __, ...additionalFields } = data;
 		let updateData = { ...additionalFields };
 		if (data.permission) {
 			let newPermission = data.permission;
@@ -1724,9 +1697,9 @@ const updateOrgRole = (options) => {
 			update
 		});
 		return ctx.render({
-			...role$2,
+			...role,
 			...update,
-			permission: updateData.permission || role$2.permission || null
+			permission: updateData.permission || role.permission || null
 		}, 200);
 	});
 };
@@ -1782,17 +1755,17 @@ async function checkIfMemberHasPermission({ ctx, permissionRequired: permission,
 		}, 403);
 	}
 }
-async function checkIfRoleNameIsTakenByPreDefinedRole({ options, organizationId, role: role$2, ctx }) {
-	const defaultRoles$2 = options.roles ? Object.keys(options.roles) : [
+async function checkIfRoleNameIsTakenByPreDefinedRole({ options, organizationId, role, ctx }) {
+	const defaultRoles = options.roles ? Object.keys(options.roles) : [
 		"owner",
 		"admin",
 		"member"
 	];
-	if (defaultRoles$2.includes(role$2)) {
-		ctx.get("context").logger.error(`[Dynamic Access Control] The role name "${role$2}" is already taken by a pre-defined role.`, {
-			role: role$2,
+	if (defaultRoles.includes(role)) {
+		ctx.get("context").logger.error(`[Dynamic Access Control] The role name "${role}" is already taken by a pre-defined role.`, {
+			role,
 			organizationId,
-			defaultRoles: defaultRoles$2
+			defaultRoles
 		});
 		return ctx.render({
 			success: False,
@@ -1800,7 +1773,7 @@ async function checkIfRoleNameIsTakenByPreDefinedRole({ options, organizationId,
 		}, 400);
 	}
 }
-async function checkIfRoleNameIsTakenByRoleInDB({ organizationId, role: role$2, ctx }) {
+async function checkIfRoleNameIsTakenByRoleInDB({ organizationId, role, ctx }) {
 	if (await ctx.get("context").adapter.findOne({
 		model: "organizationRole",
 		where: [{
@@ -1810,13 +1783,13 @@ async function checkIfRoleNameIsTakenByRoleInDB({ organizationId, role: role$2,
 			connector: "AND"
 		}, {
 			field: "role",
-			value: role$2,
+			value: role,
 			operator: "eq",
 			connector: "AND"
 		}]
 	})) {
-		ctx.get("context").logger.error(`[Dynamic Access Control] The role name "${role$2}" is already taken by a role in the database.`, {
-			role: role$2,
+		ctx.get("context").logger.error(`[Dynamic Access Control] The role name "${role}" is already taken by a role in the database.`, {
+			role,
 			organizationId
 		});
 		return ctx.render({
@@ -1825,95 +1798,91 @@ async function checkIfRoleNameIsTakenByRoleInDB({ organizationId, role: role$2,
 		}, 400);
 	}
 }
-
-//#endregion
-//#region src/plugins/organization/schema/invitation.ts
+// src/plugins/organization/schema/invitation.ts
 /**
 * Schema for creating an invitation
 */
-const createInvitationSchema = z$1.object({
+const createInvitationSchema = z.object({
 	email: invitationSchema.shape.email,
-	role: z$1.union([role$1.openapi({ description: "The role to assign to the user" }), z$1.array(role$1.openapi({ description: "The roles to assign to the user" }))]).openapi({ description: "The role(s) to assign to the user. It can be `admin`, `member`, or `guest`. Eg: \"member\"" }),
+	role: z.union([role$1.openapi({ description: "The role to assign to the user" }), z.array(role$1.openapi({ description: "The roles to assign to the user" }))]).openapi({ description: "The role(s) to assign to the user. It can be `admin`, `member`, or `guest`. Eg: \"member\"" }),
 	organizationId: invitationSchema.shape.organizationId.optional(),
-	resend: z$1.boolean().openapi({ description: "Resend the invitation email, if the user is already invited. Eg: true" }).optional(),
-	teamId: z$1.union([invitationSchema.shape.teamId.unwrap(), z$1.array(invitationSchema.shape.teamId.unwrap())]).optional()
+	resend: z.boolean().openapi({ description: "Resend the invitation email, if the user is already invited. Eg: true" }).optional(),
+	teamId: z.union([invitationSchema.shape.teamId.unwrap(), z.array(invitationSchema.shape.teamId.unwrap())]).optional()
 });
 /**
 * Schema for accepting/rejecting/cancelling an invitation
 */
-const invitationRequestSchema = z$1.object({ invitationId: invitationSchema.shape.id.unwrap().openapi({ description: "The ID of the invitation to accept, reject, or cancel" }) });
+const invitationRequestSchema = z.object({ invitationId: invitationSchema.shape.id.unwrap().openapi({ description: "The ID of the invitation to accept, reject, or cancel" }) });
 /**
 * Schema for accept/rejection response
 * Member is null in rejection response
 */
-const invitationResponseSchema = z$1.object({
+const invitationResponseSchema = z.object({
 	invitation: invitationSchema,
 	member: memberSchema.nullable().default(null)
 }).openapi({ description: "Response containing invitation details and optional member information" });
-const getInvitationQuerySchema = z$1.object({ id: z$1.string().openapi({ description: "The ID of the invitation to get" }) });
+const getInvitationQuerySchema = z.object({ id: z.string().openapi({ description: "The ID of the invitation to get" }) });
 const getInvitationResponseSchema = invitationSchema.extend({
-	organizationName: z$1.string().openapi({ description: "Name of the organization" }),
-	organizationSlug: z$1.string().openapi({ description: "URL-friendly slug of the organization" }),
+	organizationName: z.string().openapi({ description: "Name of the organization" }),
+	organizationSlug: z.string().openapi({ description: "URL-friendly slug of the organization" }),
 	inviterEmail: emailSchema.openapi({ description: "Email address of the user who sent the invitation" })
 });
 /**
 * Schema for listing invitations query
 */
-const listInvitationsQuerySchema = z$1.object({ organizationId: z$1.string().openapi({ description: "The ID of the organization to list invitations for" }).optional() });
+const listInvitationsQuerySchema = z.object({ organizationId: z.string().openapi({ description: "The ID of the organization to list invitations for" }).optional() });
 /**
 * Schema for listing invitations query
 */
-const listInvitationsResponseSchema = z$1.array(invitationSchema).openapi({ description: "List of invitations" });
+const listInvitationsResponseSchema = z.array(invitationSchema).openapi({ description: "List of invitations" });
 /**
 * Schema for listing user invitations query
 */
-const listUserInvitationsQuerySchema = z$1.object({ email: emailSchema.openapi({ description: "The email of the user to list invitations for. This only works for server side API calls." }).optional() });
-
-//#endregion
-//#region src/plugins/organization/schema/member.ts
-const memberWithUserSchema = memberSchema.extend({ user: looseUserSchema.extend({ email: z$1.string() }) });
+const listUserInvitationsQuerySchema = z.object({ email: emailSchema.openapi({ description: "The email of the user to list invitations for. This only works for server side API calls." }).optional() });
+// src/plugins/organization/schema/member.ts
+const memberWithUserSchema = memberSchema.extend({ user: looseUserSchema.extend({ email: z.string() }) });
 /**
 * Schema for adding a member
 */
-const addMemberSchema = z$1.object({
-	userId: z$1.string().nullable().default(null).openapi({ description: "The user ID which represents the user to be added as a member. If `null` is provided, then it's expected to provide session headers. Eg: \"user-id\"" }),
-	role: z$1.union([role$1.openapi({ description: "The role to assign to the user" }), z$1.array(role$1.openapi({ description: "The roles to assign to the user" }))]).openapi({ description: "The role(s) to assign to the new member. It can be `admin`, `member`, or `guest`. Eg: \"member\"" }),
+const addMemberSchema = z.object({
+	userId: z.string().nullable().default(null).openapi({ description: "The user ID which represents the user to be added as a member. If `null` is provided, then it's expected to provide session headers. Eg: \"user-id\"" }),
+	role: z.union([role$1.openapi({ description: "The role to assign to the user" }), z.array(role$1.openapi({ description: "The roles to assign to the user" }))]).openapi({ description: "The role(s) to assign to the new member. It can be `admin`, `member`, or `guest`. Eg: \"member\"" }),
 	organizationId: memberSchema.shape.organizationId.optional(),
-	teamId: z$1.string().openapi({ description: "An optional team ID to add the member to. Eg: \"team-id\"" }).optional()
+	teamId: z.string().openapi({ description: "An optional team ID to add the member to. Eg: \"team-id\"" }).optional()
 });
 /**
 * Schema for updating member role
 */
-const updateMemberRoleSchema = z$1.object({
-	role: z$1.union([role$1.openapi({ description: "The role to assign to the user" }), z$1.array(role$1.openapi({ description: "The roles to assign to the user" }))]).openapi({ description: "The role(s) to assign to the member. It can be `admin`, `member`, or `guest`. Eg: \"member\"" }),
+const updateMemberRoleSchema = z.object({
+	role: z.union([role$1.openapi({ description: "The role to assign to the user" }), z.array(role$1.openapi({ description: "The roles to assign to the user" }))]).openapi({ description: "The role(s) to assign to the member. It can be `admin`, `member`, or `guest`. Eg: \"member\"" }),
 	memberId: memberSchema.shape.id.unwrap().openapi({ description: "The member ID to apply the role update to" }),
 	organizationId: memberSchema.shape.organizationId.optional()
 });
 /**
 * Schema for removing a member
 */
-const removeMemberSchema = z$1.object({
-	memberIdOrEmail: z$1.string().openapi({ description: "The ID or email of the member to remove" }),
+const removeMemberSchema = z.object({
+	memberIdOrEmail: z.string().openapi({ description: "The ID or email of the member to remove" }),
 	organizationId: memberSchema.shape.organizationId.optional()
 });
 /**
 * Schema for member response with pagination
 */
-const memberListResponseSchema = z$1.object({
-	members: z$1.array(memberWithUserSchema),
-	total: z$1.number()
+const memberListResponseSchema = z.object({
+	members: z.array(memberWithUserSchema),
+	total: z.number()
 }).openapi({ description: "Paginated list of organization members" });
 /**
 * Schema for listing members query parameters
 */
-const listMembersQuerySchema = z$1.object({
-	limit: z$1.string().or(z$1.number()).openapi({ description: "The number of members to return" }).optional(),
-	offset: z$1.string().or(z$1.number()).openapi({ description: "The offset to start from" }).optional(),
-	sortBy: z$1.string().openapi({ description: "The field to sort by" }).optional(),
-	sortDirection: z$1.enum(["asc", "desc"]).openapi({ description: "The direction to sort by" }).optional(),
-	filterField: z$1.string().openapi({ description: "The field to filter by" }).optional(),
-	filterValue: z$1.string().or(z$1.number()).or(z$1.boolean()).openapi({ description: "The value to filter by" }).optional(),
-	filterOperator: z$1.enum([
+const listMembersQuerySchema = z.object({
+	limit: z.string().or(z.number()).openapi({ description: "The number of members to return" }).optional(),
+	offset: z.string().or(z.number()).openapi({ description: "The offset to start from" }).optional(),
+	sortBy: z.string().openapi({ description: "The field to sort by" }).optional(),
+	sortDirection: z.enum(["asc", "desc"]).openapi({ description: "The direction to sort by" }).optional(),
+	filterField: z.string().openapi({ description: "The field to filter by" }).optional(),
+	filterValue: z.string().or(z.number()).or(z.boolean()).openapi({ description: "The value to filter by" }).optional(),
+	filterOperator: z.enum([
 		"eq",
 		"ne",
 		"lt",
@@ -1922,102 +1891,98 @@ const listMembersQuerySchema = z$1.object({
 		"gte",
 		"contains"
 	]).openapi({ description: "The operator to use for the filter" }).optional(),
-	organizationId: z$1.string().openapi({ description: "The organization ID to list members for. If not provided, will default to the user's active organization." }).optional()
+	organizationId: z.string().openapi({ description: "The organization ID to list members for. If not provided, will default to the user's active organization." }).optional()
 });
 /**
 * Schema for leave organization
 */
-const leaveOrganizationSchema = z$1.object({ organizationId: memberSchema.shape.organizationId.openapi({ description: "The organization ID to leave" }) });
-
-//#endregion
-//#region src/plugins/organization/schema/organization.ts
+const leaveOrganizationSchema = z.object({ organizationId: memberSchema.shape.organizationId.openapi({ description: "The organization ID to leave" }) });
+// src/plugins/organization/schema/organization.ts
 /**
 * Base schema for creating an organization
 */
-const createOrganizationBaseSchema = z$1.object({
+const createOrganizationBaseSchema = z.object({
 	name: organizationSchema.shape.name,
 	slug: organizationSchema.shape.slug,
-	userId: z$1.string().openapi({ description: "The user id of the organization creator. If not provided, the current user will be used. Should only be used by admins or when called by the server. server-only." }).optional(),
+	userId: z.string().openapi({ description: "The user id of the organization creator. If not provided, the current user will be used. Should only be used by admins or when called by the server. server-only." }).optional(),
 	logo: organizationSchema.shape.logo.unwrap().optional(),
 	metadata: organizationSchema.shape.metadata,
-	keepCurrentActiveOrganization: z$1.boolean().openapi({ description: "Whether to keep the current active organization active after creating a new one" }).optional()
+	keepCurrentActiveOrganization: z.boolean().openapi({ description: "Whether to keep the current active organization active after creating a new one" }).optional()
 });
 /**
 * Schema for updating an organization
 */
-const updateOrganizationSchema = z$1.object({
-	data: z$1.object({
+const updateOrganizationSchema = z.object({
+	data: z.object({
 		name: organizationSchema.shape.name,
 		slug: organizationSchema.shape.slug,
 		logo: organizationSchema.shape.logo.unwrap().unwrap(),
 		metadata: organizationSchema.shape.metadata.unwrap().unwrap()
 	}),
-	organizationId: z$1.string().openapi({ description: "The organization ID" }).optional()
+	organizationId: z.string().openapi({ description: "The organization ID" }).optional()
 });
 /**
 * Schema for organization response with members
 */
-const organizationWithMembersSchema = organizationSchema.extend({ members: z$1.array(memberSchema) }).openapi({ description: "Organization details including member information" });
+const organizationWithMembersSchema = organizationSchema.extend({ members: z.array(memberSchema) }).openapi({ description: "Organization details including member information" });
 /**
 * Schema for checking if a slug is available
 */
-const checkOrganizationSlugSchema = z$1.object({ slug: z$1.string().openapi({ description: "The organization slug to check" }) });
+const checkOrganizationSlugSchema = z.object({ slug: z.string().openapi({ description: "The organization slug to check" }) });
 /**
 * Schema for getting organization details
 */
-const getFullOrganizationQuerySchema = z$1.object({
-	organizationId: z$1.string().openapi({ description: "The organization id to get" }).optional(),
-	organizationSlug: z$1.string().openapi({ description: "The organization slug to get" }).optional(),
-	membersLimit: z$1.number().or(z$1.string().transform((val) => parseInt(val))).openapi({ description: "The limit of members to get. By default, it uses the membershipLimit option which defaults to 100." }).optional()
+const getFullOrganizationQuerySchema = z.object({
+	organizationId: z.string().openapi({ description: "The organization id to get" }).optional(),
+	organizationSlug: z.string().openapi({ description: "The organization slug to get" }).optional(),
+	membersLimit: z.number().or(z.string().transform((val) => parseInt(val))).openapi({ description: "The limit of members to get. By default, it uses the membershipLimit option which defaults to 100." }).optional()
 });
 /**
 * Schema for full organization details
 */
 const fullOrganizationSchema = organizationSchema.extend({
-	members: z$1.array(memberWithUserSchema),
-	invitations: z$1.array(invitationSchema),
-	teams: z$1.array(teamSchema).nullable()
+	members: z.array(memberWithUserSchema),
+	invitations: z.array(invitationSchema),
+	teams: z.array(teamSchema).nullable()
 }).openapi({ description: "Complete organization details with members, invitations, and teams" });
 /**
 * Schema for organization list response
 */
-const organizationListResponseSchema = z$1.array(organizationSchema).openapi({ description: "List of organizations" });
+const organizationListResponseSchema = z.array(organizationSchema).openapi({ description: "List of organizations" });
 /**
 * Schema for setting active organization
 */
-const setActiveOrganizationSchema = z$1.object({
-	organizationId: z$1.string().nullable().openapi({ description: "The organization id to set as active. It can be null to unset the active organization." }).optional(),
-	organizationSlug: z$1.string().openapi({ description: "The organization slug to set as active. It can be null to unset the active organization if organizationId is not provided." }).optional()
+const setActiveOrganizationSchema = z.object({
+	organizationId: z.string().nullable().openapi({ description: "The organization id to set as active. It can be null to unset the active organization." }).optional(),
+	organizationSlug: z.string().openapi({ description: "The organization slug to set as active. It can be null to unset the active organization if organizationId is not provided." }).optional()
 });
 /**
 * Schema for deleting organization
 */
-const deleteOrganizationSchema = z$1.object({ organizationId: z$1.string().openapi({ description: "The organization id to delete" }) });
+const deleteOrganizationSchema = z.object({ organizationId: z.string().openapi({ description: "The organization id to delete" }) });
 /**
 * Response schema for deleted organization
 */
-const deleteOrganizationResponseSchema = z$1.string().openapi({ description: "ID of the organization that was successfully deleted" });
-
-//#endregion
-//#region src/plugins/organization/schema/team.ts
+const deleteOrganizationResponseSchema = z.string().openapi({ description: "ID of the organization that was successfully deleted" });
+// src/plugins/organization/schema/team.ts
 /**
 * Base schema for creating a team
 */
-const createTeamBaseSchema = z$1.object({
+const createTeamBaseSchema = z.object({
 	name: teamSchema.shape.name,
 	organizationId: teamSchema.shape.organizationId.optional()
 });
 /**
 * Schema for requesting team removal
 */
-const removeTeamSchema = z$1.object({
+const removeTeamSchema = z.object({
 	teamId: teamSchema.shape.id.unwrap().openapi({ description: "The team ID of the team to remove" }),
 	organizationId: teamSchema.shape.organizationId.optional()
 });
 /**
 * Schema for updating a team
 */
-const updateTeamSchema = z$1.object({
+const updateTeamSchema = z.object({
 	teamId: teamSchema.shape.id.unwrap().openapi({ description: "The ID of the team to be updated" }),
 	data: teamSchema.omit({
 		id: true,
@@ -2028,49 +1993,47 @@ const updateTeamSchema = z$1.object({
 /**
 * Schema for setting active team
 */
-const setActiveTeamSchema = z$1.object({ teamId: teamSchema.shape.id.unwrap().nullish().openapi({ description: "The team id to set as active. It can be null to unset the active team" }) });
+const setActiveTeamSchema = z.object({ teamId: teamSchema.shape.id.unwrap().nullish().openapi({ description: "The team id to set as active. It can be null to unset the active team" }) });
 /**
 * Schema for team list response
 */
-const teamListResponseSchema = z$1.array(teamSchema);
+const teamListResponseSchema = z.array(teamSchema);
 /**
 * Schema for listing teams query
 */
-const listTeamsQuerySchema = z$1.object({ organizationId: teamSchema.shape.organizationId.optional() });
+const listTeamsQuerySchema = z.object({ organizationId: teamSchema.shape.organizationId.optional() });
 /**
 * Schema for listing team members query
 */
-const listTeamMembersQuerySchema = z$1.object({ teamId: teamSchema.shape.id.unwrap().optional().openapi({ description: "The team whose members we should return. If this is not provided the members of the current active team get returned." }) });
+const listTeamMembersQuerySchema = z.object({ teamId: teamSchema.shape.id.unwrap().optional().openapi({ description: "The team whose members we should return. If this is not provided the members of the current active team get returned." }) });
 /**
 * Schema for adding team member
 */
-const addTeamMemberSchema = z$1.object({
+const addTeamMemberSchema = z.object({
 	teamId: teamMemberSchema.shape.teamId.openapi({ description: "The team the user should be a member of" }),
 	userId: teamMemberSchema.shape.userId.openapi({ description: "The user ID which represents the user to be added as a member" })
 });
 /**
 * Schema for removing team member
 */
-const removeTeamMemberSchema = z$1.object({
+const removeTeamMemberSchema = z.object({
 	teamId: teamMemberSchema.shape.teamId.openapi({ description: "The team the user should be removed from" }),
 	userId: teamMemberSchema.shape.userId.openapi({ description: "The user which should be removed from the team" })
 });
 /**
 * Schema for team member response
 */
-const teamMemberResponseSchema = z$1.object({
-	id: z$1.string().openapi({ description: "Unique identifier for the team member" }),
-	userId: z$1.string().openapi({ description: "ID of the user who is a member of the team" }),
-	teamId: z$1.string().openapi({ description: "ID of the team this member belongs to" }),
+const teamMemberResponseSchema = z.object({
+	id: z.string().openapi({ description: "Unique identifier for the team member" }),
+	userId: z.string().openapi({ description: "ID of the user who is a member of the team" }),
+	teamId: z.string().openapi({ description: "ID of the team this member belongs to" }),
 	createdAt: dateOrIsoStringSchema.openapi({ description: "Timestamp when the member was added to the team" })
 });
 /**
 * Schema for team member list response
 */
-const teamMemberListResponseSchema = z$1.array(teamMemberResponseSchema).openapi({ description: "List of team members" });
-
-//#endregion
-//#region src/plugins/organization/routes/crud-invites.ts
+const teamMemberListResponseSchema = z.array(teamMemberResponseSchema).openapi({ description: "List of team members" });
+// src/plugins/organization/routes/crud-invites.ts
 const createInvitation = (option) => {
 	const additionalFieldsSchema = toZodSchema({
 		fields: option?.schema?.invitation?.additionalFields ?? {},
@@ -2086,7 +2049,7 @@ const createInvitation = (option) => {
 		responses: res(invitationResponseSchema.transform(toSuccess)).err(400, "Not found or already invited").err(401, "Not allowed to perform action").err(403, "Not allowed to perform action or invitation or member limit reached").bld()
 	}), (_authOptions) => async (ctx) => {
 		const session = ctx.get("session");
-		const { organizationId: requestOrganizationId, role: role$2, email, resend, teamId,...additionalFields } = ctx.req.valid("json");
+		const { organizationId: requestOrganizationId, role, email, resend, teamId, ...additionalFields } = ctx.req.valid("json");
 		const organizationId = requestOrganizationId ?? session.session.activeOrganizationId;
 		if (!organizationId) return ctx.render({
 			success: False,
@@ -2111,7 +2074,7 @@ const createInvitation = (option) => {
 			message: ORGANIZATION_ERROR_CODES.YOU_ARE_NOT_ALLOWED_TO_INVITE_USERS_TO_THIS_ORGANIZATION
 		}, 403);
 		const creatorRole = ctx.get("orgOptions").creatorRole || "owner";
-		const roles = parseRoles(role$2);
+		const roles = parseRoles(role);
 		if (member.role !== creatorRole && roles.split(",").includes(creatorRole)) return ctx.render({
 			success: False,
 			message: ORGANIZATION_ERROR_CODES.YOU_ARE_NOT_ALLOWED_TO_INVITE_USER_WITH_THIS_ROLE
@@ -2131,14 +2094,14 @@ const createInvitation = (option) => {
 			success: False,
 			message: ORGANIZATION_ERROR_CODES.USER_IS_ALREADY_INVITED_TO_THIS_ORGANIZATION
 		}, 400);
-		const organization$1 = await adapter.findOrganizationById(organizationId);
-		if (!organization$1) return ctx.render({
+		const organization = await adapter.findOrganizationById(organizationId);
+		if (!organization) return ctx.render({
 			success: False,
 			message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 		}, 400);
 		if (alreadyInvited.length && resend) {
 			const existingInvitation = alreadyInvited[0];
-			const newExpiresAt = getDate(ctx.get("orgOptions").invitationExpiresIn ?? 3600 * 48, "sec");
+			const newExpiresAt = getDate(ctx.get("orgOptions").invitationExpiresIn ?? 172800, "sec");
 			await ctx.get("context").adapter.update({
 				model: "invitation",
 				where: [{
@@ -2155,7 +2118,7 @@ const createInvitation = (option) => {
 				id: updatedInvitation.id,
 				role: updatedInvitation.role,
 				email: updatedInvitation.email.toLowerCase(),
-				organization: organization$1,
+				organization,
 				inviter: {
 					...member,
 					user: session.user
@@ -2171,7 +2134,7 @@ const createInvitation = (option) => {
 		const optionInvitationLimit = ctx.get("orgOptions").invitationLimit;
 		const invitationLimit = typeof optionInvitationLimit === "function" ? await optionInvitationLimit({
 			user: session.user,
-			organization: organization$1,
+			organization,
 			member
 		}, ctx.get("context")) : optionInvitationLimit ?? 100;
 		if ((await adapter.findPendingInvitations({ organizationId })).length >= invitationLimit) return ctx.render({
@@ -2180,10 +2143,10 @@ const createInvitation = (option) => {
 		}, 403);
 		const orgOptions = ctx.get("orgOptions");
 		if (orgOptions.teams && orgOptions.teams.enabled && orgOptions.teams.maximumMembersPerTeam !== void 0 && teamId) {
-			const teamIds$1 = typeof teamId === "string" ? [teamId] : teamId;
-			for (const teamId$1 of teamIds$1) {
+			const teamIds = typeof teamId === "string" ? [teamId] : teamId;
+			for (const teamId of teamIds) {
 				const team = await adapter.findTeamById({
-					teamId: teamId$1,
+					teamId,
 					organizationId,
 					includeTeamMembers: true
 				});
@@ -2193,7 +2156,7 @@ const createInvitation = (option) => {
 				}, 400);
 				if (!!orgOptions.teams?.enabled) {
 					const maximumMembersPerTeam = typeof orgOptions.teams.maximumMembersPerTeam === "function" ? await orgOptions.teams.maximumMembersPerTeam({
-						teamId: teamId$1,
+						teamId,
 						session,
 						organizationId
 					}) : orgOptions.teams.maximumMembersPerTeam ?? Infinity;
@@ -2220,7 +2183,7 @@ const createInvitation = (option) => {
 					...teamIds.length > 0 && { teamId: teamIds[0] }
 				},
 				inviter: session.user,
-				organization: organization$1
+				organization
 			});
 			if (response && typeof response === "object" && "data" in response) invitationData = {
 				...invitationData,
@@ -2235,7 +2198,7 @@ const createInvitation = (option) => {
 			id: invitation.id,
 			role: invitation.role,
 			email: invitation.email.toLowerCase(),
-			organization: organization$1,
+			organization,
 			inviter: {
 				...member,
 				user: session.user
@@ -2245,7 +2208,7 @@ const createInvitation = (option) => {
 		if (option?.organizationHooks?.afterCreateInvitation) await option?.organizationHooks.afterCreateInvitation({
 			invitation,
 			inviter: session.user,
-			organization: organization$1
+			organization
 		});
 		return ctx.render({ invitation }, 200);
 	});
@@ -2280,15 +2243,15 @@ const acceptInvitation = (options) => createEndpoint(createRoute$1({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.ORGANIZATION_MEMBERSHIP_LIMIT_REACHED
 	}, 401);
-	const organization$1 = await adapter.findOrganizationById(invitation.organizationId);
-	if (!organization$1) return ctx.render({
+	const organization = await adapter.findOrganizationById(invitation.organizationId);
+	if (!organization) return ctx.render({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 	}, 400);
 	if (options?.organizationHooks?.beforeAcceptInvitation) await options?.organizationHooks.beforeAcceptInvitation({
 		invitation,
 		user: session.user,
-		organization: organization$1
+		organization
 	});
 	const acceptedI = await adapter.updateInvitation({
 		invitationId,
@@ -2321,8 +2284,9 @@ const acceptInvitation = (options) => createEndpoint(createRoute$1({
 		}
 		if (onlyOne) {
 			const teamId = teamIds[0];
+			const updatedSession = await adapter.setActiveTeam(session.session.token, teamId);
 			await setSessionCookie(ctx, authOptions, {
-				session: await adapter.setActiveTeam(session.session.token, teamId),
+				session: updatedSession,
 				user: session.user
 			});
 		}
@@ -2342,7 +2306,7 @@ const acceptInvitation = (options) => createEndpoint(createRoute$1({
 		invitation: acceptedI,
 		member,
 		user: session.user,
-		organization: organization$1
+		organization
 	});
 	return ctx.render({
 		invitation: acceptedI,
@@ -2374,15 +2338,15 @@ const rejectInvitation = (options) => createEndpoint(createRoute$1({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.EMAIL_VERIFICATION_REQUIRED_BEFORE_ACCEPTING_OR_REJECTING_INVITATION
 	}, 403);
-	const organization$1 = await adapter.findOrganizationById(invitation.organizationId);
-	if (!organization$1) return ctx.render({
+	const organization = await adapter.findOrganizationById(invitation.organizationId);
+	if (!organization) return ctx.render({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 	}, 400);
 	if (options?.organizationHooks?.beforeRejectInvitation) await options?.organizationHooks.beforeRejectInvitation({
 		invitation,
 		user: session.user,
-		organization: organization$1
+		organization
 	});
 	const rejectedI = await adapter.updateInvitation({
 		invitationId,
@@ -2391,7 +2355,7 @@ const rejectInvitation = (options) => createEndpoint(createRoute$1({
 	if (options?.organizationHooks?.afterRejectInvitation) await options?.organizationHooks.afterRejectInvitation({
 		invitation: rejectedI ?? invitation,
 		user: session.user,
-		organization: organization$1
+		organization
 	});
 	return ctx.render({ invitation: rejectedI }, 200);
 });
@@ -2429,15 +2393,15 @@ const cancelInvitation = (options) => createEndpoint(createRoute$1({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.YOU_ARE_NOT_ALLOWED_TO_CANCEL_THIS_INVITATION
 	}, 401);
-	const organization$1 = await adapter.findOrganizationById(invitation.organizationId);
-	if (!organization$1) return ctx.render({
+	const organization = await adapter.findOrganizationById(invitation.organizationId);
+	if (!organization) return ctx.render({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 	}, 400);
 	if (options?.organizationHooks?.beforeCancelInvitation) await options?.organizationHooks.beforeCancelInvitation({
 		invitation,
 		cancelledBy: session.user,
-		organization: organization$1
+		organization
 	});
 	const canceledI = await adapter.updateInvitation({
 		invitationId,
@@ -2446,7 +2410,7 @@ const cancelInvitation = (options) => createEndpoint(createRoute$1({
 	if (options?.organizationHooks?.afterCancelInvitation) await options?.organizationHooks.afterCancelInvitation({
 		invitation: canceledI ?? invitation,
 		cancelledBy: session.user,
-		organization: organization$1
+		organization
 	});
 	return ctx.render(canceledI, 200);
 });
@@ -2471,8 +2435,8 @@ const getInvitation = (options) => createEndpoint(createRoute$1({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.YOU_ARE_NOT_THE_RECIPIENT_OF_THE_INVITATION
 	}, 403);
-	const organization$1 = await adapter.findOrganizationById(invitation.organizationId);
-	if (!organization$1) return ctx.render({
+	const organization = await adapter.findOrganizationById(invitation.organizationId);
+	if (!organization) return ctx.render({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 	}, 400);
@@ -2486,8 +2450,8 @@ const getInvitation = (options) => createEndpoint(createRoute$1({
 	}, 400);
 	return ctx.render({
 		...invitation,
-		organizationName: organization$1["name"],
-		organizationSlug: organization$1["slug"],
+		organizationName: organization["name"],
+		organizationSlug: organization["slug"],
 		inviterEmail: member.user.email
 	}, 200);
 });
@@ -2542,9 +2506,7 @@ const listUserInvitations = (options) => createEndpoint(createRoute$1({
 	const invitations = await getOrgAdapter(ctx.get("context"), options).listUserInvitations(userEmail);
 	return ctx.render(invitations, 200);
 });
-
-//#endregion
-//#region src/plugins/organization/routes/crud-members.ts
+// src/plugins/organization/routes/crud-members.ts
 const addMember = (option) => {
 	const additionalFieldsSchema = toZodSchema({
 		fields: option?.schema?.member?.additionalFields ?? {},
@@ -2560,7 +2522,7 @@ const addMember = (option) => {
 		request: req().bdy(addMemberSchema.extend(additionalFieldsSchema.shape)).bld(),
 		responses: res(memberSchema.transform(toSuccess)).err(400, "User not found or already a member").err(401, "Not allowed to perform action").err(403, "Membership limit reached").bld()
 	}), (_authOptions) => async (ctx) => {
-		let { organizationId, role: role$2, userId, teamId,...additionalFields } = ctx.req.valid("json");
+		let { organizationId, role, userId, teamId, ...additionalFields } = ctx.req.valid("json");
 		const session = userId == null || organizationId == null ? ctx.get("session") ?? null : null;
 		userId ??= session?.user.id;
 		organizationId ??= session?.session.activeOrganizationId;
@@ -2603,15 +2565,15 @@ const addMember = (option) => {
 			success: False,
 			message: ORGANIZATION_ERROR_CODES.ORGANIZATION_MEMBERSHIP_LIMIT_REACHED
 		}, 403);
-		const organization$1 = await adapter.findOrganizationById(organizationId);
-		if (!organization$1) return ctx.render({
+		const organization = await adapter.findOrganizationById(organizationId);
+		if (!organization) return ctx.render({
 			success: False,
 			message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 		}, 400);
 		let memberData = {
 			organizationId,
 			userId: user.id,
-			role: parseRoles(role$2),
+			role: parseRoles(role),
 			createdAt: /* @__PURE__ */ new Date(),
 			...additionalFields ? additionalFields : {}
 		};
@@ -2620,11 +2582,11 @@ const addMember = (option) => {
 				member: {
 					userId: user.id,
 					organizationId,
-					role: parseRoles(role$2),
+					role: parseRoles(role),
 					...additionalFields
 				},
 				user,
-				organization: organization$1
+				organization
 			});
 			if (response && typeof response === "object" && "data" in response) memberData = {
 				...memberData,
@@ -2639,7 +2601,7 @@ const addMember = (option) => {
 		if (option?.organizationHooks?.afterAddMember) await option?.organizationHooks.afterAddMember({
 			member: createdMember,
 			user,
-			organization: organization$1
+			organization
 		});
 		return ctx.render(createdMember, 200);
 	});
@@ -2670,7 +2632,7 @@ const removeMember = (option) => createEndpoint(createRoute$1({
 		message: ORGANIZATION_ERROR_CODES.MEMBER_NOT_FOUND
 	}, 400);
 	let toBeRemovedMember = null;
-	if (z$1.email().safeParse(memberIdOrEmail).success) toBeRemovedMember = await adapter.findMemberByEmail({
+	if (z.email().safeParse(memberIdOrEmail).success) toBeRemovedMember = await adapter.findMemberByEmail({
 		email: memberIdOrEmail,
 		organizationId
 	});
@@ -2705,8 +2667,8 @@ const removeMember = (option) => createEndpoint(createRoute$1({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.MEMBER_NOT_FOUND
 	}, 400);
-	const organization$1 = await adapter.findOrganizationById(organizationId);
-	if (!organization$1) return ctx.render({
+	const organization = await adapter.findOrganizationById(organizationId);
+	if (!organization) return ctx.render({
 		status: False,
 		message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 	}, 400);
@@ -2718,14 +2680,14 @@ const removeMember = (option) => createEndpoint(createRoute$1({
 	if (option?.organizationHooks?.beforeRemoveMember) await option?.organizationHooks.beforeRemoveMember({
 		member: toBeRemovedMember,
 		user: userBeingRemoved,
-		organization: organization$1
+		organization
 	});
 	await adapter.deleteMember(toBeRemovedMember.id);
 	if (session.user.id === toBeRemovedMember.userId && session.session.activeOrganizationId === toBeRemovedMember.organizationId) await adapter.setActiveOrganization(session.session.token, null);
 	if (option?.organizationHooks?.afterRemoveMember) await option?.organizationHooks.afterRemoveMember({
 		member: toBeRemovedMember,
 		user: userBeingRemoved,
-		organization: organization$1
+		organization
 	});
 	return ctx.render(toBeRemovedMember, 200);
 });
@@ -2739,7 +2701,7 @@ const updateMemberRole = (option) => createEndpoint(createRoute$1({
 	responses: res(memberSchema.transform(toSuccess)).err(400, "Member not found").err(401, "Member limit reached").err(403, "Not allowed to perform this action").bld()
 }), (_authOptions) => async (ctx) => {
 	const session = ctx.get("session");
-	const { role: role$2, memberId, organizationId: requestOrganizationId } = ctx.req.valid("json");
+	const { role, memberId, organizationId: requestOrganizationId } = ctx.req.valid("json");
 	const organizationId = requestOrganizationId ?? session.session.activeOrganizationId;
 	if (!organizationId) return ctx.render({
 		success: False,
@@ -2766,7 +2728,7 @@ const updateMemberRole = (option) => createEndpoint(createRoute$1({
 	const creatorRole = ctx.get("orgOptions").creatorRole ?? "owner";
 	const updatingMemberRoles = member.role.split(",");
 	const toBeUpdatedMemberRoles = toBeUpdatedMember.role.split(",");
-	const roleToSet = Array.isArray(role$2) ? role$2 : [role$2];
+	const roleToSet = Array.isArray(role) ? role : [role];
 	const isUpdatingCreator = toBeUpdatedMemberRoles.includes(creatorRole);
 	const updaterIsCreator = updatingMemberRoles.includes(creatorRole);
 	const isSettingCreatorRole = roleToSet.includes(creatorRole);
@@ -2782,8 +2744,8 @@ const updateMemberRole = (option) => createEndpoint(createRoute$1({
 				field: "organizationId",
 				value: organizationId
 			}]
-		})).filter((member$1) => {
-			return member$1.role.split(",").includes(creatorRole);
+		})).filter((member) => {
+			return member.role.split(",").includes(creatorRole);
 		}).length <= 1 && !isSettingCreatorRole) return ctx.render({
 			success: False,
 			message: ORGANIZATION_ERROR_CODES.YOU_CANNOT_LEAVE_THE_ORGANIZATION_WITHOUT_AN_OWNER
@@ -2799,8 +2761,8 @@ const updateMemberRole = (option) => createEndpoint(createRoute$1({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.YOU_ARE_NOT_ALLOWED_TO_UPDATE_THIS_MEMBER
 	}, 403);
-	const organization$1 = await adapter.findOrganizationById(organizationId);
-	if (!organization$1) return ctx.render({
+	const organization = await adapter.findOrganizationById(organizationId);
+	if (!organization) return ctx.render({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 	}, 400);
@@ -2810,27 +2772,27 @@ const updateMemberRole = (option) => createEndpoint(createRoute$1({
 		message: "User not found"
 	}, 400);
 	const previousRole = toBeUpdatedMember.role;
-	const newRole = parseRoles(role$2);
+	const newRole = parseRoles(role);
 	if (option?.organizationHooks?.beforeUpdateMemberRole) {
 		const response = await option?.organizationHooks.beforeUpdateMemberRole({
 			member: toBeUpdatedMember,
 			newRole,
 			user: userBeingUpdated,
-			organization: organization$1
+			organization
 		});
 		if (response && typeof response === "object" && "data" in response) {
-			const updatedMember$1 = await adapter.updateMember(memberId, response.data.role ?? newRole);
-			if (!updatedMember$1) return ctx.render({
+			const updatedMember = await adapter.updateMember(memberId, response.data.role ?? newRole);
+			if (!updatedMember) return ctx.render({
 				success: False,
 				message: ORGANIZATION_ERROR_CODES.MEMBER_NOT_FOUND
 			}, 400);
 			if (option?.organizationHooks?.afterUpdateMemberRole) await option?.organizationHooks.afterUpdateMemberRole({
-				member: updatedMember$1,
+				member: updatedMember,
 				previousRole,
 				user: userBeingUpdated,
-				organization: organization$1
+				organization
 			});
-			return ctx.render(updatedMember$1, 200);
+			return ctx.render(updatedMember, 200);
 		}
 	}
 	const updatedMember = await adapter.updateMember(memberId, newRole);
@@ -2842,7 +2804,7 @@ const updateMemberRole = (option) => createEndpoint(createRoute$1({
 		member: updatedMember,
 		previousRole,
 		user: userBeingUpdated,
-		organization: organization$1
+		organization
 	});
 	return ctx.render(updatedMember, 200);
 });
@@ -2956,11 +2918,11 @@ const getActiveMemberRole = (option) => createEndpoint(createRoute$1({
 	method: "get",
 	path: "/organization/get-active-member-role",
 	middleware: [requestOnlySessionMiddleware, orgMiddleware(option)],
-	request: req().qry(z$1.object({
-		userId: z$1.string().openapi({ description: "The user ID to get the role for. If not provided, will default to the current user's" }).optional(),
-		organizationId: z$1.string().openapi({ description: "The organization ID to list members for. If not provided, will default to the user's active organization. Eg: \"organization-id\"" }).optional()
+	request: req().qry(z.object({
+		userId: z.string().openapi({ description: "The user ID to get the role for. If not provided, will default to the current user's" }).optional(),
+		organizationId: z.string().openapi({ description: "The organization ID to list members for. If not provided, will default to the user's active organization. Eg: \"organization-id\"" }).optional()
 	})).bld(),
-	responses: res(z$1.string().transform(toSuccess)).err(400, "No active organization").err(403, "Not member of organization").bld()
+	responses: res(z.string().transform(toSuccess)).err(400, "No active organization").err(403, "Not member of organization").bld()
 }), (_authOptions) => async (ctx) => {
 	let { userId, organizationId } = ctx.req.valid("query");
 	const session = userId == null || organizationId == null ? ctx.get("session") ?? null : null;
@@ -2980,9 +2942,7 @@ const getActiveMemberRole = (option) => createEndpoint(createRoute$1({
 	}, 403);
 	return ctx.render(member.role, 200);
 });
-
-//#endregion
-//#region src/plugins/organization/routes/crud-org.ts
+// src/plugins/organization/routes/crud-org.ts
 const createOrganization = (options) => {
 	const additionalFieldsSchema = toZodSchema({
 		fields: options?.schema?.organization?.additionalFields ?? {},
@@ -2999,7 +2959,7 @@ const createOrganization = (options) => {
 		responses: res(organizationWithMembersSchema.transform(toSuccess)).err(400).err(401).err(403).bld()
 	}), (_authOptions) => async (ctx) => {
 		const session = ctx.get("session");
-		let { name, slug, userId, logo, metadata, keepCurrentActiveOrganization,...additionalFields } = ctx.req.valid("json");
+		let { name, slug, userId, logo, metadata, keepCurrentActiveOrganization, ...additionalFields } = ctx.req.valid("json");
 		if (userId && !ctx.get("isServer")) return ctx.render({
 			success: False,
 			message: "userId is a server-only field"
@@ -3047,7 +3007,7 @@ const createOrganization = (options) => {
 			});
 			if (response && typeof response === "object" && "data" in response) hookResponse = response;
 		}
-		const organization$1 = await adapter.createOrganization({ organization: {
+		const organization = await adapter.createOrganization({ organization: {
 			...orgData,
 			createdAt: /* @__PURE__ */ new Date(),
 			...hookResponse?.data || {}
@@ -3055,15 +3015,15 @@ const createOrganization = (options) => {
 		let member;
 		let teamMember = null;
 		if (orgOptions?.teams?.enabled === true && orgOptions.teams.defaultTeam?.enabled !== false) {
-			const defaultTeam = await orgOptions.teams.defaultTeam?.customCreateDefaultTeam?.(organization$1, ctx.req) ?? await adapter.createTeam({
-				organizationId: organization$1.id,
-				name: `${organization$1.name}`,
+			const defaultTeam = await orgOptions.teams.defaultTeam?.customCreateDefaultTeam?.(organization, ctx.req) ?? await adapter.createTeam({
+				organizationId: organization.id,
+				name: `${organization.name}`,
 				createdAt: /* @__PURE__ */ new Date(),
 				updatedAt: /* @__PURE__ */ new Date()
 			});
 			member = await adapter.createMember({
 				userId: user.id,
-				organizationId: organization$1.id,
+				organizationId: organization.id,
 				role: orgOptions.creatorRole ?? "owner"
 			});
 			teamMember = await adapter.findOrCreateTeamMember({
@@ -3072,19 +3032,19 @@ const createOrganization = (options) => {
 			});
 		} else member = await adapter.createMember({
 			userId: user.id,
-			organizationId: organization$1.id,
+			organizationId: organization.id,
 			role: orgOptions.creatorRole ?? "owner"
 		});
 		if (orgOptions.organizationHooks?.afterCreateOrganization) await orgOptions.organizationHooks.afterCreateOrganization({
-			organization: organization$1,
+			organization,
 			user,
 			member
 		});
-		if (session && !keepCurrentActiveOrganization) await adapter.setActiveOrganization(session.session.token, organization$1.id);
+		if (session && !keepCurrentActiveOrganization) await adapter.setActiveOrganization(session.session.token, organization.id);
 		if (teamMember && session && !keepCurrentActiveOrganization) await adapter.setActiveTeam(session.session.token, teamMember.teamId);
 		return ctx.render({
-			...organization$1,
-			metadata: organization$1.metadata && typeof organization$1.metadata === "string" ? JSON.parse(organization$1.metadata) : organization$1.metadata,
+			...organization,
+			metadata: organization.metadata && typeof organization.metadata === "string" ? JSON.parse(organization.metadata) : organization.metadata,
 			members: [member]
 		}, 200);
 	});
@@ -3224,24 +3184,24 @@ const getFullOrganization = (options) => {
 			message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 		}, 400);
 		const adapter = getOrgAdapter(ctx.get("context"), options);
-		const organization$1 = await adapter.findFullOrganization({
+		const organization = await adapter.findFullOrganization({
 			organizationId: orgId,
 			isSlug: !!organizationSlug,
 			...membersLimit && { membersLimit },
 			...ctx.get("orgOptions").teams?.enabled === true && { includeTeams: ctx.get("orgOptions").teams.enabled }
 		});
-		if (!organization$1) return ctx.render({
+		if (!organization) return ctx.render({
 			success: False,
 			message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 		}, 400);
-		if (!organization$1.members.find((member) => member.userId === session.user.id)) {
+		if (!organization.members.find((member) => member.userId === session.user.id)) {
 			await adapter.setActiveOrganization(session.session.token, null);
 			return ctx.render({
 				success: False,
 				message: ORGANIZATION_ERROR_CODES.USER_IS_NOT_A_MEMBER_OF_THE_ORGANIZATION
 			}, 403);
 		}
-		return ctx.render(organization$1, 200);
+		return ctx.render(organization, 200);
 	});
 };
 const setActiveOrganization = (options) => createEndpoint(createRoute$1({
@@ -3258,8 +3218,9 @@ const setActiveOrganization = (options) => createEndpoint(createRoute$1({
 	let { organizationId, organizationSlug } = ctx.req.valid("json");
 	if (organizationId === null) {
 		if (!session.session.activeOrganizationId) return ctx.render(null, 200);
+		const updatedSession = await adapter.setActiveOrganization(session.session.token, null);
 		await setSessionCookie(ctx, authOptions, {
-			session: await adapter.setActiveOrganization(session.session.token, null),
+			session: updatedSession,
 			user: session.user
 		});
 		return ctx.render(null, 200);
@@ -3273,12 +3234,12 @@ const setActiveOrganization = (options) => createEndpoint(createRoute$1({
 		organizationId = sessionOrgId;
 	}
 	if (organizationSlug !== void 0 && organizationId === void 0) {
-		const organization$2 = await adapter.findOrganizationBySlug(organizationSlug);
-		if (!organization$2) return ctx.render({
+		const organization = await adapter.findOrganizationBySlug(organizationSlug);
+		if (!organization) return ctx.render({
 			success: False,
 			message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 		}, 400);
-		organizationId = organization$2.id;
+		organizationId = organization.id;
 	}
 	if (organizationId === void 0) return ctx.render({
 		success: False,
@@ -3294,16 +3255,17 @@ const setActiveOrganization = (options) => createEndpoint(createRoute$1({
 			message: ORGANIZATION_ERROR_CODES.USER_IS_NOT_A_MEMBER_OF_THE_ORGANIZATION
 		}, 403);
 	}
-	let organization$1 = await adapter.findOrganizationById(organizationId);
-	if (!organization$1) return ctx.render({
+	let organization = await adapter.findOrganizationById(organizationId);
+	if (!organization) return ctx.render({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
 	}, 400);
+	const updatedSession = await adapter.setActiveOrganization(session.session.token, organization.id);
 	await setSessionCookie(ctx, authOptions, {
-		session: await adapter.setActiveOrganization(session.session.token, organization$1.id),
+		session: updatedSession,
 		user: session.user
 	});
-	return ctx.render(organization$1, 200);
+	return ctx.render(organization, 200);
 });
 const listOrganizations = (options) => createEndpoint(createRoute$1({
 	operationId: "listOrganizations",
@@ -3318,9 +3280,7 @@ const listOrganizations = (options) => createEndpoint(createRoute$1({
 	const organizations = await adapter.listOrganizations(session.user.id);
 	return ctx.render(organizations, 200);
 });
-
-//#endregion
-//#region src/plugins/organization/routes/crud-team.ts
+// src/plugins/organization/routes/crud-team.ts
 const createTeam = (options) => {
 	const additionalFieldsSchema = toZodSchema({
 		fields: options?.schema?.team?.additionalFields ?? {},
@@ -3337,7 +3297,7 @@ const createTeam = (options) => {
 		responses: res(teamSchema.transform(toSuccess), "Team created successfully").err(400).err(401).err(403).bld()
 	}), (_authOptions) => async (ctx) => {
 		const session = ctx.get("session") ?? null;
-		const { name, organizationId = session?.session.activeOrganizationId,...additionalFields } = ctx.req.valid("json");
+		const { name, organizationId = session?.session.activeOrganizationId, ...additionalFields } = ctx.req.valid("json");
 		if (!organizationId) return ctx.render({
 			success: False,
 			message: ORGANIZATION_ERROR_CODES.NO_ACTIVE_ORGANIZATION
@@ -3452,7 +3412,7 @@ const updateTeam = (options) => {
 		responses: res(teamSchema.transform(toSuccess), "Team updated successfully").err(400).err(401).err(403).bld()
 	}), (_authOptions) => async (ctx) => {
 		const session = ctx.get("session");
-		const { teamId, data: { name, organizationId = session.session.activeOrganizationId,...additionalFields } } = ctx.req.valid("json");
+		const { teamId, data: { name, organizationId = session.session.activeOrganizationId, ...additionalFields } } = ctx.req.valid("json");
 		if (!organizationId) return ctx.render({
 			success: False,
 			message: ORGANIZATION_ERROR_CODES.NO_ACTIVE_ORGANIZATION
@@ -3531,8 +3491,9 @@ const setActiveTeam = (options) => createEndpoint(createRoute$1({
 	let { teamId } = ctx.req.valid("json");
 	if (teamId === null) {
 		if (!session.session.activeTeamId) return ctx.render(null, 200);
+		const updatedSession = await adapter.setActiveTeam(session.session.token, null);
 		await setSessionCookie(ctx, authOptions, {
-			session: await adapter.setActiveTeam(session.session.token, null),
+			session: updatedSession,
 			user: session.user
 		});
 		return ctx.render(null, 200);
@@ -3557,8 +3518,9 @@ const setActiveTeam = (options) => createEndpoint(createRoute$1({
 		success: False,
 		message: ORGANIZATION_ERROR_CODES.USER_IS_NOT_A_MEMBER_OF_THE_TEAM
 	}, 403);
+	const updatedSession = await adapter.setActiveTeam(session.session.token, team.id);
 	await setSessionCookie(ctx, authOptions, {
-		session: await adapter.setActiveTeam(session.session.token, team.id),
+		session: updatedSession,
 		user: session.user
 	});
 	return ctx.render(team, 200);
@@ -3698,9 +3660,7 @@ const removeTeamMember = (options) => createEndpoint(createRoute$1({
 		message: "Team member removed successfully."
 	}, 200);
 });
-
-//#endregion
-//#region src/plugins/organization/organization.ts
+// src/plugins/organization/organization.ts
 function parseRoles(roles) {
 	return Array.isArray(roles) ? roles.join(",") : roles;
 }
@@ -3711,19 +3671,19 @@ const createHasPermission = (options) => {
 		path: "/organization/has-permission",
 		description: "Check if the user has permission",
 		middleware: [orgSessionMiddleware],
-		request: req().bdy(z$1.object({ organizationId: z$1.string().optional() }).and(z$1.union([z$1.object({
-			permission: z$1.record(z$1.string(), z$1.array(z$1.string())).openapi({
+		request: req().bdy(z.object({ organizationId: z.string().optional() }).and(z.union([z.object({
+			permission: z.record(z.string(), z.array(z.string())).openapi({
 				description: "The permission to check",
 				deprecated: true
 			}),
-			permissions: z$1.undefined()
-		}), z$1.object({
-			permission: z$1.undefined(),
-			permissions: z$1.record(z$1.string(), z$1.array(z$1.string())).openapi({ description: "The permission to check" })
+			permissions: z.undefined().optional()
+		}), z.object({
+			permission: z.undefined().optional(),
+			permissions: z.record(z.string(), z.array(z.string())).openapi({ description: "The permission to check" })
 		})]))).bld(),
-		responses: res(z$1.object({
-			success: z$1.literal(true),
-			data: z$1.boolean()
+		responses: res(z.object({
+			success: z.literal(true),
+			data: z.boolean()
 		})).err(400, "No permissions were provided").err(401, "User not member of organization").bld()
 	}), (_authOptions) => async (ctx) => {
 		const { organizationId, permission, permissions } = ctx.req.valid("json");
@@ -3754,38 +3714,486 @@ const createHasPermission = (options) => {
 };
 function organization(options) {
 	let endpoints = {
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/create`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.createOrganization`
+		*
+		* **client:**
+		* `authClient.organization.create`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-create)
+		*/
 		createOrganization: createOrganization(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/update`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.updateOrganization`
+		*
+		* **client:**
+		* `authClient.organization.update`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-update)
+		*/
 		updateOrganization: updateOrganization(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/delete`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.deleteOrganization`
+		*
+		* **client:**
+		* `authClient.organization.delete`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-delete)
+		*/
 		deleteOrganization: deleteOrganization(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/set-active`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.setActiveOrganization`
+		*
+		* **client:**
+		* `authClient.organization.setActive`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-set-active)
+		*/
 		setActiveOrganization: setActiveOrganization(options),
+		/**
+		* ### Endpoint
+		*
+		* GET `/organization/get-full-organization`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.getFullOrganization`
+		*
+		* **client:**
+		* `authClient.organization.getFullOrganization`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-get-full-organization)
+		*/
 		getFullOrganization: getFullOrganization(options),
+		/**
+		* ### Endpoint
+		*
+		* GET `/organization/list`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.listOrganizations`
+		*
+		* **client:**
+		* `authClient.organization.list`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-list)
+		*/
 		listOrganizations: listOrganizations(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/invite-member`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.createInvitation`
+		*
+		* **client:**
+		* `authClient.organization.inviteMember`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-invite-member)
+		*/
 		createInvitation: createInvitation(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/cancel-invitation`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.cancelInvitation`
+		*
+		* **client:**
+		* `authClient.organization.cancelInvitation`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-cancel-invitation)
+		*/
 		cancelInvitation: cancelInvitation(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/accept-invitation`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.acceptInvitation`
+		*
+		* **client:**
+		* `authClient.organization.acceptInvitation`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-accept-invitation)
+		*/
 		acceptInvitation: acceptInvitation(options),
+		/**
+		* ### Endpoint
+		*
+		* GET `/organization/get-invitation`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.getInvitation`
+		*
+		* **client:**
+		* `authClient.organization.getInvitation`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-get-invitation)
+		*/
 		getInvitation: getInvitation(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/reject-invitation`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.rejectInvitation`
+		*
+		* **client:**
+		* `authClient.organization.rejectInvitation`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-reject-invitation)
+		*/
 		rejectInvitation: rejectInvitation(options),
+		/**
+		* ### Endpoint
+		*
+		* GET `/organization/list-invitations`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.listInvitations`
+		*
+		* **client:**
+		* `authClient.organization.listInvitations`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-list-invitations)
+		*/
 		listInvitations: listInvitations(options),
+		/**
+		* ### Endpoint
+		*
+		* GET `/organization/get-active-member`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.getActiveMember`
+		*
+		* **client:**
+		* `authClient.organization.getActiveMember`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-get-active-member)
+		*/
 		getActiveMember: getActiveMember(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/check-slug`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.checkOrganizationSlug`
+		*
+		* **client:**
+		* `authClient.organization.checkSlug`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-check-slug)
+		*/
 		checkOrganizationSlug: checkOrganizationSlug(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/add-member`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.addMember`
+		*
+		* **client:**
+		* `authClient.organization.addMember`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-add-member)
+		*/
 		addMember: addMember(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/remove-member`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.removeMember`
+		*
+		* **client:**
+		* `authClient.organization.removeMember`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-remove-member)
+		*/
 		removeMember: removeMember(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/update-member-role`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.updateMemberRole`
+		*
+		* **client:**
+		* `authClient.organization.updateMemberRole`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-update-member-role)
+		*/
 		updateMemberRole: updateMemberRole(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/leave`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.leaveOrganization`
+		*
+		* **client:**
+		* `authClient.organization.leave`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-leave)
+		*/
 		leaveOrganization: leaveOrganization(options),
+		/**
+		* ### Endpoint
+		*
+		* GET `/organization/list-members`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.listMembers`
+		*
+		* **client:**
+		* `authClient.organization.listMembers`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-list-members)
+		*/
 		listUserInvitations: listUserInvitations(options),
+		/**
+		* ### Endpoint
+		*
+		* GET `/organization/list-members`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.listMembers`
+		*
+		* **client:**
+		* `authClient.organization.listMembers`
+		*/
 		listMembers: listMembers(options),
+		/**
+		* ### Endpoint
+		*
+		* GET `/organization/get-active-member-role`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.getActiveMemberRole`
+		*
+		* **client:**
+		* `authClient.organization.getActiveMemberRole`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-get-active-member-role)
+		*/
 		getActiveMemberRole: getActiveMemberRole(options)
 	};
 	const teamSupport = options?.teams?.enabled === true;
 	const teamEndpoints = {
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/create-team`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.createTeam`
+		*
+		* **client:**
+		* `authClient.organization.createTeam`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-create-team)
+		*/
 		createTeam: createTeam(options),
+		/**
+		* ### Endpoint
+		*
+		* GET `/organization/list-teams`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.listOrganizationTeams`
+		*
+		* **client:**
+		* `authClient.organization.listTeams`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-list-teams)
+		*/
 		listOrganizationTeams: listOrganizationTeams(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/remove-team`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.removeTeam`
+		*
+		* **client:**
+		* `authClient.organization.removeTeam`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-remove-team)
+		*/
 		removeTeam: removeTeam(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/update-team`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.updateTeam`
+		*
+		* **client:**
+		* `authClient.organization.updateTeam`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-method-organization-update-team)
+		*/
 		updateTeam: updateTeam(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/set-active-team`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.setActiveTeam`
+		*
+		* **client:**
+		* `authClient.organization.setActiveTeam`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-set-active-team)
+		*/
 		setActiveTeam: setActiveTeam(options),
+		/**
+		* ### Endpoint
+		*
+		* GET `/organization/list-user-teams`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.listUserTeams`
+		*
+		* **client:**
+		* `authClient.organization.listUserTeams`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-set-active-team)
+		*/
 		listUserTeams: listUserTeams(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/list-team-members`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.listTeamMembers`
+		*
+		* **client:**
+		* `authClient.organization.listTeamMembers`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-set-active-team)
+		*/
 		listTeamMembers: listTeamMembers(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/add-team-member`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.addTeamMember`
+		*
+		* **client:**
+		* `authClient.organization.addTeamMember`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-add-team-member)
+		*/
 		addTeamMember: addTeamMember(options),
+		/**
+		* ### Endpoint
+		*
+		* POST `/organization/remove-team-member`
+		*
+		* ### API Methods
+		*
+		* **server:**
+		* `auth.api.removeTeamMember`
+		*
+		* **client:**
+		* `authClient.organization.removeTeamMember`
+		*
+		* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/organization#api-remove-team-member)
+		*/
 		removeTeamMember: removeTeamMember(options)
 	};
 	if (teamSupport) endpoints = {
@@ -3804,7 +4212,7 @@ function organization(options) {
 		...endpoints,
 		...dynamicAccessControlEndpoints
 	};
-	const teamSchema$1 = teamSupport ? {
+	const teamSchema = teamSupport ? {
 		team: {
 			modelName: options?.schema?.team?.modelName,
 			fields: {
@@ -3865,7 +4273,7 @@ function organization(options) {
 			}
 		}
 	} : {};
-	const organizationRoleSchema$1 = options?.dynamicAccessControl?.enabled ? { organizationRole: {
+	const organizationRoleSchema = options?.dynamicAccessControl?.enabled ? { organizationRole: {
 		fields: {
 			organizationId: {
 				type: "string",
@@ -3902,7 +4310,7 @@ function organization(options) {
 		},
 		modelName: options?.schema?.organizationRole?.modelName
 	} } : {};
-	const schema$1 = {
+	const schema = {
 		organization: {
 			modelName: options?.schema?.organization?.modelName,
 			fields: {
@@ -3937,8 +4345,8 @@ function organization(options) {
 				...options?.schema?.organization?.additionalFields || {}
 			}
 		},
-		...organizationRoleSchema$1,
-		...teamSchema$1,
+		...organizationRoleSchema,
+		...teamSchema,
 		member: {
 			modelName: options?.schema?.member?.modelName,
 			fields: {
@@ -4043,7 +4451,7 @@ function organization(options) {
 			hasPermission: createHasPermission(options)
 		},
 		schema: {
-			...schema$1,
+			...schema,
 			session: { fields: {
 				activeOrganizationId: {
 					type: "string",
@@ -4069,9 +4477,7 @@ function organization(options) {
 		options
 	};
 }
-
-//#endregion
-//#region src/plugins/two-factor/error-code.ts
+// src/plugins/two-factor/error-code.ts
 const TWO_FACTOR_ERROR_CODES = {
 	OTP_NOT_ENABLED: "OTP not enabled",
 	OTP_HAS_EXPIRED: "OTP has expired",
@@ -4083,39 +4489,55 @@ const TWO_FACTOR_ERROR_CODES = {
 	TOO_MANY_ATTEMPTS_REQUEST_NEW_CODE: "Too many attempts. Please request a new code.",
 	INVALID_TWO_FACTOR_COOKIE: "Invalid two factor cookie"
 };
-
-//#endregion
-//#region src/plugins/two-factor/schema/totp.ts
-const generateTOTPSchema = z$1.object({ secret: z$1.string().openapi({ description: "The secret to generate the TOTP code" }) });
-const generateTOTPResponseSchema = z$1.string();
-const getTOTPURISchema = z$1.object({ password: z$1.string().openapi({ description: "User password" }) });
-const getTOTPURIResponseSchema = z$1.url();
-const verifyTOTPSchema = z$1.object({
-	code: z$1.string().openapi({ description: "The otp code to verify. Eg: \"012345\"" }),
-	trustDevice: z$1.boolean().openapi({ description: "If true, the device will be trusted for 30 days. It'll be refreshed on every sign in request within this time. Eg: true" }).optional()
+// src/plugins/two-factor/schema/totp.ts
+const generateTOTPSchema = z.object({ secret: z.string().openapi({ description: "The secret to generate the TOTP code" }) });
+const generateTOTPResponseSchema = z.string();
+const getTOTPURISchema = z.object({ password: z.string().openapi({ description: "User password" }) });
+const getTOTPURIResponseSchema = z.url();
+const verifyTOTPSchema = z.object({
+	code: z.string().openapi({ description: "The otp code to verify. Eg: \"012345\"" }),
+	/**
+	* if true, the device will be trusted
+	* for 30 days. It'll be refreshed on
+	* every sign in request within this time.
+	*/
+	trustDevice: z.boolean().openapi({ description: "If true, the device will be trusted for 30 days. It'll be refreshed on every sign in request within this time. Eg: true" }).optional()
 });
-
-//#endregion
-//#region src/plugins/two-factor/schema/otp.ts
-const sendTwoFactorOTPSchema = z$1.object({ trustDevice: z$1.boolean().optional().openapi({ description: "If true, the device will be trusted for 30 days. It'll be refreshed on every sign in request within this time. Eg: true" }) });
-const verifyTwoFactorOTPSchema = z$1.object({
-	code: z$1.string().openapi({ description: "The otp code to verify. Eg: \"012345\"" }),
-	trustDevice: z$1.boolean().optional().openapi({ description: "If true, the device will be trusted for 30 days. It'll be refreshed on every sign in request within this time. Eg: true" })
+// src/plugins/two-factor/schema/otp.ts
+const sendTwoFactorOTPSchema = z.object({ 
+/**
+* if true, the device will be trusted
+* for 30 days. It'll be refreshed on
+* every sign in request within this time.
+*/
+trustDevice: z.boolean().optional().openapi({ description: "If true, the device will be trusted for 30 days. It'll be refreshed on every sign in request within this time. Eg: true" }) });
+const verifyTwoFactorOTPSchema = z.object({
+	code: z.string().openapi({ description: "The otp code to verify. Eg: \"012345\"" }),
+	/**
+	* if true, the device will be trusted
+	* for 30 days. It'll be refreshed on
+	* every sign in request within this time.
+	*/
+	trustDevice: z.boolean().optional().openapi({ description: "If true, the device will be trusted for 30 days. It'll be refreshed on every sign in request within this time. Eg: true" })
 });
-
-//#endregion
-//#region src/plugins/two-factor/schema/backup-codes.ts
-const verifyBackupCodeSchema = z$1.object({
-	code: z$1.string().openapi({ description: `A backup code to verify. Eg: "123456"` }),
-	disableSession: z$1.boolean().openapi({ description: "If true, the session cookie will not be set." }).optional(),
-	trustDevice: z$1.boolean().openapi({ description: "If true, the device will be trusted for 30 days. It'll be refreshed on every sign in request within this time. Eg: true" }).optional()
+// src/plugins/two-factor/schema/backup-codes.ts
+const verifyBackupCodeSchema = z.object({
+	code: z.string().openapi({ description: `A backup code to verify. Eg: "123456"` }),
+	/**
+	* Disable setting the session cookie
+	*/
+	disableSession: z.boolean().openapi({ description: "If true, the session cookie will not be set." }).optional(),
+	/**
+	* if true, the device will be trusted
+	* for 30 days. It'll be refreshed on
+	* every sign in request within this time.
+	*/
+	trustDevice: z.boolean().openapi({ description: "If true, the device will be trusted for 30 days. It'll be refreshed on every sign in request within this time. Eg: true" }).optional()
 });
-const generateBackupCodesSchema = z$1.object({ password: z$1.string().openapi({ description: "The users password." }) });
-const viewBackupCodesSchema = z$1.object({ userId: z$1.coerce.string().openapi({ description: `The user ID to view all backup codes. Eg: "user-id"` }) });
-const backupCodesResponseSchema = z$1.array(z$1.string()).openapi({ description: "Array of generated backup codes in plain text" });
-
-//#endregion
-//#region src/plugins/two-factor/schema/index.ts
+const generateBackupCodesSchema = z.object({ password: z.string().openapi({ description: "The users password." }) });
+const viewBackupCodesSchema = z.object({ userId: z.coerce.string().openapi({ description: `The user ID to view all backup codes. Eg: "user-id"` }) });
+const backupCodesResponseSchema = z.array(z.string()).openapi({ description: "Array of generated backup codes in plain text" });
+// src/plugins/two-factor/schema/index.ts
 const schema = {
 	user: { fields: { twoFactorEnabled: {
 		type: "boolean",
@@ -4145,24 +4567,20 @@ const schema = {
 		}
 	} }
 };
-const enableTwoFactorSchema = z$1.object({
-	password: z$1.string().openapi({ description: "User password" }),
-	issuer: z$1.string().openapi({ description: "Custom issuer for the TOTP URI" }).optional()
+const enableTwoFactorSchema = z.object({
+	password: z.string().openapi({ description: "User password" }),
+	issuer: z.string().openapi({ description: "Custom issuer for the TOTP URI" }).optional()
 });
-const disableTwoFactorSchema = z$1.object({ password: z$1.string().openapi({ description: "User password" }) });
-const totpURISchema = z$1.object({
-	totpURI: z$1.url().openapi({ description: "TOTP URI" }),
-	backupCodes: z$1.array(z$1.string()).openapi({ description: "Backup codes" })
+const disableTwoFactorSchema = z.object({ password: z.string().openapi({ description: "User password" }) });
+const totpURISchema = z.object({
+	totpURI: z.url().openapi({ description: "TOTP URI" }),
+	backupCodes: z.array(z.string()).openapi({ description: "Backup codes" })
 });
-
-//#endregion
-//#region src/plugins/two-factor/constant.ts
+// src/plugins/two-factor/constant.ts
 const TWO_FACTOR_COOKIE_NAME = "two_factor";
 const TRUST_DEVICE_COOKIE_NAME = "trust_device";
-const TRUST_DEVICE_COOKIE_MAX_AGE = 720 * 60 * 60;
-
-//#endregion
-//#region src/plugins/two-factor/verify-two-factor.ts
+const TRUST_DEVICE_COOKIE_MAX_AGE = 2592e3;
+// src/plugins/two-factor/verify-two-factor.ts
 async function verifyTwoFactor(ctx, options) {
 	const invalid = (errorKey) => ctx.render({
 		success: False,
@@ -4189,30 +4607,30 @@ async function verifyTwoFactor(ctx, options) {
 		}, 401);
 		const dontRememberMe = await (0, cookies_exports.getSignedCookie)(ctx, context.secret, context.authCookies.dontRememberToken.name);
 		return {
-			valid: async (ctx$1) => {
-				const session$1 = await context.internalAdapter.createSession(verificationToken.value, !!dontRememberMe);
-				if (!session$1) return ctx$1.render({
+			valid: async (ctx) => {
+				const session = await context.internalAdapter.createSession(verificationToken.value, !!dontRememberMe);
+				if (!session) return ctx.render({
 					success: False,
 					message: "Failed to create session"
 				}, 500);
-				await setSessionCookie(ctx$1, options, {
-					session: session$1,
+				await setSessionCookie(ctx, options, {
+					session,
 					user
 				});
-				if (ctx$1.req.valid("json").trustDevice === true) {
-					const trustDeviceCookie = context.createAuthCookie(TRUST_DEVICE_COOKIE_NAME, { maxAge: 720 * 60 * 60 });
+				if (ctx.req.valid("json").trustDevice === true) {
+					const trustDeviceCookie = context.createAuthCookie(TRUST_DEVICE_COOKIE_NAME, { maxAge: 2592e3 });
 					/**
 					* create a token that will be used to
 					* verify the device
 					*/
-					const token = await createHMAC("SHA-256", "base64urlnopad").sign(context.secret, `${user.id}!${session$1.token}`);
-					await (0, cookies_exports.setSignedCookie)(ctx$1, trustDeviceCookie.name, `${token}!${session$1.token}`, context.secret, trustDeviceCookie.attributes);
-					(0, cookies_exports.deleteCookie)(ctx$1, context.authCookies.dontRememberToken.name, context.authCookies.dontRememberToken.options);
-					(0, cookies_exports.deleteCookie)(ctx$1, cookieName.name, cookieName.attributes);
+					const token = await createHMAC("SHA-256", "base64urlnopad").sign(context.secret, `${user.id}!${session.token}`);
+					await (0, cookies_exports.setSignedCookie)(ctx, trustDeviceCookie.name, `${token}!${session.token}`, context.secret, trustDeviceCookie.attributes);
+					(0, cookies_exports.deleteCookie)(ctx, context.authCookies.dontRememberToken.name, context.authCookies.dontRememberToken.options);
+					(0, cookies_exports.deleteCookie)(ctx, cookieName.name, cookieName.attributes);
 				}
-				return ctx$1.render({
+				return ctx.render({
 					success: True,
-					token: session$1.token,
+					token: session.token,
 					user: {
 						id: user.id,
 						email: user.email,
@@ -4233,7 +4651,7 @@ async function verifyTwoFactor(ctx, options) {
 		};
 	}
 	return {
-		valid: (ctx$1) => ctx$1.render({
+		valid: (ctx) => ctx.render({
 			success: True,
 			token: session.session.token,
 			user: {
@@ -4251,11 +4669,9 @@ async function verifyTwoFactor(ctx, options) {
 		key: `${session.user.id}!${session.session.id}`
 	};
 }
-
-//#endregion
-//#region src/plugins/two-factor/backup-codes/index.ts
+// src/plugins/two-factor/backup-codes/index.ts
 function generateBackupCodesFn(options) {
-	return Array.from({ length: options?.amount ?? 10 }).fill(null).map(() => generateRandomString(options?.length ?? 10, "a-z", "0-9", "A-Z")).map((code) => `${code.slice(0, 5)}-${code.slice(5)}`);
+	return Array.from({ length: options?.amount ?? 10 }).fill(null).map(() => generateRandomString$2(options?.length ?? 10, "a-z", "0-9", "A-Z")).map((code) => `${code.slice(0, 5)}-${code.slice(5)}`);
 }
 async function generateBackupCodes(secret, options) {
 	const backupCodes = options?.customBackupCodesGenerate ? options.customBackupCodesGenerate() : generateBackupCodesFn(options);
@@ -4287,11 +4703,17 @@ async function verifyBackupCode(data, key, options) {
 	};
 }
 async function getBackupCodes(backupCodes, key, options) {
-	if (options?.storeBackupCodes === "encrypted") return safeJSONParse(await (0, crypto_exports.symmetricDecrypt)({
-		key,
-		data: backupCodes
-	}));
-	if (typeof options?.storeBackupCodes === "object" && "decrypt" in options?.storeBackupCodes) return safeJSONParse(await options?.storeBackupCodes.decrypt(backupCodes));
+	if (options?.storeBackupCodes === "encrypted") {
+		const decrypted = await (0, crypto_exports.symmetricDecrypt)({
+			key,
+			data: backupCodes
+		});
+		return safeJSONParse(decrypted);
+	}
+	if (typeof options?.storeBackupCodes === "object" && "decrypt" in options?.storeBackupCodes) {
+		const decrypted = await options?.storeBackupCodes.decrypt(backupCodes);
+		return safeJSONParse(decrypted);
+	}
 	return safeJSONParse(backupCodes);
 }
 const backupCode2fa = (options) => {
@@ -4299,6 +4721,21 @@ const backupCode2fa = (options) => {
 	return {
 		id: "backup_code",
 		routes: {
+			/**
+			* ### Endpoint
+			*
+			* POST `/two-factor/verify-backup-code`
+			*
+			* ### API Methods
+			*
+			* **server:**
+			* `auth.api.verifyBackupCode`
+			*
+			* **client:**
+			* `authClient.twoFactor.verifyBackupCode`
+			*
+			* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/2fa#api-method-two-factor-verify-backup-code)
+			*/
 			verifyBackupCode: createEndpoint(createRoute$1({
 				operationId: "verifyBackupCode",
 				method: "post",
@@ -4311,20 +4748,20 @@ const backupCode2fa = (options) => {
 				const response = await verifyTwoFactor(ctx, authOptions);
 				if (response instanceof Response) return response;
 				const { session, valid } = response;
-				const twoFactor$1 = await context.adapter.findOne({
+				const twoFactor = await context.adapter.findOne({
 					model: twoFactorTable,
 					where: [{
 						field: "userId",
 						value: session.user.id
 					}]
 				});
-				if (!twoFactor$1) return ctx.render({
+				if (!twoFactor) return ctx.render({
 					success: False,
 					message: TWO_FACTOR_ERROR_CODES.BACKUP_CODES_NOT_ENABLED
 				}, 400);
 				const { code, disableSession } = ctx.req.valid("json");
 				const validate = await verifyBackupCode({
-					backupCodes: twoFactor$1.backupCodes,
+					backupCodes: twoFactor.backupCodes,
 					code
 				}, context.secret, options);
 				if (!validate.status) return ctx.render({
@@ -4350,6 +4787,21 @@ const backupCode2fa = (options) => {
 					user: session.user
 				}, 200);
 			}),
+			/**
+			* ### Endpoint
+			*
+			* POST `/two-factor/generate-backup-codes`
+			*
+			* ### API Methods
+			*
+			* **server:**
+			* `auth.api.generateBackupCodes`
+			*
+			* **client:**
+			* `authClient.twoFactor.generateBackupCodes`
+			*
+			* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/2fa#api-method-two-factor-generate-backup-codes)
+			*/
 			generateBackupCodes: createEndpoint(createRoute$1({
 				operationId: "generateBackupCodes",
 				method: "post",
@@ -4365,8 +4817,8 @@ const backupCode2fa = (options) => {
 					success: False,
 					message: TWO_FACTOR_ERROR_CODES.TWO_FACTOR_NOT_ENABLED
 				}, 400);
-				const res$1 = await context.password.checkPassword(user.id, ctx);
-				if (res$1 instanceof Response) return res$1;
+				const res = await context.password.checkPassword(user.id, ctx);
+				if (res instanceof Response) return res;
 				const backupCodes = await generateBackupCodes(context.secret, options);
 				await context.adapter.updateMany({
 					model: twoFactorTable,
@@ -4378,6 +4830,21 @@ const backupCode2fa = (options) => {
 				});
 				return ctx.render(backupCodes.backupCodes, 200);
 			}),
+			/**
+			* ### Endpoint
+			*
+			* GET `/two-factor/view-backup-codes`
+			*
+			* ### API Methods
+			*
+			* **server:**
+			* `auth.api.viewBackupCodes`
+			*
+			* **client:**
+			* `authClient.twoFactor.viewBackupCodes`
+			*
+			* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/2fa#api-method-two-factor-view-backup-codes)
+			*/
 			viewBackupCodes: createEndpoint(createRoute$1({
 				operationId: "viewBackupCodes",
 				method: "post",
@@ -4392,18 +4859,18 @@ const backupCode2fa = (options) => {
 					message: "Unauthorized"
 				}, 401);
 				const { userId } = ctx.req.valid("json");
-				const twoFactor$1 = await context.adapter.findOne({
+				const twoFactor = await context.adapter.findOne({
 					model: twoFactorTable,
 					where: [{
 						field: "userId",
 						value: userId
 					}]
 				});
-				if (!twoFactor$1) return ctx.render({
+				if (!twoFactor) return ctx.render({
 					success: False,
 					message: TWO_FACTOR_ERROR_CODES.BACKUP_CODES_NOT_ENABLED
 				}, 400);
-				const decryptedBackupCodes = await getBackupCodes(twoFactor$1.backupCodes, context.secret, options);
+				const decryptedBackupCodes = await getBackupCodes(twoFactor.backupCodes, context.secret, options);
 				if (!decryptedBackupCodes) return ctx.render({
 					success: False,
 					message: TWO_FACTOR_ERROR_CODES.BACKUP_CODES_NOT_ENABLED
@@ -4413,16 +4880,12 @@ const backupCode2fa = (options) => {
 		}
 	};
 };
-
-//#endregion
-//#region src/plugins/two-factor/utils.ts
+// src/plugins/two-factor/utils.ts
 const defaultKeyHasher = async (token) => {
 	const hash = await createHash("SHA-256").digest(new TextEncoder().encode(token));
 	return base64Url.encode(new Uint8Array(hash), { padding: false });
 };
-
-//#endregion
-//#region src/plugins/two-factor/otp/index.ts
+// src/plugins/two-factor/otp/index.ts
 /**
 * The otp adapter is created from the totp adapter.
 */
@@ -4456,6 +4919,21 @@ const otp2fa = (options) => {
 	return {
 		id: "otp",
 		routes: {
+			/**
+			* ### Endpoint
+			*
+			* POST `/two-factor/send-otp`
+			*
+			* ### API Methods
+			*
+			* **server:**
+			* `auth.api.send2FaOTP`
+			*
+			* **client:**
+			* `authClient.twoFactor.sendOtp`
+			*
+			* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/2fa#api-method-two-factor-send-otp)
+			*/
 			sendTwoFactorOTP: createEndpoint(createRoute$1({
 				operationId: "sendTwoFactorOTP",
 				method: "post",
@@ -4493,6 +4971,21 @@ const otp2fa = (options) => {
 				}, ctx.req);
 				return ctx.render({ success: True }, 200);
 			}),
+			/**
+			* ### Endpoint
+			*
+			* POST `/two-factor/verify-otp`
+			*
+			* ### API Methods
+			*
+			* **server:**
+			* `auth.api.verifyOTP`
+			*
+			* **client:**
+			* `authClient.twoFactor.verifyOtp`
+			*
+			* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/2fa#api-method-two-factor-verify-otp)
+			*/
 			verifyTwoFactorOTP: createEndpoint(createRoute$1({
 				operationId: "verifyTwoFactorOTP",
 				method: "post",
@@ -4560,9 +5053,7 @@ const otp2fa = (options) => {
 		}
 	};
 };
-
-//#endregion
-//#region src/plugins/two-factor/totp/index.ts
+// src/plugins/two-factor/totp/index.ts
 const totp2fa = (options) => {
 	const opts = {
 		...options,
@@ -4573,6 +5064,21 @@ const totp2fa = (options) => {
 	return {
 		id: "totp",
 		routes: {
+			/**
+			* ### Endpoint
+			*
+			* POST `/totp/generate`
+			*
+			* ### API Methods
+			*
+			* **server:**
+			* `auth.api.generateTOTP`
+			*
+			* **client:**
+			* `authClient.totp.generate`
+			*
+			* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/totp#api-method-totp-generate)
+			*/
 			generateTOTP: createEndpoint(createRoute$1({
 				operationId: "generateTOTP",
 				method: "post",
@@ -4596,6 +5102,21 @@ const totp2fa = (options) => {
 				}).totp();
 				return ctx.json(code, 200);
 			}),
+			/**
+			* ### Endpoint
+			*
+			* POST `/two-factor/get-totp-uri`
+			*
+			* ### API Methods
+			*
+			* **server:**
+			* `auth.api.getTOTPURI`
+			*
+			* **client:**
+			* `authClient.twoFactor.getTotpUri`
+			*
+			* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/two-factor#api-method-two-factor-get-totp-uri)
+			*/
 			getTOTPURI: createEndpoint(createRoute$1({
 				operationId: "getTOTPURI",
 				method: "post",
@@ -4615,23 +5136,23 @@ const totp2fa = (options) => {
 					}, 400);
 				}
 				const session = ctx.get("session");
-				const twoFactor$1 = await context.adapter.findOne({
+				const twoFactor = await context.adapter.findOne({
 					model: twoFactorTable,
 					where: [{
 						field: "userId",
 						value: session.user.id
 					}]
 				});
-				if (!twoFactor$1) return ctx.render({
+				if (!twoFactor) return ctx.render({
 					success: False,
 					message: TWO_FACTOR_ERROR_CODES.TOTP_NOT_ENABLED
 				}, 400);
 				const secret = await (0, crypto_exports.symmetricDecrypt)({
 					key: context.secret,
-					data: twoFactor$1.secret
+					data: twoFactor.secret
 				});
-				const res$1 = await context.password.checkPassword(session.user.id, ctx);
-				if (res$1 instanceof Response) return res$1;
+				const res = await context.password.checkPassword(session.user.id, ctx);
+				if (res instanceof Response) return res;
 				const totpURI = createOTP(secret, {
 					digits: opts.digits,
 					period: opts.period
@@ -4658,21 +5179,22 @@ const totp2fa = (options) => {
 				const result = await verifyTwoFactor(ctx, authOptions);
 				if (result instanceof Response) return result;
 				const { session, valid, invalid } = result;
-				const twoFactor$1 = await context.adapter.findOne({
+				const twoFactor = await context.adapter.findOne({
 					model: twoFactorTable,
 					where: [{
 						field: "userId",
 						value: session.user.id
 					}]
 				});
-				if (!twoFactor$1) return ctx.render({
+				if (!twoFactor) return ctx.render({
 					success: False,
 					message: TWO_FACTOR_ERROR_CODES.TOTP_NOT_ENABLED
 				}, 400);
-				if (!await createOTP(await (0, crypto_exports.symmetricDecrypt)({
+				const decrypted = await (0, crypto_exports.symmetricDecrypt)({
 					key: context.secret,
-					data: twoFactor$1.secret
-				}), {
+					data: twoFactor.secret
+				});
+				if (!await createOTP(decrypted, {
 					period: opts.period,
 					digits: opts.digits
 				}).verify(ctx.req.valid("json").code)) return await invalid("INVALID_CODE");
@@ -4698,9 +5220,7 @@ const totp2fa = (options) => {
 		}
 	};
 };
-
-//#endregion
-//#region src/plugins/two-factor/client.ts
+// src/plugins/two-factor/client.ts
 const twoFactorClient = (options) => {
 	return {
 		id: "two-factor",
@@ -4726,9 +5246,7 @@ const twoFactorClient = (options) => {
 		}]
 	};
 };
-
-//#endregion
-//#region src/plugins/two-factor/index.ts
+// src/plugins/two-factor/index.ts
 const twoFactor = (options) => {
 	const opts = { twoFactorTable: "twoFactor" };
 	const backupCodeOptions = {
@@ -4744,6 +5262,21 @@ const twoFactor = (options) => {
 			...totp.routes,
 			...otp.routes,
 			...backupCode.routes,
+			/**
+			* ### Endpoint
+			*
+			* POST `/two-factor/enable`
+			*
+			* ### API Methods
+			*
+			* **server:**
+			* `auth.api.enableTwoFactor`
+			*
+			* **client:**
+			* `authClient.twoFactor.enable`
+			*
+			* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/2fa#api-method-two-factor-enable)
+			*/
 			enableTwoFactor: createEndpoint(createRoute$1({
 				operationId: "enableTwoFactor",
 				method: "post",
@@ -4765,7 +5298,7 @@ const twoFactor = (options) => {
 					success: False,
 					message: BASE_ERROR_CODES.INVALID_PASSWORD
 				}, 400);
-				const secret = generateRandomString(32);
+				const secret = generateRandomString$2(32);
 				const encryptedSecret = await (0, crypto_exports.symmetricEncrypt)({
 					key: context.secret,
 					data: secret
@@ -4777,11 +5310,12 @@ const twoFactor = (options) => {
 						success: False,
 						message: BASE_ERROR_CODES.FAILED_TO_UPDATE_USER
 					}, 500);
+					const newSession = await context.internalAdapter.createSession(updatedUser.id, false, session.session);
 					/**
 					* Update the session cookie with the new user data
 					*/
 					await setSessionCookie(ctx, authOptions, {
-						session: await context.internalAdapter.createSession(updatedUser.id, false, session.session),
+						session: newSession,
 						user: updatedUser
 					});
 					await context.internalAdapter.deleteSession(session.session.token);
@@ -4810,6 +5344,21 @@ const twoFactor = (options) => {
 					backupCodes: backupCodes.backupCodes
 				}, 200);
 			}),
+			/**
+			* ### Endpoint
+			*
+			* POST `/two-factor/disable`
+			*
+			* ### API Methods
+			*
+			* **server:**
+			* `auth.api.disableTwoFactor`
+			*
+			* **client:**
+			* `authClient.twoFactor.disable`
+			*
+			* @see [Read our docs to learn more.](https://faire-auth.com/docs/plugins/2fa#api-method-two-factor-disable)
+			*/
 			disableTwoFactor: createEndpoint(createRoute$1({
 				operationId: "disableTwoFactor",
 				method: "post",
@@ -4843,11 +5392,12 @@ const twoFactor = (options) => {
 						value: updatedUser.id
 					}]
 				});
+				const newSession = await context.internalAdapter.createSession(updatedUser.id, false, session.session);
 				/**
 				* Update the session cookie with the new user data
 				*/
 				await setSessionCookie(ctx, authOptions, {
-					session: await context.internalAdapter.createSession(updatedUser.id, false, session.session),
+					session: newSession,
 					user: updatedUser
 				});
 				await context.internalAdapter.deleteSession(session.session.token);
@@ -4880,7 +5430,7 @@ const twoFactor = (options) => {
 				await context.internalAdapter.deleteSession(data.session.token);
 				const maxAge = (options?.otpOptions?.period ?? 3) * 60;
 				const twoFactorCookie = context.createAuthCookie(TWO_FACTOR_COOKIE_NAME, { maxAge });
-				const identifier = `2fa-${generateRandomString(20)}`;
+				const identifier = `2fa-${generateRandomString$2(20)}`;
 				await context.internalAdapter.createVerificationValue({
 					value: data.user.id,
 					identifier,
@@ -4899,9 +5449,7 @@ const twoFactor = (options) => {
 		$ERROR_CODES: TWO_FACTOR_ERROR_CODES
 	};
 };
-
-//#endregion
-//#region src/plugins/username/error-codes.ts
+// src/plugins/username/error-codes.ts
 const USERNAME_ERROR_CODES = {
 	INVALID_USERNAME_OR_PASSWORD: "Invalid username or password",
 	EMAIL_NOT_VERIFIED: "Email not verified",
@@ -4912,9 +5460,7 @@ const USERNAME_ERROR_CODES = {
 	INVALID_USERNAME: "Username is invalid",
 	INVALID_DISPLAY_USERNAME: "Display username is invalid"
 };
-
-//#endregion
-//#region src/plugins/username/schema.ts
+// src/plugins/username/schema.ts
 const getSchema = (normalizer) => {
 	return { user: { fields: {
 		username: {
@@ -4936,17 +5482,15 @@ const getSchema = (normalizer) => {
 		}
 	} } };
 };
-
-//#endregion
-//#region src/plugins/username/index.ts
-function defaultUsernameValidator(username$1) {
-	return /^[a-zA-Z0-9_.]+$/.test(username$1);
+// src/plugins/username/index.ts
+function defaultUsernameValidator(username) {
+	return /^[a-zA-Z0-9_.]+$/.test(username);
 }
 const username = (options) => {
-	const normalizer = (username$1) => {
-		if (options?.usernameNormalization === false) return username$1;
-		if (options?.usernameNormalization) return options.usernameNormalization(username$1);
-		return username$1.toLowerCase();
+	const normalizer = (username) => {
+		if (options?.usernameNormalization === false) return username;
+		if (options?.usernameNormalization) return options.usernameNormalization(username);
+		return username.toLowerCase();
 	};
 	const displayUsernameNormalizer = (displayUsername) => {
 		return options?.displayUsernameNormalization ? options.displayUsernameNormalization(displayUsername) : displayUsername;
@@ -4958,19 +5502,19 @@ const username = (options) => {
 			return;
 		}
 		const session = ctx.get("session");
-		const username$1 = typeof input.data.username === "string" && options?.validationOrder?.username === "post-normalization" ? normalizer(input.data.username) : input.data.username;
-		if (username$1 !== void 0 && typeof username$1 === "string") {
+		const username = typeof input.data.username === "string" && options?.validationOrder?.username === "post-normalization" ? normalizer(input.data.username) : input.data.username;
+		if (username !== void 0 && typeof username === "string") {
 			const minUsernameLength = options?.minUsernameLength || 3;
 			const maxUsernameLength = options?.maxUsernameLength || 30;
-			if (username$1.length < minUsernameLength) return ctx.render({
+			if (username.length < minUsernameLength) return ctx.render({
 				success: False,
 				message: USERNAME_ERROR_CODES.USERNAME_TOO_SHORT
 			}, 400);
-			if (username$1.length > maxUsernameLength) return ctx.render({
+			if (username.length > maxUsernameLength) return ctx.render({
 				success: False,
 				message: USERNAME_ERROR_CODES.USERNAME_TOO_LONG
 			}, 400);
-			if (!await (options?.usernameValidator ?? defaultUsernameValidator)(username$1)) return ctx.render({
+			if (!await (options?.usernameValidator ?? defaultUsernameValidator)(username)) return ctx.render({
 				success: False,
 				message: USERNAME_ERROR_CODES.INVALID_USERNAME
 			}, 400);
@@ -4978,7 +5522,7 @@ const username = (options) => {
 				model: "user",
 				where: [{
 					field: "username",
-					value: username$1
+					value: username
 				}]
 			});
 			const blockChangeSignUp = ctx.get("path") === "/sign-up/email" && user;
@@ -5005,20 +5549,20 @@ const username = (options) => {
 		init: (_ctx) => {
 			return { options: { databaseHooks: { user: {
 				create: { async before(user, _context) {
-					const username$1 = "username" in user ? user["username"] : null;
+					const username = "username" in user ? user["username"] : null;
 					const displayUsername = "displayUsername" in user ? user["displayUsername"] : null;
 					return { data: {
 						...user,
-						...username$1 ? { username: normalizer(username$1) } : {},
+						...username ? { username: normalizer(username) } : {},
 						...displayUsername ? { displayUsername: displayUsernameNormalizer(displayUsername) } : {}
 					} };
 				} },
 				update: { async before(user, _context) {
-					const username$1 = "username" in user ? user["username"] : null;
+					const username = "username" in user ? user["username"] : null;
 					const displayUsername = "displayUsername" in user ? user["displayUsername"] : null;
 					return { data: {
 						...user,
-						...username$1 ? { username: normalizer(username$1) } : {},
+						...username ? { username: normalizer(username) } : {},
 						...displayUsername ? { displayUsername: displayUsernameNormalizer(displayUsername) } : {}
 					} };
 				} }
@@ -5031,41 +5575,41 @@ const username = (options) => {
 				path: "/sign-in/username",
 				summary: "Sign in with username",
 				description: "Sign in with username",
-				request: req().bdy(z$1.object({
-					username: z$1.string().openapi({ description: "The username of the user" }),
-					password: z$1.string().openapi({ description: "The password of the user" }),
-					rememberMe: z$1.boolean().openapi({ description: "Remember the user session" }).optional(),
-					callbackURL: z$1.string().openapi({ description: "The URL to redirect to after email verification" }).optional()
+				request: req().bdy(z.object({
+					username: z.string().openapi({ description: "The username of the user" }),
+					password: z.string().openapi({ description: "The password of the user" }),
+					rememberMe: z.boolean().openapi({ description: "Remember the user session" }).optional(),
+					callbackURL: z.string().openapi({ description: "The URL to redirect to after email verification" }).optional()
 				})).bld(),
 				responses: res(SCHEMAS[Definitions.TOKEN_USER].default).err(400, "Invalid username").err(401, "Invalid email or password").err(403, "Email not verified").err(500, "Failed to create session").bld()
 			}), (authOptions) => async (ctx) => {
 				const context = ctx.get("context");
-				let { username: username$1, password, rememberMe, callbackURL } = ctx.req.valid("json");
-				if (!username$1 || !password) {
+				let { username, password, rememberMe, callbackURL } = ctx.req.valid("json");
+				if (!username || !password) {
 					context.logger.error("Username or password not found");
 					return ctx.render({
 						success: False,
 						message: USERNAME_ERROR_CODES.INVALID_USERNAME_OR_PASSWORD
 					}, 401);
 				}
-				username$1 = options?.validationOrder?.username === "pre-normalization" ? normalizer(username$1) : username$1;
+				username = options?.validationOrder?.username === "pre-normalization" ? normalizer(username) : username;
 				const minUsernameLength = options?.minUsernameLength ?? 3;
 				const maxUsernameLength = options?.maxUsernameLength ?? 30;
-				if (username$1.length < minUsernameLength) {
-					context.logger.error("Username too short", { username: username$1 });
+				if (username.length < minUsernameLength) {
+					context.logger.error("Username too short", { username });
 					return ctx.render({
 						success: False,
 						message: USERNAME_ERROR_CODES.USERNAME_TOO_SHORT
 					}, 400);
 				}
-				if (username$1.length > maxUsernameLength) {
-					context.logger.error("Username too long", { username: username$1 });
+				if (username.length > maxUsernameLength) {
+					context.logger.error("Username too long", { username });
 					return ctx.render({
 						success: False,
 						message: USERNAME_ERROR_CODES.USERNAME_TOO_LONG
 					}, 400);
 				}
-				if (!(options?.usernameValidator ?? defaultUsernameValidator)(username$1)) return ctx.render({
+				if (!(options?.usernameValidator ?? defaultUsernameValidator)(username)) return ctx.render({
 					success: False,
 					message: USERNAME_ERROR_CODES.INVALID_USERNAME
 				}, 400);
@@ -5073,12 +5617,12 @@ const username = (options) => {
 					model: "user",
 					where: [{
 						field: "username",
-						value: normalizer(username$1)
+						value: normalizer(username)
 					}]
 				});
 				if (!user) {
 					await context.password.hash(password);
-					context.logger.error("User not found", { username: username$1 });
+					context.logger.error("User not found", { username });
 					return ctx.render({
 						success: False,
 						message: USERNAME_ERROR_CODES.INVALID_USERNAME_OR_PASSWORD
@@ -5100,7 +5644,7 @@ const username = (options) => {
 				}, 401);
 				const currentPassword = account?.password;
 				if (!currentPassword) {
-					context.logger.error("Password not found", { username: username$1 });
+					context.logger.error("Password not found", { username });
 					return ctx.render({
 						success: False,
 						message: USERNAME_ERROR_CODES.INVALID_USERNAME_OR_PASSWORD
@@ -5164,22 +5708,22 @@ const username = (options) => {
 				operationId: "isUsernameAvailable",
 				method: "post",
 				path: "/is-username-available",
-				request: req().bdy(z$1.object({ username: z$1.string().openapi({ description: "The username to check" }) })).bld(),
-				responses: res(z$1.object({ available: z$1.boolean() }), "Whether or not the username is available").err(400, "Invalid username").bld()
+				request: req().bdy(z.object({ username: z.string().openapi({ description: "The username to check" }) })).bld(),
+				responses: res(z.object({ available: z.boolean() }), "Whether or not the username is available").err(400, "Invalid username").bld()
 			}), (_authOptions) => async (ctx) => {
 				const context = ctx.get("context");
-				const { username: username$1 } = ctx.req.valid("json");
+				const { username } = ctx.req.valid("json");
 				const minUsernameLength = options?.minUsernameLength || 3;
 				const maxUsernameLength = options?.maxUsernameLength || 30;
-				if (username$1.length < minUsernameLength) return ctx.render({
+				if (username.length < minUsernameLength) return ctx.render({
 					success: False,
 					message: USERNAME_ERROR_CODES.USERNAME_TOO_SHORT
 				}, 400);
-				if (username$1.length > maxUsernameLength) return ctx.render({
+				if (username.length > maxUsernameLength) return ctx.render({
 					success: False,
 					message: USERNAME_ERROR_CODES.USERNAME_TOO_LONG
 				}, 400);
-				if (!await (options?.usernameValidator || defaultUsernameValidator)(username$1)) return ctx.render({
+				if (!await (options?.usernameValidator || defaultUsernameValidator)(username)) return ctx.render({
 					success: False,
 					message: USERNAME_ERROR_CODES.INVALID_USERNAME
 				}, 400);
@@ -5187,7 +5731,7 @@ const username = (options) => {
 					model: "user",
 					where: [{
 						field: "username",
-						value: normalizer(username$1)
+						value: normalizer(username)
 					}]
 				})) return ctx.render({ available: false }, 200);
 				return ctx.render({ available: true }, 200);
@@ -5204,6 +5748,4 @@ const username = (options) => {
 		$ERROR_CODES: USERNAME_ERROR_CODES
 	};
 };
-
-//#endregion
-export { TWO_FACTOR_ERROR_CODES, USERNAME_ERROR_CODES, bearer, createAccessControl, createEndpoint, createHook, createMiddleware, createRoute, magicLink, oAuthProxy, organization, parseRoles, passkey, role, twoFactor, twoFactorClient, username };
+export { TWO_FACTOR_ERROR_CODES, USERNAME_ERROR_CODES, bearer, createAccessControl, createEndpoint, createHook, createMiddleware, createRoute, magicLink, oAuthProxy, organization, parseRoles, passkey, role, twoFactor, twoFactorClient, username };