From 3fa4dd4da768787a7fe2e4cbda926c721973ce85 Mon Sep 17 00:00:00 2001 From: Matthieu Sieben Date: Fri, 7 Mar 2025 20:39:09 +0100 Subject: [PATCH] Fix build --- packages/oauth/oauth-provider/src/oauth-provider.ts | 4 ++-- .../oauth-provider/src/output/build-customization-data.ts | 5 +++-- packages/pds/src/config/config.ts | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/oauth/oauth-provider/src/oauth-provider.ts b/packages/oauth/oauth-provider/src/oauth-provider.ts index 59ea558ccb5..4fb1a76ed9e 100644 --- a/packages/oauth/oauth-provider/src/oauth-provider.ts +++ b/packages/oauth/oauth-provider/src/oauth-provider.ts @@ -103,7 +103,7 @@ import { OAuthHooks, SignInData, SignUpData } from './oauth-hooks.js' import { OAuthVerifier, OAuthVerifierOptions } from './oauth-verifier.js' import { AuthorizationResultAuthorize } from './output/build-authorize-data.js' import { - BrandingConfig, + BrandingInput, Customization, CustomizationInput, customizationSchema, @@ -131,7 +131,7 @@ import { TokenStore, asTokenStore } from './token/token-store.js' import { VerifyTokenClaimsOptions } from './token/verify-token-claims.js' export { - type BrandingConfig, + type BrandingInput, type CustomMetadata, type Customization, type Handler, diff --git a/packages/oauth/oauth-provider/src/output/build-customization-data.ts b/packages/oauth/oauth-provider/src/output/build-customization-data.ts index 0b5b40b1298..1a9f9bf6e25 100644 --- a/packages/oauth/oauth-provider/src/output/build-customization-data.ts +++ b/packages/oauth/oauth-provider/src/output/build-customization-data.ts @@ -61,7 +61,8 @@ export const brandingConfigSchema = z.object({ colors: colorsDefinitionSchema.optional(), links: z.array(linkDefinitionSchema).readonly().optional(), }) -export type BrandingConfig = z.infer +export type BrandingInput = z.input +export type Branding = z.infer export const customizationSchema = z.object({ /** @@ -124,7 +125,7 @@ export function buildCustomizationCss({ branding }: Customization) { return '' } -function* buildCustomizationVars(branding?: BrandingConfig) { +function* buildCustomizationVars(branding?: Branding) { if (branding?.colors) { for (const name of colorNames) { const value = branding.colors[name] diff --git a/packages/pds/src/config/config.ts b/packages/pds/src/config/config.ts index 2f80a815bcd..ab902fa5102 100644 --- a/packages/pds/src/config/config.ts +++ b/packages/pds/src/config/config.ts @@ -1,7 +1,7 @@ import assert from 'node:assert' import path from 'node:path' import { DAY, HOUR, SECOND } from '@atproto/common' -import { BrandingConfig, HcaptchaConfig } from '@atproto/oauth-provider' +import { BrandingInput, HcaptchaConfig } from '@atproto/oauth-provider' import { ServerEnvironment } from './env' // off-config but still from env: @@ -447,7 +447,7 @@ export type OAuthConfig = { | false | { hcaptcha?: HcaptchaConfig - branding: BrandingConfig + branding: BrandingInput } }