Use astro:env for RESEND env vars

Author: webstackdev

src/pages/api/newsletter/_email.ts

@@ -4,27 +4,15 @@
  */
 
 import { Resend } from 'resend'
-import { ClientScriptError } from '@components/scripts/errors/ClientScriptError'
+import { RESEND_API_KEY } from 'astro:env/server'
+import { ClientScriptError } from '@components/scripts/errors'
+import { getSiteUrl, isDev, isTest } from '@components/scripts/utils'
 
 /**
  * Initialize Resend client
- * API key must be set in RESEND_API_KEY environment variable
  */
 function getResendClient(): Resend {
-  const apiKey = import.meta.env.RESEND_API_KEY
-  if (!apiKey) {
-    throw new ClientScriptError({
-      message: `RESEND_API_KEY environment variable is not set`
-    })
-  }
-  return new Resend(apiKey)
-}
-
-/**
- * Get the site URL from environment or default to localhost
- */
-function getSiteUrl(): string {
-  return import.meta.env.SITE || 'http://localhost:4321'
+  return new Resend(RESEND_API_KEY)
 }
 
 /**
@@ -206,9 +194,7 @@ export async function sendConfirmationEmail(
   firstName?: string
 ): Promise<void> {
   // Skip actual email sending in dev/test environments
-  const isDevOrTest = process.env['NODE_ENV'] === 'development' || process.env['NODE_ENV'] === 'test' || process.env['CI'] === 'true'
-
-  if (isDevOrTest) {
+  if (isDev() || isTest()) {
     console.log('[DEV/TEST MODE] Newsletter confirmation email would be sent:', { email, token })
     return
   }
@@ -261,9 +247,7 @@ export async function sendWelcomeEmail(
   firstName?: string
 ): Promise<void> {
   // Skip actual email sending in dev/test environments
-  const isDevOrTest = process.env['NODE_ENV'] === 'development' || process.env['NODE_ENV'] === 'test' || process.env['CI'] === 'true'
-
-  if (isDevOrTest) {
+  if (isDev() || isTest()) {
     console.log('[DEV/TEST MODE] Newsletter welcome email would be sent:', { email })
     return
   }

src/pages/api/newsletter/index.ts

@@ -6,7 +6,9 @@
  */
 import type { APIRoute } from 'astro'
 import { v4 as uuidv4, validate as uuidValidate } from 'uuid'
-import { ClientScriptError } from '@components/scripts/errors/ClientScriptError'
+import { CONVERTKIT_API_KEY } from 'astro:env/server'
+import { ClientScriptError } from '@components/scripts/errors'
+import { isDev, isTest } from '@components/scripts/utils'
 import { rateLimiters, checkRateLimit } from '@pages/api/_utils/rateLimit'
 import type { ErrorResponse } from '@pages/api/_contracts/gdpr.contracts'
 import { createPendingSubscription } from './_token'
@@ -78,9 +80,7 @@ export async function subscribeToConvertKit(
   data: NewsletterFormData
 ): Promise<ConvertKitResponse> {
   // Skip actual ConvertKit API call in dev/test environments
-  const isDevOrTest = import.meta.env.DEV || import.meta.env.MODE === 'test' || process.env['NODE_ENV'] === 'test'
-
-  if (isDevOrTest) {
+  if (isDev() || isTest()) {
     console.log('[DEV/TEST MODE] Newsletter subscription would be created:', { email: data.email })
     // Return mock success response
     return {
@@ -97,14 +97,6 @@ export async function subscribeToConvertKit(
     }
   }
 
-  const apiKey = import.meta.env['CONVERTKIT_API_KEY']
-
-  if (!apiKey) {
-    throw new ClientScriptError({
-      message: 'ConvertKit API key is not configured.'
-    })
-  }
-
   /* eslint-disable camelcase */
   const subscriberData: ConvertKitSubscriber = {
     email_address: data.email,
@@ -121,7 +113,7 @@ export async function subscribeToConvertKit(
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
-        'X-Kit-Api-Key': apiKey,
+        'X-Kit-Api-Key': CONVERTKIT_API_KEY,
       },
       body: JSON.stringify(subscriberData),
     })
@@ -247,7 +239,7 @@ export const POST: APIRoute = async ({ request, clientAddress }) => {
 			...(firstName && { firstName }),
 			DataSubjectId: subjectId,
 			userAgent: request.headers.get('user-agent') || 'unknown',
-			...(clientAddress !== 'unknown' && { clientAddress: ip }),
+			...(clientAddress !== 'unknown' && { clientAddress }),
 			source: 'newsletter_form',
 		})