Removed setting email_from's email in order to be compatible with AWS SES policies (#741)

rajat1saxena · Rajat · web-flow · commit 63dddcb524b0 · 2026-03-14T18:02:32.000+05:30
Co-authored-by: Rajat &lt;hi@rajatsaxena.dev&gt;
diff --git a/apps/queue/.env b/apps/queue/.env
@@ -2,6 +2,7 @@ PORT=4000
 EMAIL_USER=email_user
 EMAIL_PASS=email_pass
 EMAIL_HOST=email_host
+EMAIL_FROM=no-reply@example.com
 DB_CONNECTION_STRING=mongodb://db.string
 REDIS_HOST=localhost
 REDIS_PORT=6379
diff --git a/apps/queue/src/domain/__tests__/process-ongoing-sequences.test.ts b/apps/queue/src/domain/__tests__/process-ongoing-sequences.test.ts
@@ -15,7 +15,7 @@ import EmailDelivery from "../model/email-delivery";
 import * as queries from "../queries";
 import * as mail from "../../mail";
 import { AdminSequence, InternalUser } from "@courselit/common-logic";
-import { jwtUtils } from "@courselit/utils";
+import { getEmailFrom, jwtUtils } from "@courselit/utils";
 import { getUnsubLink } from "../../utils/get-unsub-link";
 import { getSiteUrl } from "../../utils/get-site-url";
 import { sequenceBounceLimit } from "../../constants";
