From 823dd5d01114f20c152020893f2fbc377b9bf26b Mon Sep 17 00:00:00 2001 From: FoxxMD Date: Tue, 11 Aug 2026 18:32:42 +0000 Subject: [PATCH] fix: Hand-roll applemusic env fixture data --- .../common/infrastructure/config/source/applemusic.ts | 8 +++++--- src/backend/tests/config/config.test.ts | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/backend/common/infrastructure/config/source/applemusic.ts b/src/backend/common/infrastructure/config/source/applemusic.ts index e50f7806..9b49c287 100644 --- a/src/backend/common/infrastructure/config/source/applemusic.ts +++ b/src/backend/common/infrastructure/config/source/applemusic.ts @@ -24,7 +24,9 @@ export const appleMusicDataSchema = z.object({ * * @examples ["https://music.apple.com"] */ - origin: z.string().optional().meta({ + origin: z.url({ + protocol: /^https$/, + }).optional().meta({ description: "Origin header to include in every Apple Music API request.", examples: ["https://music.apple.com"] }), @@ -88,7 +90,7 @@ const envDataSchema = z.object({ APPLEMUSIC_TEAM_ID: appleMusicKeySchema.shape.teamId.optional(), APPLEMUSIC_KEY_P8: appleMusicKeySchema.shape.p8.optional(), APPLEMUSIC_MEDIA_USER_TOKEN: appleMusicDataSchema.shape.mediaUserToken, - APPLEMUSIC_TOKEN: appleMusicDataSchema.shape.token, + APPLEMUSIC_TOKEN: appleMusicDataSchema.shape.token.optional(), APPLEMUSIC_ORIGIN_HEADER: appleMusicDataSchema.shape.origin, APPLEMUSIC_RECOVER_UNCHANGED_TOP_HISTORY: z.stringbool().optional().meta(appleMusicOptions.shape.recoverUnchangedTopHistory.meta()), APPLEMUSIC_NORMALIZE_ALBUM: z.stringbool().optional().meta(appleMusicOptions.shape.normalizeAlbum.meta()) @@ -104,7 +106,7 @@ export const envSchemas: EnvSourceSchema partial[x] !== undefined)) { for(const k of envKeyKeys) { if(partial[k] === undefined) { - throw new SimpleError(`ENV ${partial[k]} is not defined but when providing auth via MusicKit Key you must provide all of these: ${envKeyKeys.join(', ')}`); + throw new SimpleError(`ENV ${k} is not defined but when providing auth via MusicKit Key you must provide all of these: ${envKeyKeys.join(', ')}`); } appleMusicKey = { id: partial.APPLEMUSIC_KEY_ID, diff --git a/src/backend/tests/config/config.test.ts b/src/backend/tests/config/config.test.ts index 9c9efd60..0b09c840 100644 --- a/src/backend/tests/config/config.test.ts +++ b/src/backend/tests/config/config.test.ts @@ -125,6 +125,13 @@ describe('Sample Configs', function () { case 'rocksky': zocObj = zocObj.supply(envSchema.env.shape.SOURCE_ROCKSKY_HANDLE, 'foxxmd.dev') break; + case 'applemusic': + delete zocObj.schema.shape.APPLEMUSIC_KEY_ID; + delete zocObj.schema.shape.APPLEMUSIC_TEAM_ID; + delete zocObj.schema.shape.APPLEMUSIC_KEY_P8 + zocObj = zocObj.supply(envSchema.env.shape.APPLEMUSIC_MEDIA_USER_TOKEN, '1234') + .supply(envSchema.env.shape.APPLEMUSIC_TOKEN, '5678') + .supply(envSchema.env.shape.APPLEMUSIC_ORIGIN_HEADER, 'https://apple.music.com'); } const componentMockData = zocObj.generate(); const primitives = generateCommonComponentEnvConfigSchema(envSchema.prefix.toLocaleUpperCase()); -- 2.51.2