From 7c9b7bb920bdbde24eda46e99c7524d9abe78f5f Mon Sep 17 00:00:00 2001
From: Rotimi Best <best@classroomio.com>
Date: Mon, 23 Sep 2024 21:18:33 +0100
Subject: [PATCH] fix: remove isPersonalEmail logic

---
 apps/backend/src/routes/sendEmail.js                         | 5 ++---
 .../src/routes/api/email/course/newsfeed/+server.ts          | 1 -
 apps/dashboard/src/routes/api/email/invite/+server.js        | 4 ++--
 apps/dashboard/src/routes/api/email/verify_email/+server.js  | 4 ++--
 apps/dashboard/src/routes/api/email/welcome/+server.js       | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/backend/src/routes/sendEmail.js b/apps/backend/src/routes/sendEmail.js
index ebdbdaad..67080d0f 100644
--- a/apps/backend/src/routes/sendEmail.js
+++ b/apps/backend/src/routes/sendEmail.js
@@ -12,7 +12,7 @@ nodemailerTransporter().then((t) => {
 });
 
 async function sendWithNodemailer(emailData) {
-  const { from, to, subject, content, isPersonalEmail, replyTo } = emailData;
+  const { from, to, subject, content, replyTo } = emailData;
 
   if (!transporter) {
     return;
@@ -74,7 +74,6 @@ emailRouter.post('/', async (req, res) => {
         to: zod.string(),
         subject: zod.string(),
         content: zod.string(),
-        isPersonalEmail: zod.boolean().optional(),
         replyTo: zod.string().optional()
       })
     );
@@ -88,7 +87,7 @@ emailRouter.post('/', async (req, res) => {
         let res;
 
         try {
-          if (emailData.isPersonalEmail || !ZOHO_TOKEN) {
+          if (!ZOHO_TOKEN) {
             res = await sendWithNodemailer(emailData);
           } else {
             res = await sendWithZoho(emailData);
diff --git a/apps/dashboard/src/routes/api/email/course/newsfeed/+server.ts b/apps/dashboard/src/routes/api/email/course/newsfeed/+server.ts
index d05c48bb..bd97a1b9 100644
--- a/apps/dashboard/src/routes/api/email/course/newsfeed/+server.ts
+++ b/apps/dashboard/src/routes/api/email/course/newsfeed/+server.ts
@@ -30,7 +30,6 @@ const sendEmailNotification = async (feedId: string, authorId: string, comment?:
         <a class="button" href="${postLink}">View comment</a>
       </div>
       `,
-        isPersonalEmail: false,
         replyTo: 'noreply@classroomio.com'
       }
     ];
diff --git a/apps/dashboard/src/routes/api/email/invite/+server.js b/apps/dashboard/src/routes/api/email/invite/+server.js
index 9e402a6c..0351469c 100644
--- a/apps/dashboard/src/routes/api/email/invite/+server.js
+++ b/apps/dashboard/src/routes/api/email/invite/+server.js
@@ -44,6 +44,7 @@ export async function POST({ request }) {
 
   const emailData = [
     {
+      from: `"Best from ClassroomIO" <notify@mail.classroomio.com>`,
       to: email,
       subject: `Join ${name} on ClassroomIO 😃`,
       content: `
@@ -52,8 +53,7 @@ export async function POST({ request }) {
       <div>
         <a class="button" href="${inviteLink}">Accept Invitation</a>
       </div>
-    `,
-      isPersonalEmail: true
+    `
     }
   ];
   await sendEmail(emailData);
diff --git a/apps/dashboard/src/routes/api/email/verify_email/+server.js b/apps/dashboard/src/routes/api/email/verify_email/+server.js
index db5a4a7a..7eeb90d2 100644
--- a/apps/dashboard/src/routes/api/email/verify_email/+server.js
+++ b/apps/dashboard/src/routes/api/email/verify_email/+server.js
@@ -37,6 +37,7 @@ export async function POST({ request }) {
 
   const emailData = [
     {
+      from: `"Best from ClassroomIO" <notify@mail.classroomio.com>`,
       to,
       subject: 'Action Required: Confirm your email',
       content: `
@@ -47,8 +48,7 @@ export async function POST({ request }) {
   <div>
   <a class="button" href="${verificationLink}">Verify</a>
   </div>
-  `,
-      isPersonalEmail: true
+  `
     }
   ];
 
diff --git a/apps/dashboard/src/routes/api/email/welcome/+server.js b/apps/dashboard/src/routes/api/email/welcome/+server.js
index d9cbc0ef..54f73540 100644
--- a/apps/dashboard/src/routes/api/email/welcome/+server.js
+++ b/apps/dashboard/src/routes/api/email/welcome/+server.js
@@ -27,6 +27,7 @@ export async function POST({ request }) {
 
   const emailData = [
     {
+      from: `"Best from ClassroomIO" <notify@mail.classroomio.com>`,
       to,
       subject: 'Welcome to ClassroomIO!',
       content: `
@@ -44,8 +45,7 @@ export async function POST({ request }) {
       <p>
         PS: I reply personally to every email. We don't have an outsourced support team at the other end of the globe.. ;-)
       </p>
-    `,
-      isPersonalEmail: true
+    `
     }
   ];