@better-auth/oauth-provider 1.4.18 → 1.4.20

package/dist/client-resource.d.mts

@@ -1,4 +1,4 @@
-import { a as ResourceServerMetadata } from "./oauth-BrFoF22H.mjs";
+import { a as ResourceServerMetadata } from "./oauth-1jow-gRL.mjs";
 import { JWTPayload, JWTVerifyOptions } from "jose";
 import { Auth } from "better-auth/types";
 

package/dist/client-resource.mjs

@@ -1,4 +1,4 @@
-import { a as getJwtPlugin, o as getOAuthProviderPlugin, p as handleMcpErrors } from "./utils-DnfreTWo.mjs";
+import { a as getJwtPlugin, o as getOAuthProviderPlugin, p as handleMcpErrors } from "./utils-CThxvHKd.mjs";
 import { verifyAccessToken } from "better-auth/oauth2";
 import { APIError } from "better-call";
 import { BetterAuthError } from "@better-auth/core/error";

package/dist/client.d.mts

@@ -1,5 +1,5 @@
-import "./oauth-BrFoF22H.mjs";
-import { t as oauthProvider } from "./oauth-BxSSTB3p.mjs";
+import "./oauth-1jow-gRL.mjs";
+import { t as oauthProvider } from "./oauth-DC4oauK7.mjs";
 import * as _better_fetch_fetch0 from "@better-fetch/fetch";
 
 //#region src/client.d.ts

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { _ as Awaitable, a as ResourceServerMetadata, c as OAuthConsent, d as OAuthRefreshToken, f as Prompt, g as VerificationValue, h as StoreTokenType, i as OIDCMetadata, l as OAuthOpaqueAccessToken, m as Scope, n as GrantType, o as AuthorizePrompt, p as SchemaClient, r as OAuthClient, s as OAuthAuthorizationQuery, t as AuthServerMetadata, u as OAuthOptions } from "./oauth-BrFoF22H.mjs";
-import { t as oauthProvider } from "./oauth-BxSSTB3p.mjs";
+import { _ as Awaitable, a as ResourceServerMetadata, c as OAuthConsent, d as OAuthRefreshToken, f as Prompt, g as VerificationValue, h as StoreTokenType, i as OIDCMetadata, l as OAuthOpaqueAccessToken, m as Scope, n as GrantType, o as AuthorizePrompt, p as SchemaClient, r as OAuthClient, s as OAuthAuthorizationQuery, t as AuthServerMetadata, u as OAuthOptions } from "./oauth-1jow-gRL.mjs";
+import { t as oauthProvider } from "./oauth-DC4oauK7.mjs";
 import { verifyAccessToken } from "better-auth/oauth2";
 import { JWSAlgorithms, JwtOptions } from "better-auth/plugins";
 import { JWTPayload } from "jose";

package/dist/index.mjs

@@ -1,124 +1,28 @@
-import { a as getJwtPlugin, c as parseClientMetadata, d as storeToken, f as validateClientCredentials, i as getClient, l as parsePrompt, m as mcpHandler, n as decryptStoredClientSecret, r as deleteFromPrompt, s as getStoredToken, t as basicToClientCredentials, u as storeClientSecret } from "./utils-DnfreTWo.mjs";
+import { a as getJwtPlugin, c as parseClientMetadata, d as storeToken, f as validateClientCredentials, i as getClient, l as parsePrompt, m as mcpHandler, n as decryptStoredClientSecret, r as deleteFromPrompt, s as getStoredToken, t as basicToClientCredentials, u as storeClientSecret } from "./utils-CThxvHKd.mjs";
 import { generateCodeChallenge, getJwks, verifyJwsAccessToken } from "better-auth/oauth2";
 import { APIError } from "better-call";
-import { BetterAuthError } from "@better-auth/core/error";
+import { APIError as APIError$1, createAuthEndpoint, createAuthMiddleware, getOAuthState, getSessionFromCtx, sessionMiddleware } from "better-auth/api";
 import { constantTimeEqual, generateRandomString, makeSignature } from "better-auth/crypto";
