Correct environment variable names for new email settings

Signed-off-by: Erin Allison <[email protected]>

Author: erin-allison

apps/webapp/app/env.server.ts

@@ -44,7 +44,7 @@ const EnvironmentSchema = z.object({
   HIGHLIGHT_PROJECT_ID: z.string().optional(),
   AUTH_GITHUB_CLIENT_ID: z.string().optional(),
   AUTH_GITHUB_CLIENT_SECRET: z.string().optional(),
-  EMAIL_SERVICE: z.enum(["resend", "smtp", "aws-ses"]).default("resend"),
+  EMAIL_TRANSPORT: z.enum(["resend", "smtp", "aws-ses"]).optional(),
   FROM_EMAIL: z.string().optional(),
   REPLY_TO_EMAIL: z.string().optional(),
   RESEND_API_KEY: z.string().optional(),
@@ -202,7 +202,7 @@ const EnvironmentSchema = z.object({
   ORG_SLACK_INTEGRATION_CLIENT_SECRET: z.string().optional(),
 
   /** These enable the alerts feature in v3 */
-  ALERT_EMAIL_SERVICE: z.union([z.literal("resend"), z.literal("smtp"), z.literal("aws-ses")]).default("resend"),
+  ALERT_EMAIL_TRANSPORT: z.enum(["resend", "smtp", "aws-ses"]).optional(),
   ALERT_FROM_EMAIL: z.string().optional(),
   ALERT_REPLY_TO_EMAIL: z.string().optional(),
   ALERT_RESEND_API_KEY: z.string().optional(),

apps/webapp/app/services/email.server.ts

@@ -14,7 +14,7 @@ const client = singleton(
   "email-client",
   () =>
     new EmailClient({
-      transport: buildTransportOptions(false),
+      transport: buildTransportOptions(),
       imagesBaseUrl: env.APP_ORIGIN,
       from: env.FROM_EMAIL ?? "[email protected]",
       replyTo: env.REPLY_TO_EMAIL ?? "[email protected]",
@@ -33,7 +33,10 @@ const alertsClient = singleton(
 );
 
 function buildTransportOptions(alerts?: boolean): MailTransportOptions {
-  switch (alerts ? env.ALERT_EMAIL_SERVICE : env.EMAIL_SERVICE) {
+  const transportType = alerts ? env.ALERT_EMAIL_TRANSPORT : env.EMAIL_TRANSPORT
+  logger.debug(`Constructing email transport '${transportType}' for usage '${alerts?'alerts':'general'}'`)
+
+  switch (transportType) {
     case "aws-ses":
       return { type: "aws-ses" };
     case "resend":
@@ -52,7 +55,7 @@ function buildTransportOptions(alerts?: boolean): MailTransportOptions {
           secure: alerts ? env.ALERT_SMTP_SECURE : env.ALERT_SMTP_SECURE,
           auth: {
             user: alerts ? env.ALERT_SMTP_USER : env.SMTP_USER,
-            password: alerts ? env.ALERT_SMTP_PASSWORD : env.SMTP_PASSWORD
+            pass: alerts ? env.ALERT_SMTP_PASSWORD : env.SMTP_PASSWORD
           }
         }
       };