From 884db2463ca7965f87aee42941787f749c4ee482 Mon Sep 17 00:00:00 2001 From: saurabh yadav Date: Mon, 15 Jan 2024 01:51:29 +0530 Subject: [PATCH] #fix 55 --- .env.example | 5 +++++ apps/server/src/app/lib/endpoint.ts | 4 ++-- apps/server/src/app/lib/postmark.ts | 3 +-- apps/server/src/env.ts | 4 ---- apps/workers/src/app/lib/di.ts | 4 ++-- apps/workers/src/app/lib/postmark.ts | 3 +-- apps/workers/src/env.ts | 3 --- 7 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.env.example b/.env.example index dcf61999..ae14be31 100644 --- a/.env.example +++ b/.env.example @@ -22,3 +22,8 @@ NX_FINICITY_PARTNER_SECRET= NX_CONVERTKIT_SECRET= NEXT_PUBLIC_ZAPIER_FEEDBACK_HOOK_URL= + +# Postmark API keys (https://postmarkapp.com) +NX_POSTMARK_FROM_ADDRESS= account@maybe.co +NX_POSTMARK_REPLY_TO_ADDRESS= support@maybe.co +NX_POSTMARK_API_TOKEN= \ No newline at end of file diff --git a/apps/server/src/app/lib/endpoint.ts b/apps/server/src/app/lib/endpoint.ts index 535dd45f..61e807f8 100644 --- a/apps/server/src/app/lib/endpoint.ts +++ b/apps/server/src/app/lib/endpoint.ts @@ -78,8 +78,8 @@ export const emailService: IEmailService = new EmailService( logger.child({ service: 'EmailService' }), postmark, { - from: env.NX_POSTMARK_FROM_ADDRESS, - replyTo: env.NX_POSTMARK_REPLY_TO_ADDRESS, + from: process.env.NX_POSTMARK_FROM_ADDRESS || 'account@maybe.co', + replyTo: process.env.NX_POSTMARK_REPLY_TO_ADDRESS, } ) diff --git a/apps/server/src/app/lib/postmark.ts b/apps/server/src/app/lib/postmark.ts index 48eddf1b..1c190ecd 100644 --- a/apps/server/src/app/lib/postmark.ts +++ b/apps/server/src/app/lib/postmark.ts @@ -1,6 +1,5 @@ import { ServerClient } from 'postmark' -import env from '../../env' -const postmark = new ServerClient(env.NX_POSTMARK_API_TOKEN) +const postmark = new ServerClient(process.env.NX_POSTMARK_API_TOKEN || '') export default postmark diff --git a/apps/server/src/env.ts b/apps/server/src/env.ts index e27169ed..a83cf0eb 100644 --- a/apps/server/src/env.ts +++ b/apps/server/src/env.ts @@ -69,10 +69,6 @@ const envSchema = z.object({ // Key to Cloudfront pub key NX_CDN_SIGNER_PUBKEY_ID: z.string().default('REPLACE_THIS'), - - NX_POSTMARK_FROM_ADDRESS: z.string().default('account@maybe.co'), - NX_POSTMARK_REPLY_TO_ADDRESS: z.string().default('support@maybe.co'), - NX_POSTMARK_API_TOKEN: z.string().default('REPLACE_THIS'), }) const env = envSchema.parse(process.env) diff --git a/apps/workers/src/app/lib/di.ts b/apps/workers/src/app/lib/di.ts index 55f3341a..2b04e582 100644 --- a/apps/workers/src/app/lib/di.ts +++ b/apps/workers/src/app/lib/di.ts @@ -266,8 +266,8 @@ export const emailService: IEmailService = new EmailService( logger.child({ service: 'EmailService' }), postmark, { - from: env.NX_POSTMARK_FROM_ADDRESS, - replyTo: env.NX_POSTMARK_REPLY_TO_ADDRESS, + from: process.env.NX_POSTMARK_FROM_ADDRESS || 'account@maybe.co', + replyTo: process.env.NX_POSTMARK_REPLY_TO_ADDRESS, } ) diff --git a/apps/workers/src/app/lib/postmark.ts b/apps/workers/src/app/lib/postmark.ts index 48eddf1b..1c190ecd 100644 --- a/apps/workers/src/app/lib/postmark.ts +++ b/apps/workers/src/app/lib/postmark.ts @@ -1,6 +1,5 @@ import { ServerClient } from 'postmark' -import env from '../../env' -const postmark = new ServerClient(env.NX_POSTMARK_API_TOKEN) +const postmark = new ServerClient(process.env.NX_POSTMARK_API_TOKEN || '') export default postmark diff --git a/apps/workers/src/env.ts b/apps/workers/src/env.ts index b9632599..83d2a297 100644 --- a/apps/workers/src/env.ts +++ b/apps/workers/src/env.ts @@ -24,9 +24,6 @@ const envSchema = z.object({ NX_POLYGON_API_KEY: z.string().default(''), - NX_POSTMARK_FROM_ADDRESS: z.string().default('account@maybe.co'), - NX_POSTMARK_REPLY_TO_ADDRESS: z.string().default('support@maybe.co'), - NX_POSTMARK_API_TOKEN: z.string().default('REPLACE_THIS'), NX_STRIPE_SECRET_KEY: z.string().default('sk_test_REPLACE_THIS'), NX_CDN_PRIVATE_BUCKET: z.string().default('REPLACE_THIS'),