@better-auth/api-key 1.5.5 → 1.5.7-beta.1

package/dist/index.d.mts

@@ -1,3 +1,3 @@
-import { n as ApiKeyConfigurationOptions, r as ApiKeyOptions, t as ApiKey } from "./types-CCe5L05Y.mjs";
-import { i as API_KEY_ERROR_CODES, n as apiKey, r as defaultKeyHasher, t as API_KEY_TABLE_NAME } from "./index-CP8iCAEj.mjs";
+import { n as ApiKeyConfigurationOptions, r as ApiKeyOptions, t as ApiKey } from "./types-BR70O3Q3.mjs";
+import { i as API_KEY_ERROR_CODES, n as apiKey, r as defaultKeyHasher, t as API_KEY_TABLE_NAME } from "./index-WXH3i1Uh.mjs";
 export { API_KEY_ERROR_CODES, API_KEY_TABLE_NAME, ApiKey, ApiKeyConfigurationOptions, ApiKeyOptions, apiKey, defaultKeyHasher };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as API_KEY_ERROR_CODES } from "./error-codes-vwTWW2ez.mjs";
+import { t as API_KEY_ERROR_CODES } from "./error-codes-C8MQDPqn.mjs";
 import { createAuthEndpoint, createAuthMiddleware } from "@better-auth/core/api";
 import { base64Url } from "@better-auth/utils/base64";
 import { createHash } from "@better-auth/utils/hash";
@@ -9,13 +9,11 @@ import { mergeSchema } from "better-auth/db";
 import { APIError as APIError$1 } from "@better-auth/core/error";
 import { generateId } from "@better-auth/core/utils/id";
 import { safeJSONParse } from "@better-auth/core/utils/json";
-import * as z$1 from "zod";
+import * as z from "zod";
 import { isDevelopment, isTest } from "@better-auth/core/env";
 import { isValidIP, normalizeIP } from "@better-auth/core/utils/ip";
-import * as z from "zod/v4";
 import { role } from "better-auth/plugins/access";
 import { parseJSON } from "better-auth/client";
-
 //#region src/adapter.ts
 /**
 * Parses double-stringified metadata synchronously without updating the database.
@@ -478,7 +476,6 @@ async function listApiKeys$1(ctx, referenceId, opts, paginationOpts) {
 		total
 	};
 }
-
 //#endregion
 //#region src/org-authorization.ts
 /**
@@ -486,8 +483,9 @@ async function listApiKeys$1(ctx, referenceId, opts, paginationOpts) {
 * Returns null if the organization plugin is not installed.
 */
 function getOrgOptions(ctx) {
-	if (ctx.context.orgOptions) return ctx.context.orgOptions;
-	const orgPlugin = ctx.context.getPlugin?.("organization");
+	const context = ctx.context;
+	if ("orgOptions" in context && context.orgOptions) return context.orgOptions;
+	const orgPlugin = context.getPlugin?.("organization");
 	if (orgPlugin && "options" in orgPlugin) return orgPlugin.options;
 	return null;
 }
@@ -549,7 +547,6 @@ async function checkPermission(ctx, role, organizationId, action, orgOptions) {
 		return false;
 	}
 }
