fix: address copilot review suggestions for byok validation and worker init edge-cases

Author: yash-pouranik

apps/dashboard-api/src/controllers/project.controller.js

@@ -1160,7 +1160,7 @@ module.exports.updateProject = async (req, res) => {
       { $set: updateFields },
       {
         new: true,
-        select:
+        projection:
           "+resendApiKey.encrypted +resendApiKey.iv +resendApiKey.tag",
       },
     );

apps/public-api/src/app.js

@@ -22,10 +22,12 @@ const { capture } = require('@kiroo/sdk');
 const {emailQueue} = require('@urbackend/common');
 const {authEmailQueue} = require('@urbackend/common');
 const {initWebhookWorker} = require('@urbackend/common');
+const {initAuthEmailWorker} = require('@urbackend/common');
 
 // Initialize webhook worker
 if (process.env.NODE_ENV !== 'test') {
     initWebhookWorker();
+    initAuthEmailWorker();
 }
 
 app.use(express.json());

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

@@ -14,7 +14,7 @@ const getMailCountKey = (projectId, monthKey) =>
 
 const loadProjectMailConfig = async (projectId) => {
   return Project.findById(projectId)
-    .select("+resendApiKey.encrypted +resendApiKey.iv +resendApiKey.tag")
+    .select("+resendApiKey.encrypted +resendApiKey.iv +resendApiKey.tag resendFromEmail")
     .lean();
 };
 
@@ -62,16 +62,17 @@ module.exports.sendMail = async (req, res) => {
       return res.status(401).json({ error: "Project context missing." });
     }
 
-    const limit = getMonthlyMailLimit(req.project);
-    const { count, key } = await reserveMonthlyMailSlot(projectId, limit);
-    consumedQuotaKey = key;
-
     const project = await loadProjectMailConfig(projectId);
     if (!project) {
       return res.status(404).json({ error: "Project not found." });
     }
 
-    const decryptedByokKey = decrypt(project.resendApiKey);
+    const encryptedByokKey =
+      project.resendApiKey && typeof project.resendApiKey === "object" && Object.keys(project.resendApiKey).length > 0
+        ? project.resendApiKey
+        : null;
+    const decryptedByokKey = encryptedByokKey ? decrypt(encryptedByokKey) : null;
+
     const usingByok = typeof decryptedByokKey === "string" && decryptedByokKey.trim().length > 0;
     const clientKey = usingByok
       ? decryptedByokKey.trim()
@@ -81,6 +82,10 @@ module.exports.sendMail = async (req, res) => {
       return res.status(500).json({ error: "Resend API key is not configured." });
     }
 
+    const limit = getMonthlyMailLimit(req.project);
+    const { count, key } = await reserveMonthlyMailSlot(projectId, limit);
+    consumedQuotaKey = key;
+
     const resend = new Resend(clientKey);
 
     let fromAddress = DEFAULT_FROM;

apps/web-dashboard/src/pages/ProjectSettings.jsx

@@ -304,7 +304,7 @@ export default function ProjectSettings() {
               Default Sent-From Address
             </label>
             <input
-              type="email"
+              type="text"
               className="input-field"
               placeholder="e.g. Acme <info@acme.com>"
               value={resendFromEmailValue}

packages/common/src/index.js

@@ -22,7 +22,8 @@ const Webhook = require("./models/Webhook");
 const WebhookDelivery = require("./models/WebhookDelivery");
 
 // Queues
-const { authEmailQueue } = require("./queues/authEmailQueue");
+const { authEmailQueue,
+  initAuthEmailWorker, initAuthEmailWorker } = require("./queues/authEmailQueue");
 const { emailQueue } = require("./queues/emailQueue");
 const {
   webhookQueue,

packages/common/src/queues/authEmailQueue.js

@@ -7,8 +7,13 @@ const { decrypt } = require('../utils/encryption');
 // Create the email queue specifically for fast OTPs
 const authEmailQueue = new Queue('auth-email-queue', { connection });
 
-// Initialize Worker with Rate Limiting
-const worker = new Worker('auth-email-queue', async (job) => {
+let worker = null;
+
+const initAuthEmailWorker = () => {
+    if (worker) return worker;
+
+    // Initialize Worker with Rate Limiting
+    worker = new Worker('auth-email-queue', async (job) => {
     const { email, otp, type, pname, projectId } = job.data;
     const redact = (e) => e.replace(/(.{2})(.*)(?=@)/, (gp1, gp2, gp3) => gp2 + "*".repeat(gp3.length));
     const maskedEmail = redact(email);
@@ -51,8 +56,11 @@ worker.on('completed', (job) => {
     console.log(`[Queue] Job ${job.id} completed successfully`);
 });
 
-worker.on('failed', (job, err) => {
-    console.error(`[Queue] Job ${job.id} failed:`, err);
-});
+    worker.on('failed', (job, err) => {
+        console.error(`[Queue] Job ${job.id} failed:`, err);
+    });
+
+    return worker;
+};
 
-module.exports = { authEmailQueue };
+module.exports = { authEmailQueue, initAuthEmailWorker };