+import { BetterAuthError } from "@better-auth/core/error";
 import { defineRequestState } from "@better-auth/core/context";
 import { logger } from "@better-auth/core/env";
-import { APIError as APIError$1, createAuthEndpoint, createAuthMiddleware, getOAuthState, getSessionFromCtx, sessionMiddleware } from "better-auth/api";
 import { parseSetCookieHeader } from "better-auth/cookies";
 import { mergeSchema } from "better-auth/db";
 import * as z from "zod";
 import { signJWT, toExpJWT } from "better-auth/plugins";
 import { SignJWT, compactVerify, createLocalJWKSet, decodeJwt } from "jose";
 
-//#region src/metadata.ts
-function authServerMetadata(ctx, opts, overrides) {
-	const baseURL = ctx.context.baseURL;
-	return {
-		scopes_supported: overrides?.scopes_supported,
-		issuer: opts?.jwt?.issuer ?? baseURL,
-		authorization_endpoint: `${baseURL}/oauth2/authorize`,
-		token_endpoint: `${baseURL}/oauth2/token`,
-		jwks_uri: overrides?.jwt_disabled ? void 0 : opts?.jwks?.remoteUrl ?? `${baseURL}${opts?.jwks?.jwksPath ?? "/jwks"}`,
-		registration_endpoint: `${baseURL}/oauth2/register`,
-		introspection_endpoint: `${baseURL}/oauth2/introspect`,
-		revocation_endpoint: `${baseURL}/oauth2/revoke`,
-		response_types_supported: overrides?.grant_types_supported && !overrides.grant_types_supported.includes("authorization_code") ? [] : ["code"],
-		response_modes_supported: ["query"],
-		grant_types_supported: overrides?.grant_types_supported ?? [
-			"authorization_code",
-			"client_credentials",
-			"refresh_token"
-		],
-		token_endpoint_auth_methods_supported: [
-			...overrides?.public_client_supported ? ["none"] : [],
-			"client_secret_basic",
-			"client_secret_post"
-		],
-		introspection_endpoint_auth_methods_supported: ["client_secret_basic", "client_secret_post"],
-		revocation_endpoint_auth_methods_supported: ["client_secret_basic", "client_secret_post"],
-		code_challenge_methods_supported: ["S256"]
-	};
-}
-function oidcServerMetadata(ctx, opts) {
-	const baseURL = ctx.context.baseURL;
-	const jwtPluginOptions = opts.disableJwtPlugin ? void 0 : getJwtPlugin(ctx.context).options;
-	return {
-		...authServerMetadata(ctx, jwtPluginOptions, {
-			scopes_supported: opts.advertisedMetadata?.scopes_supported ?? opts.scopes,
-			public_client_supported: opts.allowUnauthenticatedClientRegistration,
-			grant_types_supported: opts.grantTypes,
-			jwt_disabled: opts.disableJwtPlugin
-		}),
-		claims_supported: opts?.advertisedMetadata?.claims_supported ?? opts?.claims ?? [],
-		userinfo_endpoint: `${baseURL}/oauth2/userinfo`,
-		subject_types_supported: ["public"],
-		id_token_signing_alg_values_supported: jwtPluginOptions?.jwks?.keyPairConfig?.alg ? [jwtPluginOptions?.jwks?.keyPairConfig?.alg] : opts.disableJwtPlugin ? ["HS256"] : ["EdDSA"],
-		end_session_endpoint: `${baseURL}/oauth2/end-session`,
-		acr_values_supported: ["urn:mace:incommon:iap:bronze"],
-		prompt_values_supported: [
-			"login",
-			"consent",
-			"create",
-			"select_account"
-		]
-	};
-}
-/**
-* Provides an exportable `/.well-known/oauth-authorization-server`.
-*
-* Useful when basePath prevents the endpoint from being located at the root
-* and must be provided manually.
-*
-* @external
-*/
-const oauthProviderAuthServerMetadata = (auth, opts) => {
-	return async (_request) => {
-		const res = await auth.api.getOAuthServerConfig();
-		return new Response(JSON.stringify(res), {
-			status: 200,
-			headers: {
-				"Cache-Control": "public, max-age=15, stale-while-revalidate=15, stale-if-error=86400",
-				...opts?.headers,
-				"Content-Type": "application/json"
-			}
-		});
-	};
-};
-/**
-* Provides an exportable `/.well-known/openid-configuration`.
-*
-* Useful when basePath prevents the endpoint from being located at the root
-* and must be provided manually.
-*
-* @external
-*/
-const oauthProviderOpenIdConfigMetadata = (auth, opts) => {
-	return async (_request) => {
-		const res = await auth.api.getOpenIdConfig();
-		return new Response(JSON.stringify(res), {
-			status: 200,
-			headers: {
-				"Cache-Control": "public, max-age=15, stale-while-revalidate=15, stale-if-error=86400",
-				...opts?.headers,
-				"Content-Type": "application/json"
-			}
-		});
-	};
-};
-
-//#endregion
 //#region src/authorize.ts
 /**
 * Formats an error url
 */