@@ -77,6 +77,9 @@ jest.mock("liquidjs", () => {
 const mockedSendMail = mail.sendMail as jest.MockedFunction<
     typeof mail.sendMail
 >;
+const mockedGetEmailFrom = getEmailFrom as jest.MockedFunction<
+    typeof getEmailFrom
+>;
 const mockedJwtUtils = jwtUtils as jest.Mocked<typeof jwtUtils>;
 const mockedGetUnsubLink = getUnsubLink as jest.MockedFunction<
     typeof getUnsubLink
@@ -100,6 +103,7 @@ describe("processOngoingSequence", () => {
         process.env.PROTOCOL = "https";
         process.env.DOMAIN = "test.com";
         process.env.NODE_ENV = "test";
+        process.env.EMAIL_FROM = "verified-sender@example.com";
 
         // Create test domain
         testDomain = await (DomainModel.create as any)({
@@ -265,6 +269,9 @@ describe("processOngoingSequence", () => {
         mockedGetUnsubLink.mockReturnValue(
             "https://test.com/api/unsubscribe/unsub-token-123",
         );
+        mockedGetEmailFrom.mockImplementation(
+            ({ name, email }) => `${name} <${email}>`,
+        );
         mockedJwtUtils.generateToken = jest.fn().mockReturnValue("test-token");
         // renderEmailToHtml is not mocked - we test the real email formatting
         mockedSendMail.mockResolvedValue(undefined);
@@ -466,7 +473,9 @@ describe("processOngoingSequence", () => {
             // Verify email was sent
             expect(mockedSendMail).toHaveBeenCalledWith(
                 expect.objectContaining({
-                    from: expect.stringContaining("queue-creator@example.com"),
+                    from: expect.stringContaining(
+                        "verified-sender@example.com",
+                    ),
                     to: "queue-user@example.com",
                     subject: "First Email",
                     html: expect.any(String),
diff --git a/apps/queue/src/domain/process-drip.ts b/apps/queue/src/domain/process-drip.ts
@@ -5,6 +5,7 @@ import { Liquid } from "liquidjs";
 import { getDomain, getMemberships } from "./queries";
 import { Constants } from "@courselit/common-models";
 import { InternalCourse, InternalUser } from "@courselit/common-logic";
+import { getEmailFrom } from "@courselit/utils";
 import { FilterQuery, UpdateQuery } from "mongoose";
 import { renderEmailToHtml } from "@courselit/email-editor";
 import { getSiteUrl } from "../utils/get-site-url";
@@ -146,9 +147,10 @@ export async function processDrip() {
                                     firstGroupWithDripEmailSet.drip.email
                                         .subject,
                                 body: content,
-                                from: `${creator?.name || creator?.email} <${
-                                    creator?.email
-                                }>`,
+                                from: getEmailFrom({
+                                    name: creator?.name || creator?.email || "",
+                                    email: process.env.EMAIL_FROM || "",
+                                }),
                             });
                         }
                     }
diff --git a/apps/queue/src/domain/process-ongoing-sequences/process-ongoing-sequence.ts b/apps/queue/src/domain/process-ongoing-sequences/process-ongoing-sequence.ts
@@ -19,7 +19,7 @@ import { AdminSequence, InternalUser } from "@courselit/common-logic";
 import { Email as EmailType, renderEmailToHtml } from "@courselit/email-editor";
 import { getUnsubLink } from "@/utils/get-unsub-link";
 import { getSiteUrl } from "@/utils/get-site-url";
-import { jwtUtils } from "@courselit/utils";
+import { getEmailFrom, jwtUtils } from "@courselit/utils";
 import { JSDOM } from "jsdom";
 import { DomainDocument } from "@/domain/model/domain";
 import { Liquid } from "liquidjs";
@@ -150,9 +150,10 @@ async function attemptMailSending({
     email: Email;
     domain: DomainDocument;
 }) {
-    const from = sequence.from
-        ? `${sequence.from.name} <${creator.email}>`
-        : `${creator.email} <${creator.email}>`;
+    const from = getEmailFrom({
+        name: sequence.from?.name || creator.name || creator.email,
+        email: process.env.EMAIL_FROM || "",
+    });
     const to = user.email;
     const subject = email.subject;
     const unsubscribeLink = getUnsubLink(domain, user.unsubscribeToken);
diff --git a/apps/queue/src/notifications/services/channels/email.ts b/apps/queue/src/notifications/services/channels/email.ts
@@ -44,7 +44,7 @@ export class EmailChannel implements NotificationChannel {
             to: [payload.recipient.email],
             from: getEmailFrom({
                 name: payload.domain.settings?.title || payload.domain.name,
-                email: process.env.EMAIL_FROM || payload.domain.email,
+                email: process.env.EMAIL_FROM || "",
             }),
             subject: notificationDetails.message,
             body: `
diff --git a/apps/web/auth.ts b/apps/web/auth.ts
@@ -2,10 +2,10 @@ import { APIError, betterAuth } from "better-auth";
 import { customSession, emailOTP } from "better-auth/plugins";
 import { MongoClient } from "mongodb";
 import DomainModel, { Domain } from "@models/Domain";
+import { getEmailFrom } from "@courselit/utils";
 import { addMailJob } from "@/services/queue";
 import pug from "pug";
 import MagicCodeEmailTemplate from "@/templates/magic-code-email";
-import { generateEmailFrom } from "@/lib/utils";
 import { responses } from "@/config/strings";
 import { mongodbAdapter } from "@/ba-multitenant-adapter";
 import { updateUserAfterCreationViaAuth } from "./graphql/users/logic";
@@ -52,15 +52,12 @@ const config: any = {
                     to: [email],
                     subject: `${responses.sign_in_mail_prefix} ${ctx!.headers?.get("host")}`,
                     body: emailBody,
-                    from: generateEmailFrom({
+                    from: getEmailFrom({
                         name:
                             ctx!.headers?.get("domaintitle") ||
                             ctx!.headers?.get("domain") ||
                             "",
-                        email:
-                            process.env.EMAIL_FROM ||
-                            ctx!.headers?.get("domainemail") ||
-                            "",
+                        email: process.env.EMAIL_FROM || "",
                     }),
                 });
             },
diff --git a/apps/web/graphql/mails/helpers.ts b/apps/web/graphql/mails/helpers.ts
@@ -1,13 +1,13 @@
 import RuleModel from "@models/Rule";
 import { Email, Rule, Sequence, User } from "@courselit/common-models";
+import { getEmailFrom } from "@courselit/utils";
 import GQLContext from "@models/GQLContext";
 import mongoose from "mongoose";
 import SearchData from "./models/search-data";
 import DownloadLinkModel from "@models/DownloadLink";
 import pug from "pug";
 import digitalDownloadTemplate from "../../templates/download-link";
 import { responses } from "@config/strings";
-import { generateEmailFrom } from "@/lib/utils";
 import { addMailJob } from "@/services/queue";
 import { EmailBlock } from "@courselit/email-editor";
 import UserModel from "@models/User";
@@ -103,9 +103,9 @@ export async function createTemplateAndSendMail({
         to: [user.email],
         subject: `Thank you for signing up for ${course.title}`,
         body: emailBody,
-        from: generateEmailFrom({
+        from: getEmailFrom({
             name: ctx.subdomain?.settings?.title || ctx.subdomain.name,
-            email: process.env.EMAIL_FROM || ctx.subdomain.email,
+            email: process.env.EMAIL_FROM || "",
         }),
     });
 }
diff --git a/apps/web/graphql/users/logic.ts b/apps/web/graphql/users/logic.ts
@@ -238,7 +238,7 @@ export const inviteCustomer = async (
             body: emailBody,
             from: getEmailFrom({
                 name: ctx.subdomain?.settings?.title || ctx.subdomain.name,
-                email: process.env.EMAIL_FROM || ctx.subdomain.email,
+                email: process.env.EMAIL_FROM || "",
             }),
         });
     } catch (error) {
diff --git a/apps/web/lib/utils.ts b/apps/web/lib/utils.ts
@@ -37,16 +37,6 @@ export const getProtocol = (protocol: string | string[] = "http") => {
     return protocol.includes("https") ? "https" : "http";
 };
 
-export const generateEmailFrom = ({
-    name,
-    email,
-}: {
-    name: string;
-    email: string;
-}) => {
-    return `${name} <${email}>`;
-};
-
 export const hasPermissionToAccessSetupChecklist = (
     userPermissions: string[],
 ) => {
