fix: include project name in DB select for dynamic email fromAddress

Author: yash-pouranik

apps/public-api/src/__tests__/mail.controller.test.js

@@ -58,6 +58,7 @@ jest.mock('@urbackend/common', () => {
             })),
         },
         decrypt: jest.fn(),
+        generateDynamicFromAddress: jest.fn((name) => `mock <mock@apps.bitbros.in>`),
         redis: redisMock,
         getPlanLimits: jest.fn(() => ({ mailPerMonth: 100 })),
         publicEmailQueue: {

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

@@ -13,7 +13,7 @@ const getMailCountKey = (projectId, monthKey) =>
 
 const loadProjectMailConfig = async (projectId) => {
   return Project.findById(projectId)
-    .select("+resendApiKey.encrypted +resendApiKey.iv +resendApiKey.tag resendFromEmail +mailTemplates")
+    .select("+resendApiKey.encrypted +resendApiKey.iv +resendApiKey.tag resendFromEmail +mailTemplates name")
     .lean();
 };
 
@@ -342,7 +342,7 @@ const resolveResendClient = async (req) => {
     throw err;
   }
 
-  const project = await Project.findById(projectId).select("+resendApiKey.encrypted +resendApiKey.iv +resendApiKey.tag resendFromEmail").lean();
+  const project = await Project.findById(projectId).select("+resendApiKey.encrypted +resendApiKey.iv +resendApiKey.tag resendFromEmail name").lean();
   const encryptedByokKey = project?.resendApiKey && Object.keys(project.resendApiKey).length > 0 ? project.resendApiKey : null;
   const decryptedByokKey = encryptedByokKey ? decrypt(encryptedByokKey) : null;
   const usingByok = typeof decryptedByokKey === "string" && decryptedByokKey.trim().length > 0;
@@ -356,8 +356,8 @@ const resolveResendClient = async (req) => {
 
   let fromAddress = project?.resendFromEmail?.trim();
   if (!fromAddress) {
-    const { generateDynamicFromAddress } = require("@urbackend/common/src/utils/emailService");
-    fromAddress = generateDynamicFromAddress(project.name);
+    const { generateDynamicFromAddress } = require("@urbackend/common");
+    fromAddress = generateDynamicFromAddress(project?.name);
   }
 
   return { 

packages/common/src/index.js

@@ -70,6 +70,8 @@ const {
   sendReleaseEmail,
   sendAuthOtpEmail,
   sendProRequestConfirmationEmail,
+  formatFromAddress,
+  generateDynamicFromAddress,
 } = require("./utils/emailService");
 const {
   loginSchema,
@@ -161,6 +163,8 @@ module.exports = {
   sendReleaseEmail,
   sendAuthOtpEmail,
   sendProRequestConfirmationEmail,
+  formatFromAddress,
+  generateDynamicFromAddress,
   loginSchema,
   signupSchema,
   changePasswordSchema,