@better-auth/api-key 1.7.0-beta.4 → 1.7.0-beta.5

package/dist/client.d.mts

@@ -1,5 +1,5 @@
 import { n as ApiKeyConfigurationOptions, r as ApiKeyOptions, t as ApiKey } from "./types-BR70O3Q3.mjs";
-import { i as API_KEY_ERROR_CODES, n as apiKey } from "./index-CI6mGUwK.mjs";
+import { i as API_KEY_ERROR_CODES, n as apiKey } from "./index-BWgvCest.mjs";
 import * as better_auth0 from "better-auth";
 
 //#region src/client.d.ts

package/dist/client.mjs

@@ -1,4 +1,4 @@
-import { n as API_KEY_ERROR_CODES, t as PACKAGE_VERSION } from "./version-L3icplj1.mjs";
+import { n as API_KEY_ERROR_CODES, t as PACKAGE_VERSION } from "./version-DsrnkkeB.mjs";
 //#region src/client.ts
 const apiKeyClient = () => {
 	return {

package/dist/{index-CI6mGUwK.d.mts → index-BWgvCest.d.mts}

@@ -187,7 +187,7 @@ declare function apiKey(_configurations?: (ApiKeyConfigurationOptions & ApiKeyOp
               image?: string | null | undefined;
             } & Record<string, any>;
           } | null) => void;
-          socialProviders: better_auth0.OAuthProvider[];
+          socialProviders: better_auth0.UpstreamProvider[];
           authCookies: better_auth0.BetterAuthCookies;
           logger: ReturnType<typeof better_auth0.createLogger>;
           rateLimit: {

package/dist/index.d.mts

@@ -1,3 +1,3 @@
 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-CI6mGUwK.mjs";
+import { i as API_KEY_ERROR_CODES, n as apiKey, r as defaultKeyHasher, t as API_KEY_TABLE_NAME } from "./index-BWgvCest.mjs";
 export { API_KEY_ERROR_CODES, API_KEY_TABLE_NAME, ApiKey, ApiKeyConfigurationOptions, ApiKeyOptions, apiKey, defaultKeyHasher };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { n as API_KEY_ERROR_CODES, t as PACKAGE_VERSION } from "./version-L3icplj1.mjs";
+import { n as API_KEY_ERROR_CODES, t as PACKAGE_VERSION } from "./version-DsrnkkeB.mjs";
 import { createAuthEndpoint, createAuthMiddleware } from "@better-auth/core/api";
 import { base64Url } from "@better-auth/utils/base64";
 import { createHash } from "@better-auth/utils/hash";
@@ -720,7 +720,7 @@ function createApiKey({ defaultKeyGenerator, configurations, schema, deleteAllEx
 		const { configId, name, expiresIn, prefix, remaining, metadata, refillAmount, refillInterval, permissions, rateLimitMax, rateLimitTimeWindow, rateLimitEnabled } = ctx.body;
 		const opts = resolveConfiguration(ctx.context, configurations, configId);
 		const keyGenerator = opts.customKeyGenerator || defaultKeyGenerator;
-		const session = await getSessionFromCtx(ctx);
+		const session = await getSessionFromCtx(ctx, { disableCookieCache: true });
 		const isClientRequest = ctx.request || ctx.headers;
 		if (isClientRequest && (refillAmount !== void 0 || refillInterval !== void 0 || rateLimitMax !== void 0 || rateLimitTimeWindow !== void 0 || rateLimitEnabled !== void 0 || permissions !== void 0 || remaining !== null)) throw APIError$1.from("BAD_REQUEST", API_KEY_ERROR_CODES.SERVER_ONLY_PROPERTY);
 		if (ctx.request && ctx.body.userId !== void 0) throw APIError$1.from("UNAUTHORIZED", API_KEY_ERROR_CODES.UNAUTHORIZED_SESSION);
@@ -1633,7 +1633,8 @@ function isRateLimited(apiKey, opts) {
 //#endregion
 //#region src/routes/verify-api-key.ts
 async function validateApiKey({ key, ctx, lookupOpts, configurations, schema, permissions, expectedConfigId, runCustomValidator }) {
-	const apiKey = await getApiKey$1(ctx, lookupOpts.disableKeyHashing ? key : await defaultKeyHasher(key), lookupOpts);
+	const hashedKey = lookupOpts.disableKeyHashing ? key : await defaultKeyHasher(key);
+	const apiKey = await getApiKey$1(ctx, hashedKey, lookupOpts);
 	if (!apiKey) throw APIError$1.from("UNAUTHORIZED", API_KEY_ERROR_CODES.INVALID_API_KEY);
 	if (expectedConfigId !== void 0 && !configIdMatches(apiKey.configId, expectedConfigId)) throw APIError$1.from("UNAUTHORIZED", API_KEY_ERROR_CODES.INVALID_API_KEY);
 	const opts = resolveConfiguration(ctx.context, configurations, apiKey.configId);
@@ -1724,13 +1725,16 @@ async function validateApiKey({ key, ctx, lookupOpts, configurations, schema, pe
 		code: "RATE_LIMITED",
 		details: { tryAgainIn }
 	});
-	const updated = {
-		...apiKey,
+	const mutations = {
 		...update,
 		remaining,
 		lastRefillAt,
 		updatedAt: /* @__PURE__ */ new Date()
 	};
+	const updated = {
+		...apiKey,
+		...mutations
+	};
 	const performUpdate = async () => {
 		if (opts.storage === "database") return ctx.context.adapter.update({
 			model: API_KEY_TABLE_NAME,
@@ -1738,10 +1742,7 @@ async function validateApiKey({ key, ctx, lookupOpts, configurations, schema, pe
 				field: "id",
 				value: apiKey.id
 			}],
-			update: {
-				...updated,
-				id: void 0
-			}
+			update: mutations
 		});
 		else if (opts.storage === "secondary-storage" && opts.fallbackToDatabase) {
 			const dbUpdated = await ctx.context.adapter.update({
@@ -1750,16 +1751,19 @@ async function validateApiKey({ key, ctx, lookupOpts, configurations, schema, pe
 					field: "id",
 					value: apiKey.id
 				}],
-				update: {
-					...updated,
-					id: void 0
-				}
+				update: mutations
 			});
 			if (dbUpdated) await setApiKey(ctx, dbUpdated, opts);
 			return dbUpdated;
 		} else {
-			await setApiKey(ctx, updated, opts);
-			return updated;
+			const fresh = await getApiKey$1(ctx, hashedKey, opts);
+			if (!fresh) return null;
+			const merged = {
+				...fresh,
+				...mutations
+			};
+			await setApiKey(ctx, merged, opts);
+			return merged;
 		}
 	};
 	let newApiKey = null;

package/dist/{version-L3icplj1.mjs → version-DsrnkkeB.mjs}

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/api-key",
-  "version": "1.7.0-beta.4",
+  "version": "1.7.0-beta.5",
   "description": "API Key plugin for Better Auth.",
   "type": "module",
   "license": "MIT",
@@ -61,14 +61,14 @@
   },
   "devDependencies": {
     "tsdown": "0.21.1",
-    "@better-auth/core": "1.7.0-beta.4",
-    "better-auth": "1.7.0-beta.4"
+    "@better-auth/core": "1.7.0-beta.5",
+    "better-auth": "1.7.0-beta.5"
   },
   "peerDependencies": {
     "@better-auth/utils": "0.4.1",
-    "better-call": "1.3.5",
-    "@better-auth/core": "^1.7.0-beta.4",
-    "better-auth": "^1.7.0-beta.4"
+    "better-call": "1.3.6",
+    "@better-auth/core": "^1.7.0-beta.5",
+    "better-auth": "^1.7.0-beta.5"
   },
   "scripts": {
     "build": "tsdown",