From 4c87fb50abfb8f914f5ccea9d7170cc9490c67ef Mon Sep 17 00:00:00 2001 From: Justin Spahr-Summers Date: Tue, 11 Feb 2025 14:17:02 +0000 Subject: [PATCH] Prefix client metadata + info with `OAuth` --- src/client/auth.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/client/auth.ts b/src/client/auth.ts index 78c6545a..57fed8f2 100644 --- a/src/client/auth.ts +++ b/src/client/auth.ts @@ -45,7 +45,7 @@ export const OAuthTokensSchema = z /** * Client metadata schema according to RFC 7591 OAuth 2.0 Dynamic Client Registration */ -export const ClientMetadataSchema = z.object({ +export const OAuthClientMetadataSchema = z.object({ redirect_uris: z.array(z.string()), token_endpoint_auth_method: z.string().optional(), grant_types: z.array(z.string()).optional(), @@ -66,18 +66,18 @@ export const ClientMetadataSchema = z.object({ /** * Client information response schema according to RFC 7591 */ -export const ClientInformationSchema = z.object({ +export const OAuthClientInformationSchema = z.object({ client_id: z.string(), client_secret: z.string().optional(), client_id_issued_at: z.number().optional(), client_secret_expires_at: z.number().optional(), -}).merge(ClientMetadataSchema); +}).merge(OAuthClientMetadataSchema); export type OAuthMetadata = z.infer; export type OAuthTokens = z.infer; -export type ClientMetadata = z.infer; -export type ClientInformation = z.infer; +export type OAuthClientMetadata = z.infer; +export type OAuthClientInformation = z.infer; /** * Looks up RFC 8414 OAuth 2.0 Authorization Server Metadata. @@ -273,9 +273,9 @@ export async function registerClient( clientMetadata, }: { metadata?: OAuthMetadata; - clientMetadata: ClientMetadata; + clientMetadata: OAuthClientMetadata; }, -): Promise { +): Promise { let registrationUrl: URL; if (metadata) { @@ -300,5 +300,5 @@ export async function registerClient( throw new Error(`Dynamic client registration failed: HTTP ${response.status}`); } - return ClientInformationSchema.parse(await response.json()); + return OAuthClientInformationSchema.parse(await response.json()); } \ No newline at end of file