-function formatErrorURL(url, error, description, state) {
+function formatErrorURL(url, error, description, state, iss) {
 	const searchParams = new URLSearchParams({
 		error,
 		error_description: description
 	});
 	state && searchParams.append("state", state);
+	iss && searchParams.append("iss", iss);
 	return `${url}${url.includes("?") ? "&" : "?"}${searchParams.toString()}`;
 }
 const handleRedirect = (ctx, uri) => {
@@ -129,6 +33,39 @@ const handleRedirect = (ctx, uri) => {
 	else throw ctx.redirect(uri);
 };
 /**
+* Validates that the issuer URL
+* - MUST use HTTPS scheme (HTTP allowed for localhost in dev)
+* - MUST NOT contain query components
+* - MUST NOT contain fragment components
+*
+* @returns The validated issuer URL, or a sanitized version if invalid
+*/
+function validateIssuerUrl(issuer) {
+	try {
+		const url = new URL(issuer);
+		const isLocalhost$1 = url.hostname === "localhost" || url.hostname === "127.0.0.1";
+		if (url.protocol !== "https:" && !isLocalhost$1) url.protocol = "https:";
+		url.search = "";
+		url.hash = "";
+		return url.toString().replace(/\/$/, "");
+	} catch {
+		return issuer;
+	}
+}
+/**
+* Gets the issuer identifier
+*/
+function getIssuer(ctx, opts) {
+	let issuer;
+	if (opts.disableJwtPlugin) issuer = ctx.context.baseURL;
+	else try {
+		issuer = getJwtPlugin(ctx.context).options?.jwt?.issuer ?? ctx.context.baseURL;
+	} catch {
+		issuer = ctx.context.baseURL;
+	}
+	return validateIssuerUrl(issuer);
+}
+/**
 * Error page url if redirect_uri has not been verified yet
 * Generates Url for custom error page
 */
@@ -157,14 +94,14 @@ async function authorizeEndpoint(ctx, opts, settings) {
 		const invalidScopes = requestedScopes.filter((scope) => {
 			return !validScopes?.has(scope) || scope === "offline_access" && (query.code_challenge_method !== "S256" || !query.code_challenge);
 		});
-		if (invalidScopes.length) throw ctx.redirect(formatErrorURL(query.redirect_uri, "invalid_scope", `The following scopes are invalid: ${invalidScopes.join(", ")}`, query.state));
+		if (invalidScopes.length) throw ctx.redirect(formatErrorURL(query.redirect_uri, "invalid_scope", `The following scopes are invalid: ${invalidScopes.join(", ")}`, query.state, getIssuer(ctx, opts)));
 	}
 	if (!requestedScopes) {
 		requestedScopes = client.scopes ?? opts.scopes ?? [];
 		query.scope = requestedScopes.join(" ");
 	}
-	if (!query.code_challenge || !query.code_challenge_method) throw ctx.redirect(formatErrorURL(query.redirect_uri, "invalid_request", "pkce is required", query.state));
-	if (!["S256"].includes(query.code_challenge_method)) throw ctx.redirect(formatErrorURL(query.redirect_uri, "invalid_request", "invalid code_challenge method", query.state));
+	if (!query.code_challenge || !query.code_challenge_method) throw ctx.redirect(formatErrorURL(query.redirect_uri, "invalid_request", "pkce is required", query.state, getIssuer(ctx, opts)));
+	if (!["S256"].includes(query.code_challenge_method)) throw ctx.redirect(formatErrorURL(query.redirect_uri, "invalid_request", "invalid code_challenge method", query.state, getIssuer(ctx, opts)));
 	const session = await getSessionFromCtx(ctx);
 	if (!session || promptSet?.has("login") || promptSet?.has("create")) return redirectWithPromptCode(ctx, opts, promptSet?.has("create") ? "create" : "login");
 	if (settings?.isAuthorize && promptSet?.has("select_account")) return redirectWithPromptCode(ctx, opts, "select_account");
@@ -255,6 +192,7 @@ async function redirectWithAuthorizationCode(ctx, opts, verificationValue) {
 	const redirectUriWithCode = new URL(verificationValue.query.redirect_uri);
 	redirectUriWithCode.searchParams.set("code", code);
 	if (verificationValue.query.state) redirectUriWithCode.searchParams.set("state", verificationValue.query.state);
+	redirectUriWithCode.searchParams.set("iss", getIssuer(ctx, opts));
 	return handleRedirect(ctx, redirectUriWithCode.toString());
 }
 async function redirectWithPromptCode(ctx, opts, type, page) {
@@ -277,6 +215,104 @@ async function signParams(ctx, opts) {
 	return params.toString();
 }
 
+//#endregion
+//#region src/metadata.ts
+function authServerMetadata(ctx, opts, overrides) {
+	const baseURL = ctx.context.baseURL;
+	return {
+		scopes_supported: overrides?.scopes_supported,
+		issuer: validateIssuerUrl(opts?.jwt?.issuer ?? baseURL),
+		authorization_endpoint: `${baseURL}/oauth2/authorize`,
+		token_endpoint: `${baseURL}/oauth2/token`,
+		jwks_uri: overrides?.jwt_disabled ? void 0 : opts?.jwks?.remoteUrl ?? `${baseURL}${opts?.jwks?.jwksPath ?? "/jwks"}`,
+		registration_endpoint: `${baseURL}/oauth2/register`,
+		introspection_endpoint: `${baseURL}/oauth2/introspect`,
+		revocation_endpoint: `${baseURL}/oauth2/revoke`,
+		response_types_supported: overrides?.grant_types_supported && !overrides.grant_types_supported.includes("authorization_code") ? [] : ["code"],
+		response_modes_supported: ["query"],
+		grant_types_supported: overrides?.grant_types_supported ?? [
+			"authorization_code",
+			"client_credentials",
+			"refresh_token"
+		],
+		token_endpoint_auth_methods_supported: [
+			...overrides?.public_client_supported ? ["none"] : [],
+			"client_secret_basic",
+			"client_secret_post"
+		],
+		introspection_endpoint_auth_methods_supported: ["client_secret_basic", "client_secret_post"],
+		revocation_endpoint_auth_methods_supported: ["client_secret_basic", "client_secret_post"],
+		code_challenge_methods_supported: ["S256"],
+		authorization_response_iss_parameter_supported: true
+	};
+}
+function oidcServerMetadata(ctx, opts) {
+	const baseURL = ctx.context.baseURL;
+	const jwtPluginOptions = opts.disableJwtPlugin ? void 0 : getJwtPlugin(ctx.context).options;
+	return {
+		...authServerMetadata(ctx, jwtPluginOptions, {
+			scopes_supported: opts.advertisedMetadata?.scopes_supported ?? opts.scopes,
+			public_client_supported: opts.allowUnauthenticatedClientRegistration,
+			grant_types_supported: opts.grantTypes,
+			jwt_disabled: opts.disableJwtPlugin
+		}),
+		claims_supported: opts?.advertisedMetadata?.claims_supported ?? opts?.claims ?? [],
+		userinfo_endpoint: `${baseURL}/oauth2/userinfo`,
+		subject_types_supported: ["public"],
+		id_token_signing_alg_values_supported: jwtPluginOptions?.jwks?.keyPairConfig?.alg ? [jwtPluginOptions?.jwks?.keyPairConfig?.alg] : opts.disableJwtPlugin ? ["HS256"] : ["EdDSA"],
+		end_session_endpoint: `${baseURL}/oauth2/end-session`,
+		acr_values_supported: ["urn:mace:incommon:iap:bronze"],
+		prompt_values_supported: [
+			"login",
+			"consent",
+			"create",
+			"select_account"
+		]
+	};
+}
+/**
+* Provides an exportable `/.well-known/oauth-authorization-server`.
+*
+* Useful when basePath prevents the endpoint from being located at the root
+* and must be provided manually.
+*
+* @external
+*/
+const oauthProviderAuthServerMetadata = (auth, opts) => {
+	return async (_request) => {
+		const res = await auth.api.getOAuthServerConfig();
+		return new Response(JSON.stringify(res), {
+			status: 200,
+			headers: {
+				"Cache-Control": "public, max-age=15, stale-while-revalidate=15, stale-if-error=86400",
+				...opts?.headers,
+				"Content-Type": "application/json"
+			}
+		});
+	};
+};
+/**
+* Provides an exportable `/.well-known/openid-configuration`.
+*
+* Useful when basePath prevents the endpoint from being located at the root
+* and must be provided manually.
+*
+* @external
+*/
+const oauthProviderOpenIdConfigMetadata = (auth, opts) => {
+	return async (_request) => {
+		const res = await auth.api.getOpenIdConfig();
+		return new Response(JSON.stringify(res), {
+			status: 200,
+			headers: {
+				"Cache-Control": "public, max-age=15, stale-while-revalidate=15, stale-if-error=86400",
+				...opts?.headers,
+				"Content-Type": "application/json"
+			}
+		});
+	};
+};
+
 //#endregion
 //#region src/consent.ts
 async function consentEndpoint(ctx, opts) {
@@ -301,7 +337,7 @@ async function consentEndpoint(ctx, opts) {
 	}
 	if (!(ctx.body.accept === true)) return {
 		redirect: true,
-		uri: formatErrorURL(query.get("redirect_uri") ?? "", "access_denied", "User denied access", query.get("state") ?? void 0)
+		url: formatErrorURL(query.get("redirect_uri") ?? "", "access_denied", "User denied access", query.get("state") ?? void 0, getIssuer(ctx, opts))
 	};
 	const session = await getSessionFromCtx(ctx);
 	const referenceId = await opts.postLogin?.consentReferenceId?.({
@@ -358,7 +394,7 @@ async function consentEndpoint(ctx, opts) {
 	const { url } = await authorizeEndpoint(ctx, opts);
 	return {
 		redirect: true,
-		uri: url
+		url
 	};
 }
 
@@ -384,7 +420,7 @@ async function selected(ctx, opts) {
 	const { url } = await authorizeEndpoint(ctx, opts);
 	return {
 		redirect: true,
-		uri: url
+		url
 	};
 }
 async function created(ctx, opts) {
@@ -397,7 +433,7 @@ async function created(ctx, opts) {
 	const { url } = await authorizeEndpoint(ctx, opts);
 	return {
 		redirect: true,
-		uri: url
+		url
 	};
 }
 async function postLogin(ctx, opts) {
@@ -412,7 +448,7 @@ async function postLogin(ctx, opts) {
 	const { url } = await authorizeEndpoint(ctx, opts, { postLogin: true });
 	return {
 		redirect: true,
-		uri: url
+		url
 	};
 }
 
@@ -1079,8 +1115,8 @@ async function validateOpaqueAccessToken(ctx, opts, token, clientId) {
 		client_id: accessToken.clientId,
 		sub: user?.id,
 		sid: sessionId,
-		exp: Math.floor(accessToken.expiresAt.getTime() / 1e3),
-		iat: Math.floor(accessToken.createdAt.getTime() / 1e3),
+		exp: Math.floor(new Date(accessToken.expiresAt).getTime() / 1e3),
+		iat: Math.floor(new Date(accessToken.createdAt).getTime() / 1e3),
 		scope: accessToken.scopes?.join(" ")
 	};
 }
@@ -1123,8 +1159,8 @@ async function validateRefreshToken(ctx, opts, token, clientId) {
 		iss: ((opts.disableJwtPlugin ? void 0 : getJwtPlugin(ctx.context))?.options)?.jwt?.issuer ?? ctx.context.baseURL,
 		sub: user?.id,
 		sid: sessionId,
-		exp: Math.floor(refreshToken.expiresAt.getTime() / 1e3),
-		iat: Math.floor(refreshToken.createdAt.getTime() / 1e3),
+		exp: Math.floor(new Date(refreshToken.expiresAt).getTime() / 1e3),
+		iat: Math.floor(new Date(refreshToken.createdAt).getTime() / 1e3),
 		scope: refreshToken.scopes?.join(" ")
 	};
 }
@@ -1400,7 +1436,11 @@ async function createOAuthClientEndpoint(ctx, opts, settings) {
 	});
 	const client = await ctx.context.adapter.create({
 		model: "oauthClient",
-		data: schema$1
+		data: {
+			...schema$1,
+			createdAt: /* @__PURE__ */ new Date(iat * 1e3),
+			updatedAt: /* @__PURE__ */ new Date(iat * 1e3)
+		}
 	});
 	return ctx.json(schemaToOAuth({
 		...client,
@@ -1466,8 +1506,8 @@ function oauthToSchema(input) {
 */
 function schemaToOAuth(input) {
 	const { clientId, clientSecret, disabled, scopes, userId, createdAt, updatedAt: _updatedAt, expiresAt, name, uri, icon, contacts, tos, policy, softwareId, softwareVersion, softwareStatement, redirectUris, postLogoutRedirectUris, tokenEndpointAuthMethod, grantTypes, responseTypes, public: _public, type, skipConsent, enableEndSession, referenceId, metadata } = input;
-	const _expiresAt = expiresAt ? Math.round(expiresAt.getTime() / 1e3) : void 0;
-	const _createdAt = createdAt ? Math.round(createdAt.getTime() / 1e3) : void 0;
+	const _expiresAt = expiresAt ? Math.round(new Date(expiresAt).getTime() / 1e3) : void 0;
+	const _createdAt = createdAt ? Math.round(new Date(createdAt).getTime() / 1e3) : void 0;
 	const _scopes = scopes?.join(" ");
 	return {
 		...parseClientMetadata(metadata),
@@ -1502,8 +1542,19 @@ function schemaToOAuth(input) {
 
 //#endregion
 //#region src/types/zod.ts
+const DANGEROUS_SCHEMES = [
+	"javascript:",
+	"data:",
+	"vbscript:"
+];
+function isLocalhost(hostname) {
+	return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "[::1]";
+}
 /**
-* Reusable URL validation that disallows javascript: scheme
+* Reusable URL validation for OAuth redirect URIs.
+* - Blocks dangerous schemes (javascript:, data:, vbscript:)
+* - For http/https: requires HTTPS (HTTP allowed only for localhost)
+* - Allows custom schemes for mobile apps (e.g., myapp://callback)
 */
 const SafeUrlSchema = z.url().superRefine((val, ctx) => {
 	if (!URL.canParse(val)) {
@@ -1514,10 +1565,21 @@ const SafeUrlSchema = z.url().superRefine((val, ctx) => {
 		});
 		return z.NEVER;
 	}
-}).refine((url) => {
-	const u = new URL(url);
-	return u.protocol !== "javascript:" && u.protocol !== "data:" && u.protocol !== "vbscript:";
-}, { message: "URL cannot use javascript:, data:, or vbscript: scheme" });
+	const u = new URL(val);
+	if (DANGEROUS_SCHEMES.includes(u.protocol)) {
+		ctx.addIssue({
+			code: "custom",
+			message: "URL cannot use javascript:, data:, or vbscript: scheme"
+		});
+		return;
+	}
+	if (u.protocol === "http:" || u.protocol === "https:") {
+		if (u.protocol === "http:" && !isLocalhost(u.hostname)) ctx.addIssue({
+			code: "custom",
+			message: "Redirect URI must use HTTPS (HTTP allowed only for localhost)"
+		});
+	}
+});
 
 //#endregion
 //#region src/oauthClient/endpoints.ts
@@ -1684,7 +1746,10 @@ async function updateClientEndpoint(ctx, opts) {
 			field: "clientId",
 			value: clientId
 		}],
-		update: oauthToSchema(updates)
+		update: {
+			...oauthToSchema(updates),
+			updatedAt: /* @__PURE__ */ new Date(Math.floor(Date.now() / 1e3) * 1e3)
+		}
 	});
 	if (!updatedClient) throw new APIError$1("INTERNAL_SERVER_ERROR", {
 		error_description: "unable to update client",
@@ -1732,8 +1797,8 @@ async function rotateClientSecretEndpoint(ctx, opts) {
 			value: clientId
 		}],
 		update: {
-			...schemaToOAuth(client),
-			clientSecret: storedClientSecret
+			clientSecret: storedClientSecret,
+			updatedAt: /* @__PURE__ */ new Date(Math.floor(Date.now() / 1e3) * 1e3)
 		}
 	});
 	if (!updatedClient) throw new APIError$1("INTERNAL_SERVER_ERROR", {
@@ -2920,7 +2985,12 @@ const oauthProvider = (options) => {
 				metadata: { SERVER_ONLY: true }
 			}, async (ctx) => {
 				if (opts.scopes && opts.scopes.includes("openid")) return oidcServerMetadata(ctx, opts);
-				else return authServerMetadata(ctx, opts.disableJwtPlugin ? void 0 : getJwtPlugin(ctx.context).options, { scopes_supported: opts.advertisedMetadata?.scopes_supported ?? opts.scopes });
+				else return authServerMetadata(ctx, opts.disableJwtPlugin ? void 0 : getJwtPlugin(ctx.context).options, {
+					scopes_supported: opts.advertisedMetadata?.scopes_supported ?? opts.scopes,
+					public_client_supported: opts.allowUnauthenticatedClientRegistration,
+					grant_types_supported: opts.grantTypes,
+					jwt_disabled: opts.disableJwtPlugin
+				});
 			}),
 			getOpenIdConfig: createAuthEndpoint("/.well-known/openid-configuration", {
 				method: "GET",
@@ -3715,7 +3785,39 @@ const oauthProvider = (options) => {
 			updateOAuthConsent: updateOAuthConsent(opts),
 			deleteOAuthConsent: deleteOAuthConsent(opts)
 		},
-		schema: mergeSchema(schema, opts?.schema)
+		schema: mergeSchema(schema, opts?.schema),
+		rateLimit: [
+			...opts.rateLimit?.token !== false ? [{
+				pathMatcher: (path) => path === "/oauth2/token",
+				window: opts.rateLimit?.token?.window ?? 60,
+				max: opts.rateLimit?.token?.max ?? 20
+			}] : [],
+			...opts.rateLimit?.authorize !== false ? [{
+				pathMatcher: (path) => path === "/oauth2/authorize",
+				window: opts.rateLimit?.authorize?.window ?? 60,
+				max: opts.rateLimit?.authorize?.max ?? 30
+			}] : [],
+			...opts.rateLimit?.introspect !== false ? [{
+				pathMatcher: (path) => path === "/oauth2/introspect",
+				window: opts.rateLimit?.introspect?.window ?? 60,
+				max: opts.rateLimit?.introspect?.max ?? 100
+			}] : [],
+			...opts.rateLimit?.revoke !== false ? [{
+				pathMatcher: (path) => path === "/oauth2/revoke",
+				window: opts.rateLimit?.revoke?.window ?? 60,
+				max: opts.rateLimit?.revoke?.max ?? 30
+			}] : [],
+			...opts.rateLimit?.register !== false ? [{
+				pathMatcher: (path) => path === "/oauth2/register",
+				window: opts.rateLimit?.register?.window ?? 60,
+				max: opts.rateLimit?.register?.max ?? 5
+			}] : [],
+			...opts.rateLimit?.userinfo !== false ? [{
+				pathMatcher: (path) => path === "/oauth2/userinfo",
+				window: opts.rateLimit?.userinfo?.window ?? 60,
+				max: opts.rateLimit?.userinfo?.max ?? 60
+			}] : []
+		]
 	};
 };