Remove promises from api/cloud_api/email_templates/

api/cloud_api/email_templates/membershipConfirmationCode.js

@@ -1,20 +1,18 @@
 function membershipConfirmationCode(user, recipient, confirmCode) {
-  return new Promise((resolve, reject) => {
-    return resolve({
-      from: user,
-      to: recipient,
-      subject: `Your SCE Membership Code Is ${confirmCode}`,
-      generateTextFromHTML: true,
-      html: `
-            <p>
-              Hi, <br />
-              Thank you for signing up for membership! <br />
-              Please use the below confirmation code when you
-              visit your profile page on the
-              SCE website to verify your membership: <br /> <b>${confirmCode}</b>
-            </p>
-      `
-    });
-  });
+  return {
+    from: user,
+    to: recipient,
+    subject: `Your SCE Membership Code Is ${confirmCode}`,
+    generateTextFromHTML: true,
+    html: `
+          <p>
+            Hi, <br />
+            Thank you for signing up for membership! <br />
+            Please use the below confirmation code when you
+            visit your profile page on the
+            SCE website to verify your membership: <br /> <b>${confirmCode}</b>
+          </p>
+    `
+  };
 }
 module.exports = { membershipConfirmationCode };

api/cloud_api/email_templates/passwordReset.js

@@ -1,29 +1,21 @@
 const generateHashedId = require('../util/auth').generateHashedId;
 
-function passwordReset(user, resetToken, recipient) {
-  return new Promise((resolve, reject) => {
-    generateHashedId(recipient)
-      .then(hashedId => {
-        const url =
-          process.env.VERIFICATION_BASE_URL || 'http://localhost:3000';
-        const resetLink =
-          `${url}/reset?id=${hashedId}&resetToken=${resetToken}`;
-        return resolve({
-          from: user,
-          to: recipient,
-          subject: 'Reset Password for SCE',
-          generateTextFromHTML: true,
-          html: `
-            Hi,<br />
-            <p>Click the link below to reset your password. It will expire in 24 hours.</p>
-            <a href='${resetLink}'>Reset Password</a>
-          `
-        });
-      })
-      .catch(error => {
-        reject(error);
-      });
-  });
+function passwordReset(hashedId, user, resetToken, recipient) {
+  const url =
+    process.env.VERIFICATION_BASE_URL || 'http://localhost:3000';
+  const resetLink =
+    `${url}/reset?id=${hashedId}&resetToken=${resetToken}`;
+  return {
+    from: user,
+    to: recipient,
+    subject: 'Reset Password for SCE',
+    generateTextFromHTML: true,
+    html: `
+      Hi,<br />
+      <p>Click the link below to reset your password. It will expire in 24 hours.</p>
+      <a href='${resetLink}'>Reset Password</a>
+    `
+  };
 }
 
 module.exports = { passwordReset };

api/cloud_api/email_templates/unsubscribeEmail.js

@@ -1,15 +1,14 @@
 function unsubscribeEmail(user, recipient, name) {
-  return new Promise((resolve, reject) => {
-    const url =
+  const url =
     process.env.VERIFICATION_BASE_URL || 'http://localhost:3000';
-    const verifyLink =
+  const verifyLink =
     `${url}/emailPreferences?user=${recipient}`;
-    return resolve({
-      from: user,
-      to: recipient,
-      subject: 'Unsubscribe from SCE Emails',
-      generateTextFromHTML: true,
-      html: `
+  return {
+    from: user,
+    to: recipient,
+    subject: 'Unsubscribe from SCE Emails',
+    generateTextFromHTML: true,
+    html: `
       Hi ${name || ''},<br />
       <p>We appreciate you reducing email spam. 
       To opt out of all our emails, click the link below 
@@ -18,8 +17,7 @@ function unsubscribeEmail(user, recipient, name) {
       <p>Thanks,</p>
       <p>The Software and Computer Engineering Society</p>
     `
-    });
-  });
+  };
 }
 
 module.exports = { unsubscribeEmail };

api/cloud_api/email_templates/verification.js

@@ -1,30 +1,22 @@
 const generateHashedId = require('../util/auth').generateHashedId;
 
-function verification(user, recipient, name) {
-  return new Promise((resolve, reject) => {
-    generateHashedId(recipient)
-      .then(hashedId => {
-        const url =
-          process.env.VERIFICATION_BASE_URL || 'http://localhost:3000';
-        const verifyLink =
-          `${url}/verify?id=${hashedId}&user=${recipient}`;
-        return resolve({
-          from: user,
-          to: recipient,
-          subject: 'Please verify your email address',
-          generateTextFromHTML: true,
-          html: `
-            Hi ${name || ''},<br />
-            <p>Thanks for signing up!
-            Please verify your email by clicking below.</p>
-            <a href='${verifyLink}'>Verify Email</a>
-          `
-        });
-      })
-      .catch(error => {
-        reject(error);
-      });
-  });
+function verification(hashedId, user, recipient, name) {
+  const url =
+      process.env.VERIFICATION_BASE_URL || 'http://localhost:3000';
+  const verifyLink =
+      `${url}/verify?id=${hashedId}&user=${recipient}`;
+  return {
+    from: user,
+    to: recipient,
+    subject: 'Please verify your email address',
+    generateTextFromHTML: true,
+    html: `
+        Hi ${name || ''},<br />
+        <p>Thanks for signing up!
+        Please verify your email by clicking below.</p>
+        <a href='${verifyLink}'>Verify Email</a>
+      `
+  };
 }
 
 module.exports = { verification };