fix: remove EMAIL_FROM priority over dynamic handles

Author: yash-pouranik

apps/public-api/src/controllers/mail.controller.js

@@ -354,7 +354,7 @@ const resolveResendClient = async (req) => {
     throw err;
   }
 
-  let fromAddress = project?.resendFromEmail?.trim() || process.env.EMAIL_FROM;
+  let fromAddress = project?.resendFromEmail?.trim();
   if (!fromAddress) {
     const { generateDynamicFromAddress } = require("@urbackend/common/src/utils/emailService");
     fromAddress = generateDynamicFromAddress(project.name);

packages/common/src/queues/publicEmailQueue.js

@@ -36,7 +36,7 @@ const initPublicEmailWorker = () => {
         const { projectId, payload, usingByok, consumedQuotaKey, templateUsed, projectName } = job.data;
 
         let clientKey = process.env.RESEND_API_KEY_2 || process.env.RESEND_API_KEY;
-        let fromAddress = process.env.EMAIL_FROM;
+        let fromAddress = null;
 
         try {
             if (projectId) {
@@ -63,7 +63,7 @@ const initPublicEmailWorker = () => {
                 const { generateDynamicFromAddress } = require('../utils/emailService');
                 fromAddress = generateDynamicFromAddress(projectName);
             } else {
-                fromAddress = "urBackend <urbackend@apps.bitbros.in>";
+                fromAddress = process.env.EMAIL_FROM || "urBackend <urbackend@apps.bitbros.in>";
             }
         }
 

packages/common/src/utils/emailService.js

@@ -226,9 +226,7 @@ async function sendAuthOtpEmail(email, { otp, type, pname, byokKey, byokFrom })
 
 
         let mailClient = resend;
-        let fromAddress = process.env.EMAIL_FROM
-            ? formatFromAddress(process.env.EMAIL_FROM)
-            : generateDynamicFromAddress(rawPname);
+        let fromAddress = generateDynamicFromAddress(rawPname);
 
         if (byokKey) {
             mailClient = new Resend(byokKey);