diff --git a/src/backend/common/infrastructure/config/client/discord.ts b/src/backend/common/infrastructure/config/client/discord.ts index 90c47118..4b3fc649 100644 --- a/src/backend/common/infrastructure/config/client/discord.ts +++ b/src/backend/common/infrastructure/config/client/discord.ts @@ -21,13 +21,13 @@ export const discordDataSchema = z.object({ export type DiscordData = z.infer; const envDataSchema = z.object({ - DISCORD_TOKEN: z.string().optional(), - DISCORD_ARTWORK: z.string().optional(), - DISCORD_APPLICATION_ID: z.string().optional(), - DISCORD_IPC_LOCATIONS: z.string().optional(), - DISCORD_ARTWORK_DEFAULT_URL: z.string().optional(), - DISCORD_STATUS_OVERRIDE_ALLOW: z.string().optional(), - DISCORD_LISTENING_ACTIVITY_ALLOW: z.string().optional(), + DISCORD_TOKEN: discordDataSchema.shape.token, + DISCORD_ARTWORK: discordDataSchema.shape.artwork, + DISCORD_APPLICATION_ID: discordDataSchema.shape.applicationId, + DISCORD_IPC_LOCATIONS: discordDataSchema.shape.ipcLocations, + DISCORD_ARTWORK_DEFAULT_URL: discordDataSchema.shape.artworkDefaultUrl, + DISCORD_STATUS_OVERRIDE_ALLOW: discordDataSchema.shape.statusOverrideAllow, + DISCORD_LISTENING_ACTIVITY_ALLOW: discordDataSchema.shape.listeningActivityAllow, }); export const envSchemas: EnvClientSchema = { diff --git a/src/backend/common/infrastructure/config/client/koito.ts b/src/backend/common/infrastructure/config/client/koito.ts index d7decf44..2132f391 100644 --- a/src/backend/common/infrastructure/config/client/koito.ts +++ b/src/backend/common/infrastructure/config/client/koito.ts @@ -79,9 +79,9 @@ export const koitoDataSchema = z.object({ export type KoitoData = z.infer; const envDataSchema = z.object({ - KOITO_URL: z.string().meta({description: 'URL for the Koito server'}), - KOITO_TOKEN: z.string().meta({description: 'User token for the user to scrobble for'}), - KOITO_USER: z.string().meta({description: 'Username of the user to scrobble for'}), + KOITO_URL: koitoDataSchema.shape.url, + KOITO_TOKEN: koitoDataSchema.shape.token, + KOITO_USER: koitoDataSchema.shape.username, }); export const envSchemas: EnvClientSchema = { diff --git a/src/backend/common/infrastructure/config/client/lastfm.ts b/src/backend/common/infrastructure/config/client/lastfm.ts index 81ac43d8..4f0ac6f3 100644 --- a/src/backend/common/infrastructure/config/client/lastfm.ts +++ b/src/backend/common/infrastructure/config/client/lastfm.ts @@ -45,10 +45,10 @@ export const lastfmDataSchema = z.object({ export type LastfmData = z.infer; const envDataSchema = z.object({ - LASTFM_API_KEY: z.string().meta({description: 'API Key generated from Last.fm/Libre.fm account'}), - LASTFM_SECRET: z.string().meta({description: 'Secret generated from Last.fm/Libre.fm account'}), - LASTFM_REDIRECT_URI: z.string().optional().meta({description: 'Optional URI to use for callback.'}), - LASTFM_SESSION: z.string().optional().meta({description: 'Optional session id returned from a completed auth flow'}), + LASTFM_API_KEY: lastfmDataSchema.shape.apiKey, + LASTFM_SECRET: lastfmDataSchema.shape.secret, + LASTFM_REDIRECT_URI: lastfmDataSchema.shape.redirectUri, + LASTFM_SESSION: lastfmDataSchema.shape.session, }); export const envSchemas: EnvClientSchema = { diff --git a/src/backend/common/infrastructure/config/client/librefm.ts b/src/backend/common/infrastructure/config/client/librefm.ts index 73ba46ab..b795e642 100644 --- a/src/backend/common/infrastructure/config/client/librefm.ts +++ b/src/backend/common/infrastructure/config/client/librefm.ts @@ -63,11 +63,11 @@ export const librefmDataSchema = z.object({ export type LibrefmData = z.infer; const envDataSchema = z.object({ - LIBREFM_API_KEY: z.string().optional().meta({description: 'Optional Secret for Libre.fm account'}), - LIBREFM_SECRET: z.string().optional().meta({description: 'Optional Secret for Libre.fm account'}), - LIBREFM_REDIRECT_URI: z.string().optional().meta({description: 'Optional URI to use for callback.'}), - LIBREFM_SESSION: z.string().optional().meta({description: 'Optional session id returned from a completed auth flow'}), - LIBREFM_URLBASE: z.string().optional().meta({description: '(Optional) The host and path prefix for your Libre.fm instance'}), + LIBREFM_API_KEY: librefmDataSchema.shape.apiKey, + LIBREFM_SECRET: librefmDataSchema.shape.secret, + LIBREFM_REDIRECT_URI: librefmDataSchema.shape.redirectUri, + LIBREFM_SESSION: librefmDataSchema.shape.session, + LIBREFM_URLBASE: librefmDataSchema.shape.urlBase, }); export const envSchemas: EnvClientSchema = { diff --git a/src/backend/common/infrastructure/config/client/listenbrainz.ts b/src/backend/common/infrastructure/config/client/listenbrainz.ts index bed0a33f..d383219a 100644 --- a/src/backend/common/infrastructure/config/client/listenbrainz.ts +++ b/src/backend/common/infrastructure/config/client/listenbrainz.ts @@ -37,9 +37,9 @@ export const listenBrainzDataSchema = z.object({ export type ListenBrainzData = z.infer; const envDataSchema = z.object({ - LZ_URL: z.string().optional().meta({description: 'URL for the ListenBrainz server, if not using the default'}), - LZ_TOKEN: z.string().meta({description: 'User token for the user to scrobble for'}), - LZ_USER: z.string().meta({description: 'Username of the user to scrobble for'}), + LZ_URL: listenBrainzDataSchema.shape.url, + LZ_TOKEN: listenBrainzDataSchema.shape.token, + LZ_USER: listenBrainzDataSchema.shape.username, }); export const envSchemas: EnvClientSchema = { diff --git a/src/backend/common/infrastructure/config/client/maloja.ts b/src/backend/common/infrastructure/config/client/maloja.ts index 6d18d689..9bc1c2ba 100644 --- a/src/backend/common/infrastructure/config/client/maloja.ts +++ b/src/backend/common/infrastructure/config/client/maloja.ts @@ -32,8 +32,8 @@ export const malojaClientDataSchema = malojaDataSchema.extend(commonClientDataSc export type MalojaClientData = z.infer; const envDataSchema = z.object({ - MALOJA_URL: z.string().meta({description: 'Base URL of your installation'}), - MALOJA_API_KEY: z.string() + MALOJA_URL: malojaDataSchema.shape.url, + MALOJA_API_KEY: malojaDataSchema.shape.apiKey }); export const envSchemas: EnvClientSchema = { diff --git a/src/backend/common/infrastructure/config/client/rocksky.ts b/src/backend/common/infrastructure/config/client/rocksky.ts index b010c900..d91bb56d 100644 --- a/src/backend/common/infrastructure/config/client/rocksky.ts +++ b/src/backend/common/infrastructure/config/client/rocksky.ts @@ -41,9 +41,9 @@ export const rockSkyDataSchema = z.object({ export type RockSkyData = z.infer; const envDataSchema = z.object({ - ROCKSKY_KEY: z.string().optional().meta({description: 'API Key generated from API Applications in Rocksky for your account'}), - ROCKSKY_TOKEN: z.string().optional().meta({description: 'Access Token generated from https://rocksky.app/access-tokens in Rocksky for your account'}), - ROCKSKY_HANDLE: z.string().meta({description: 'The fully-qualified handle for your ATPRoto/Bluesky account'}), + ROCKSKY_KEY: rockSkyDataSchema.shape.key, + ROCKSKY_TOKEN: rockSkyDataSchema.shape.token, + ROCKSKY_HANDLE: rockSkyDataSchema.shape.handle, }); export const envSchemas: EnvClientSchema = { diff --git a/src/backend/common/infrastructure/config/client/tealfm.ts b/src/backend/common/infrastructure/config/client/tealfm.ts index 8f2684a5..72ccce82 100644 --- a/src/backend/common/infrastructure/config/client/tealfm.ts +++ b/src/backend/common/infrastructure/config/client/tealfm.ts @@ -21,8 +21,8 @@ export const tealDataSchema = z.object({ export type TealData = z.infer; const envDataSchema = z.object({ - TEALFM_IDENTIFIER: z.string().meta({description: 'Identify the account to login as'}), - TEALFM_APP_PW: z.string().optional().meta({description: 'The App Password you created for your account'}), + TEALFM_IDENTIFIER: tealDataSchema.shape.identifier, + TEALFM_APP_PW: tealDataSchema.shape.appPassword, }); export const envSchemas: EnvClientSchema = {