-
 //#endregion
 //#region src/utils.ts
 const getDate = (span, unit = "ms") => {
@@ -573,24 +570,23 @@ function getIp(req, options) {
 	if (isTest() || isDevelopment()) return LOCALHOST_IP;
 	return null;
 }
-
 //#endregion
 //#region src/routes/create-api-key.ts
-const createApiKeyBodySchema = z$1.object({
-	configId: z$1.string().meta({ description: "The configuration ID to use for the API key. If not provided, the default configuration will be used." }).optional(),
-	name: z$1.string().meta({ description: "Name of the Api Key" }).optional(),
-	expiresIn: z$1.number().meta({ description: "Expiration time of the Api Key in seconds" }).min(1).optional().nullable().default(null),
-	prefix: z$1.string().meta({ description: "Prefix of the Api Key" }).regex(/^[a-zA-Z0-9_-]+$/, { message: "Invalid prefix format, must be alphanumeric and contain only underscores and hyphens." }).optional(),
-	remaining: z$1.number().meta({ description: "Remaining number of requests. Server side only" }).min(0).optional().nullable().default(null),
-	metadata: z$1.any().optional(),
-	refillAmount: z$1.number().meta({ description: "Amount to refill the remaining count of the Api Key. server-only. Eg: 100" }).min(1).optional(),
-	refillInterval: z$1.number().meta({ description: "Interval to refill the Api Key in milliseconds. server-only. Eg: 1000" }).optional(),
-	rateLimitTimeWindow: z$1.number().meta({ description: "The duration in milliseconds where each request is counted. Once the `maxRequests` is reached, the request will be rejected until the `timeWindow` has passed, at which point the `timeWindow` will be reset. server-only. Eg: 1000" }).optional(),
-	rateLimitMax: z$1.number().meta({ description: "Maximum amount of requests allowed within a window. Once the `maxRequests` is reached, the request will be rejected until the `timeWindow` has passed, at which point the `timeWindow` will be reset. server-only. Eg: 100" }).optional(),
-	rateLimitEnabled: z$1.boolean().meta({ description: "Whether the key has rate limiting enabled. server-only. Eg: true" }).optional(),
-	permissions: z$1.record(z$1.string(), z$1.array(z$1.string())).meta({ description: "Permissions of the Api Key." }).optional(),
-	userId: z$1.coerce.string().meta({ description: "User Id of the user that the Api Key belongs to. server-only. Eg: \"user-id\"" }).optional(),
-	organizationId: z$1.coerce.string().meta({ description: "Organization Id of the organization that the Api Key belongs to. Eg: 'org-id'" }).optional()
+const createApiKeyBodySchema = z.object({
+	configId: z.string().meta({ description: "The configuration ID to use for the API key. If not provided, the default configuration will be used." }).optional(),
+	name: z.string().meta({ description: "Name of the Api Key" }).optional(),
+	expiresIn: z.number().meta({ description: "Expiration time of the Api Key in seconds" }).min(1).optional().nullable().default(null),
+	prefix: z.string().meta({ description: "Prefix of the Api Key" }).regex(/^[a-zA-Z0-9_-]+$/, { message: "Invalid prefix format, must be alphanumeric and contain only underscores and hyphens." }).optional(),
+	remaining: z.number().meta({ description: "Remaining number of requests. Server side only" }).min(0).optional().nullable().default(null),
+	metadata: z.any().optional(),
+	refillAmount: z.number().meta({ description: "Amount to refill the remaining count of the Api Key. server-only. Eg: 100" }).min(1).optional(),
+	refillInterval: z.number().meta({ description: "Interval to refill the Api Key in milliseconds. server-only. Eg: 1000" }).optional(),
+	rateLimitTimeWindow: z.number().meta({ description: "The duration in milliseconds where each request is counted. Once the `maxRequests` is reached, the request will be rejected until the `timeWindow` has passed, at which point the `timeWindow` will be reset. server-only. Eg: 1000" }).optional(),
+	rateLimitMax: z.number().meta({ description: "Maximum amount of requests allowed within a window. Once the `maxRequests` is reached, the request will be rejected until the `timeWindow` has passed, at which point the `timeWindow` will be reset. server-only. Eg: 100" }).optional(),
+	rateLimitEnabled: z.boolean().meta({ description: "Whether the key has rate limiting enabled. server-only. Eg: true" }).optional(),
+	permissions: z.record(z.string(), z.array(z.string())).meta({ description: "Permissions of the Api Key." }).optional(),
+	userId: z.coerce.string().meta({ description: "User Id of the user that the Api Key belongs to. server-only. Eg: \"user-id\"" }).optional(),
+	organizationId: z.coerce.string().meta({ description: "Organization Id of the organization that the Api Key belongs to. Eg: 'org-id'" }).optional()
 });
 function createApiKey({ defaultKeyGenerator, configurations, schema, deleteAllExpiredApiKeys }) {
 	return createAuthEndpoint("/api-key/create", {
@@ -839,7 +835,7 @@ function createApiKey({ defaultKeyGenerator, configurations, schema, deleteAllEx
 			});
 			await setApiKey(ctx, apiKey, opts);
 		} else if (opts.storage === "secondary-storage") {
-			const id = ctx.context.generateId({ model: API_KEY_TABLE_NAME }) || generateId();
+			const id = ctx.context.generateId({ model: "apikey" }) || generateId();
 			apiKey = {
 				...data,
 				id
@@ -857,7 +853,6 @@ function createApiKey({ defaultKeyGenerator, configurations, schema, deleteAllEx
 		});
 	});
 }
-
 //#endregion
 //#region src/routes/delete-all-expired-api-keys.ts
 function deleteAllExpiredApiKeysEndpoint({ deleteAllExpiredApiKeys }) {
@@ -877,12 +872,11 @@ function deleteAllExpiredApiKeysEndpoint({ deleteAllExpiredApiKeys }) {
 		});
 	});
 }
-
 //#endregion
 //#region src/routes/delete-api-key.ts
-const deleteApiKeyBodySchema = z$1.object({
-	configId: z$1.string().meta({ description: "The configuration ID to use for the API key lookup. If not provided, the default configuration will be used." }).optional(),
-	keyId: z$1.string().meta({ description: "The id of the Api Key" })
+const deleteApiKeyBodySchema = z.object({
+	configId: z.string().meta({ description: "The configuration ID to use for the API key lookup. If not provided, the default configuration will be used." }).optional(),
+	keyId: z.string().meta({ description: "The id of the Api Key" })
 });
 function deleteApiKey({ configurations, schema, deleteAllExpiredApiKeys }) {
 	return createAuthEndpoint("/api-key/delete", {
@@ -948,12 +942,11 @@ function deleteApiKey({ configurations, schema, deleteAllExpiredApiKeys }) {
 		return ctx.json({ success: true });
 	});
 }
-
 //#endregion
 //#region src/routes/get-api-key.ts
-const getApiKeyQuerySchema = z$1.object({
-	configId: z$1.string().meta({ description: "The configuration ID to use for the API key lookup. If not provided, the default configuration will be used." }).optional(),
-	id: z$1.string().meta({ description: "The id of the Api Key" })
+const getApiKeyQuerySchema = z.object({
+	configId: z.string().meta({ description: "The configuration ID to use for the API key lookup. If not provided, the default configuration will be used." }).optional(),
+	id: z.string().meta({ description: "The id of the Api Key" })
 });
 function getApiKey({ configurations, schema, deleteAllExpiredApiKeys }) {
 	return createAuthEndpoint("/api-key/get", {
@@ -1101,7 +1094,6 @@ function getApiKey({ configurations, schema, deleteAllExpiredApiKeys }) {
 		});
 	});
 }
-
 //#endregion
 //#region src/routes/list-api-keys.ts
 /**
@@ -1337,24 +1329,23 @@ function listApiKeys({ configurations, schema, deleteAllExpiredApiKeys }) {
 		});
 	});
 }
-
 //#endregion
 //#region src/routes/update-api-key.ts
-const updateApiKeyBodySchema = z$1.object({
-	configId: z$1.string().meta({ description: "The configuration ID to use for the API key lookup. If not provided, the default configuration will be used." }).optional(),
-	keyId: z$1.string().meta({ description: "The id of the Api Key" }),
-	userId: z$1.coerce.string().meta({ description: "The id of the user which the api key belongs to. server-only. Eg: \"some-user-id\"" }).optional(),
-	name: z$1.string().meta({ description: "The name of the key" }).optional(),
-	enabled: z$1.boolean().meta({ description: "Whether the Api Key is enabled or not" }).optional(),
-	remaining: z$1.number().meta({ description: "The number of remaining requests" }).min(1).optional(),
-	refillAmount: z$1.number().meta({ description: "The refill amount" }).optional(),
-	refillInterval: z$1.number().meta({ description: "The refill interval" }).optional(),
-	metadata: z$1.any().optional(),
-	expiresIn: z$1.number().meta({ description: "Expiration time of the Api Key in seconds" }).min(1).optional().nullable(),
-	rateLimitEnabled: z$1.boolean().meta({ description: "Whether the key has rate limiting enabled." }).optional(),
-	rateLimitTimeWindow: z$1.number().meta({ description: "The duration in milliseconds where each request is counted. server-only. Eg: 1000" }).optional(),
-	rateLimitMax: z$1.number().meta({ description: "Maximum amount of requests allowed within a window. Once the `maxRequests` is reached, the request will be rejected until the `timeWindow` has passed, at which point the `timeWindow` will be reset. server-only. Eg: 100" }).optional(),
-	permissions: z$1.record(z$1.string(), z$1.array(z$1.string())).meta({ description: "Update the permissions on the API Key. server-only." }).optional().nullable()
+const updateApiKeyBodySchema = z.object({
+	configId: z.string().meta({ description: "The configuration ID to use for the API key lookup. If not provided, the default configuration will be used." }).optional(),
+	keyId: z.string().meta({ description: "The id of the Api Key" }),
+	userId: z.coerce.string().meta({ description: "The id of the user which the api key belongs to. server-only. Eg: \"some-user-id\"" }).optional(),
+	name: z.string().meta({ description: "The name of the key" }).optional(),
+	enabled: z.boolean().meta({ description: "Whether the Api Key is enabled or not" }).optional(),
+	remaining: z.number().meta({ description: "The number of remaining requests" }).min(1).optional(),
+	refillAmount: z.number().meta({ description: "The refill amount" }).optional(),
+	refillInterval: z.number().meta({ description: "The refill interval" }).optional(),
+	metadata: z.any().optional(),
+	expiresIn: z.number().meta({ description: "Expiration time of the Api Key in seconds" }).min(1).optional().nullable(),
+	rateLimitEnabled: z.boolean().meta({ description: "Whether the key has rate limiting enabled." }).optional(),
+	rateLimitTimeWindow: z.number().meta({ description: "The duration in milliseconds where each request is counted. server-only. Eg: 1000" }).optional(),
+	rateLimitMax: z.number().meta({ description: "Maximum amount of requests allowed within a window. Once the `maxRequests` is reached, the request will be rejected until the `timeWindow` has passed, at which point the `timeWindow` will be reset. server-only. Eg: 100" }).optional(),
+	permissions: z.record(z.string(), z.array(z.string())).meta({ description: "Update the permissions on the API Key. server-only." }).optional().nullable()
 });
 function updateApiKey({ configurations, schema, deleteAllExpiredApiKeys }) {
 	return createAuthEndpoint("/api-key/update", {
@@ -1577,7 +1568,6 @@ function updateApiKey({ configurations, schema, deleteAllExpiredApiKeys }) {
 		});
 	});
 }
-
 //#endregion
 //#region src/rate-limit.ts
 /**
@@ -1646,7 +1636,6 @@ function isRateLimited(apiKey, opts) {
 		}
 	};
 }
-
 //#endregion
 //#region src/routes/verify-api-key.ts
 async function validateApiKey({ hashedKey, ctx, opts, schema, permissions }) {
@@ -1783,10 +1772,10 @@ async function validateApiKey({ hashedKey, ctx, opts, schema, permissions }) {
 	}
 	return newApiKey;
 }
-const verifyApiKeyBodySchema = z$1.object({
-	configId: z$1.string().meta({ description: "The configuration ID to use for verification. If not provided, the default configuration will be used." }).optional(),
-	key: z$1.string().meta({ description: "The key to verify" }),
-	permissions: z$1.record(z$1.string(), z$1.array(z$1.string())).meta({ description: "The permissions to verify." }).optional()
+const verifyApiKeyBodySchema = z.object({
+	configId: z.string().meta({ description: "The configuration ID to use for verification. If not provided, the default configuration will be used." }).optional(),
+	key: z.string().meta({ description: "The key to verify" }),
+	permissions: z.record(z.string(), z.array(z.string())).meta({ description: "The permissions to verify." }).optional()
 });
 function verifyApiKey({ configurations, schema, deleteAllExpiredApiKeys }) {
 	return createAuthEndpoint({
@@ -1859,7 +1848,6 @@ function verifyApiKey({ configurations, schema, deleteAllExpiredApiKeys }) {
 		});
 	});
 }
-
 //#endregion
 //#region src/routes/index.ts
 function resolveConfiguration(authContext, configurations, configId) {
@@ -1951,7 +1939,6 @@ function createApiKeyRoutes({ defaultKeyGenerator, configurations, schema }) {
 		deleteAllExpiredApiKeys: deleteAllExpiredApiKeysEndpoint({ deleteAllExpiredApiKeys })
 	};
 }
-
 //#endregion
 //#region src/schema.ts
 const apiKeySchema = ({ defaultRateLimitMax, defaultTimeWindow }) => ({ apikey: { fields: {
@@ -2079,7 +2066,6 @@ const apiKeySchema = ({ defaultRateLimitMax, defaultTimeWindow }) => ({ apikey:
 		}
 	}
 } } });
-
 //#endregion
 //#region src/index.ts
 const defaultKeyHasher = async (key) => {
@@ -2222,11 +2208,10 @@ function apiKey(_configurations, _options) {
 			listApiKeys: routes.listApiKeys,
 			deleteAllExpiredApiKeys: routes.deleteAllExpiredApiKeys
 		},
-		schema,
-		configurations
+		schema
 	};
 }
-
 //#endregion
 export { API_KEY_ERROR_CODES, API_KEY_TABLE_NAME, apiKey, defaultKeyHasher };
+
 //# sourceMappingURL=index.mjs.map