fix: make public api email fromAddress dynamic by project name

Author: yash-pouranik

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

@@ -303,7 +303,8 @@ module.exports.sendMail = async (req, res, next) => {
       payload,
       usingByok,
       consumedQuotaKey,
-      templateUsed
+      templateUsed,
+      projectName: project.name
     }, {
       attempts: 3,
       backoff: { type: 'exponential', delay: 5000 }
@@ -353,11 +354,17 @@ const resolveResendClient = async (req) => {
     throw err;
   }
 
+  let fromAddress = project?.resendFromEmail?.trim() || process.env.EMAIL_FROM;
+  if (!fromAddress) {
+    const { generateDynamicFromAddress } = require("@urbackend/common/src/utils/emailService");
+    fromAddress = generateDynamicFromAddress(project.name);
+  }
+
   return { 
     resend: new Resend(apiKey), 
     apiKey, 
     usingByok,
-    fromAddress: project?.resendFromEmail?.trim() || process.env.EMAIL_FROM || `Notification from ${project.name} <urbackend@apps.bitbros.in>`
+    fromAddress
   };
 };
 

packages/common/src/queues/publicEmailQueue.js

@@ -33,21 +33,23 @@ const initPublicEmailWorker = () => {
 
     // Initialize Worker with Rate Limiting (10 per second to respect Resend limits)
     worker = new Worker('public-email-queue', async (job) => {
-        const { projectId, payload, usingByok, consumedQuotaKey, templateUsed } = job.data;
+        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 || "urBackend <urbackend@apps.bitbros.in>";
+        let fromAddress = process.env.EMAIL_FROM;
 
         try {
-            if (projectId && usingByok) {
-                const project = await Project.findById(projectId).select('+resendApiKey.encrypted +resendApiKey.iv +resendApiKey.tag resendFromEmail').lean();
-                if (project && project.resendApiKey) {
-                    const decrypted = decrypt(project.resendApiKey);
-                    if (typeof decrypted === 'string' && decrypted.trim().length > 0) {
-                        clientKey = decrypted.trim();
-                        fromAddress = project.resendFromEmail && project.resendFromEmail.trim()
-                            ? project.resendFromEmail.trim()
-                            : "onboarding@resend.dev";
+            if (projectId) {
+                if (usingByok) {
+                    const project = await Project.findById(projectId).select('+resendApiKey.encrypted +resendApiKey.iv +resendApiKey.tag resendFromEmail').lean();
+                    if (project && project.resendApiKey) {
+                        const decrypted = decrypt(project.resendApiKey);
+                        if (typeof decrypted === 'string' && decrypted.trim().length > 0) {
+                            clientKey = decrypted.trim();
+                            fromAddress = project.resendFromEmail && project.resendFromEmail.trim()
+                                ? project.resendFromEmail.trim()
+                                : "onboarding@resend.dev";
+                        }
                     }
                 }
             }
@@ -56,6 +58,15 @@ const initPublicEmailWorker = () => {
             // Fallback to global key
         }
 
+        if (!fromAddress) {
+            if (projectName) {
+                const { generateDynamicFromAddress } = require('../utils/emailService');
+                fromAddress = generateDynamicFromAddress(projectName);
+            } else {
+                fromAddress = "urBackend <urbackend@apps.bitbros.in>";
+            }
+        }
+
         if (!clientKey) {
             throw new Error("Resend API key is not configured.");
         }

packages/common/src/utils/emailService.js

@@ -26,6 +26,20 @@ const formatFromAddress = (email_address) => {
 
     return `urBackend <${trimmed}>`;
 };
+
+const generateDynamicFromAddress = (projectName) => {
+    const rawPname = projectName || "urBackend";
+    let safeEmailHandle = rawPname.replace(/[^a-zA-Z0-9]/g, '').toLowerCase();
+    if (safeEmailHandle.length < 3) {
+        safeEmailHandle = "urbackend";
+    }
+    safeEmailHandle = safeEmailHandle.substring(0, 30);
+    const safeDisplayName = rawPname.replace(/[\r\n]/g, '').trim();
+    const finalDisplayName = /^[a-zA-Z0-9 ]+$/.test(safeDisplayName) 
+        ? safeDisplayName 
+        : `"${safeDisplayName.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
+    return `${finalDisplayName} <${safeEmailHandle}@apps.bitbros.in>`;
+};
 
 const defaultFromAddress = formatFromAddress(process.env.EMAIL_FROM);
 const replyToAddress = process.env.EMAIL_REPLY_TO?.trim() || "urbackend@apps.bitbros.in";
@@ -165,19 +179,7 @@ async function sendReleaseEmail(email, { version, title, content, changelogUrl }
     // FUNCTION - SEND AUTH OTP EMAIL
 async function sendAuthOtpEmail(email, { otp, type, pname, byokKey, byokFrom }) {
     const rawPname = pname || "urBackend";
-
-    let safeEmailHandle = rawPname.replace(/[^a-zA-Z0-9]/g, '').toLowerCase();
-    if (safeEmailHandle.length < 3) {
-        safeEmailHandle = "urbackend";
-    }
-    safeEmailHandle = safeEmailHandle.substring(0, 30);
-
     const safeProjectNameHtml = escapeHtml(rawPname);
-
-    const safeDisplayName = rawPname.replace(/[\r\n]/g, '').trim();
-    const finalDisplayName = /^[a-zA-Z0-9 ]+$/.test(safeDisplayName) 
-        ? safeDisplayName 
-        : `"${safeDisplayName.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
 
     const isVerify = type === 'verification';
     const subject = isVerify ? "Verify your account" : "Reset your password";
@@ -226,7 +228,7 @@ async function sendAuthOtpEmail(email, { otp, type, pname, byokKey, byokFrom })
         let mailClient = resend;
         let fromAddress = process.env.EMAIL_FROM
             ? formatFromAddress(process.env.EMAIL_FROM)
-            : `${finalDisplayName} <${safeEmailHandle}.urbackend@apps.bitbros.in>`;
+            : generateDynamicFromAddress(rawPname);
 
         if (byokKey) {
             mailClient = new Resend(byokKey);
@@ -384,4 +386,12 @@ urBackend Team`;
     }
 }
 
-module.exports = { sendOtp, sendReleaseEmail, sendAuthOtpEmail, sendProRequestConfirmationEmail, sendExportReadyEmail };
+module.exports = { 
+    sendOtp, 
+    sendReleaseEmail, 
+    sendAuthOtpEmail, 
+    sendProRequestConfirmationEmail, 
+    sendExportReadyEmail,
+    formatFromAddress,
+    generateDynamicFromAddress
+};