From b2916bd8b81d02e1f5b673ed34c7f0f181d641c2 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Sun, 13 Oct 2024 01:52:14 +0800 Subject: [PATCH] fix: json parse for env VITE_FIREBASE_CONFIG --- apps/main/src/init.ts | 4 ++-- packages/shared/src/env.ts | 22 +--------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/apps/main/src/init.ts b/apps/main/src/init.ts index c6351c5d50..f077c68da2 100644 --- a/apps/main/src/init.ts +++ b/apps/main/src/init.ts @@ -146,7 +146,7 @@ const registerPushNotifications = async () => { const instance = new PushReceiver({ debug: true, - firebase: env.VITE_FIREBASE_CONFIG, + firebase: JSON.parse(env.VITE_FIREBASE_CONFIG), persistentIds: persistentIds || [], credentials: credentials || null, bundleId: "is.follow", @@ -201,7 +201,7 @@ const registerPushNotifications = async () => { try { await instance.connect() } catch (error) { - logger.error(`PushReceiver error: ${error}`) + logger.error(`PushReceiver error: ${error instanceof Error ? error.stack : error}`) } logger.info("PushReceiver connected") diff --git a/packages/shared/src/env.ts b/packages/shared/src/env.ts index 9633434242..ae29ed5102 100644 --- a/packages/shared/src/env.ts +++ b/packages/shared/src/env.ts @@ -11,27 +11,7 @@ export const env = createEnv({ VITE_SENTRY_DSN: z.string().optional(), VITE_POSTHOG_KEY: z.string().optional(), VITE_INBOXES_EMAIL: z.string().default("@follow.re"), - VITE_FIREBASE_CONFIG: z - .string() - .transform((content) => { - try { - return JSON.parse(content) - } catch { - return z.NEVER - } - }) - .pipe( - z.object({ - apiKey: z.string(), - authDomain: z.string(), - projectId: z.string(), - storageBucket: z.string(), - messagingSenderId: z.string(), - appId: z.string(), - measurementId: z.string(), - }), - ) - .optional(), + VITE_FIREBASE_CONFIG: z.string().optional(), }, emptyStringAsUndefined: true,