chore(Notifications)Unsubscibe-Notifications-

Add route to email to unsubscribe from email notification
andela · Mar 19, 2019 · 47e537b · 47e537b
1 parent 6d1393b
commit 47e537b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/server/api/controllers/user.js b/server/api/controllers/user.js
@@ -590,7 +590,7 @@ export const deleteUser = async ({ user: { role }, params: { id } }, res) => {
   }
 };
 
-export const unsubscribeMail = async ({ user: { id } }, res) => {
+export const unsubscribeMail = async ({ params: { id } }, res) => {
   try {
     await User.update(
       { notifications: false },

diff --git a/server/api/helpers/mailer/templates/articleGotNewComment.js b/server/api/helpers/mailer/templates/articleGotNewComment.js
@@ -1,5 +1,5 @@
 export default ({
-  firstname, id, title, commenter, commentBody
+  firstname, id, title, commenter, commentBody, userId
 }) => `
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
@@ -101,12 +101,12 @@ export default ({
                         <td height="10">&nbsp;</td>
                       </tr>
                       <tr>
-                        <td valign="top" align="center"> <span style="font-family: -apple-system,BlinkMacSystemFont,&#39;Segoe UI&#39;,&#39;Roboto&#39;,&#39;Oxygen&#39;,&#39;Ubuntu&#39;,&#39;Cantarell&#39;,&#39;Fira Sans&#39;,&#39;Droid Sans&#39;,&#39;Helvetica Neue&#39;,sans-serif; color:#9EB0C9; font-size:10px;">&copy;
+                        <td valign="top" align="center"> <span style="font-family: -apple-system,BlinkMacSystemFont,&#39;Segoe UI&#39;,&#39;Roboto&#39;,&#39;Oxygen&#39;,&#39;Ubuntu&#39;,&#39;Cantarell&#39;,&#39;Fira Sans&#39;,&#39;Droid Sans&#39;,&#39;Helvetica Neue&#39;,sans-serif; color:#9EB0C9; font-size:12px;">&copy;
                             <a href="#" target="_blank" style="color:#9EB0C9 !important; text-decoration:none;">Author's
                               Haven</a>
                             &nbsp;&nbsp;|&nbsp;&nbsp;
-                            <a href="https://reallygoodemails.com/" target="_blank" style="color:#9EB0C9 !important; text-decoration:none;">Courtesy
-                              of Really Good Emails</a>
+                            <a href=${process.env.REACT_ENDPOINT}/api/users/${userId}/unsubscribe style="color:#9EB0C9 !important;">Unsubscribe
+                          </a>from all future emails.
                           </span>
                         </td>
                       </tr>

diff --git a/server/api/helpers/mailer/templates/newArticleTemplate.js b/server/api/helpers/mailer/templates/newArticleTemplate.js
@@ -1,5 +1,5 @@
 export default ({
-  firstname, author, id, title
+  firstname, author, id, title, userId
 }) => `
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
@@ -100,12 +100,12 @@ export default ({
                         <td height="10">&nbsp;</td>
                       </tr>
                       <tr>
-                        <td valign="top" align="center"> <span style="font-family: -apple-system,BlinkMacSystemFont,&#39;Segoe UI&#39;,&#39;Roboto&#39;,&#39;Oxygen&#39;,&#39;Ubuntu&#39;,&#39;Cantarell&#39;,&#39;Fira Sans&#39;,&#39;Droid Sans&#39;,&#39;Helvetica Neue&#39;,sans-serif; color:#9EB0C9; font-size:10px;">&copy;
+                        <td valign="top" align="center"> <span style="font-family: -apple-system,BlinkMacSystemFont,&#39;Segoe UI&#39;,&#39;Roboto&#39;,&#39;Oxygen&#39;,&#39;Ubuntu&#39;,&#39;Cantarell&#39;,&#39;Fira Sans&#39;,&#39;Droid Sans&#39;,&#39;Helvetica Neue&#39;,sans-serif; color:#9EB0C9; font-size:12px;">&copy;
                             <a href="#" target="_blank" style="color:#9EB0C9 !important; text-decoration:none;">Author's
                               Haven</a>
                             &nbsp;&nbsp;|&nbsp;&nbsp;
-                            <a href="https://reallygoodemails.com/" target="_blank" style="color:#9EB0C9 !important; text-decoration:none;">Courtesy
-                              of Really Good Emails</a>
+                            <a href=${process.env.REACT_ENDPOINT}/api/users/${userId}/unsubscribe style="color:#9EB0C9 !important;">Unsubscribe
+                          </a>from all future emails.
                           </span>
                         </td>
                       </tr>

diff --git a/server/api/helpers/notification/bookmarkers.js b/server/api/helpers/notification/bookmarkers.js
@@ -15,9 +15,8 @@ export default async (articleId, commentBody, commenterId) => {
   const info = {
     commenter, commentBody, articleId, title
   };
-
-  bookmarks.forEach(async ({ userId }) => {
-    const { firstname, email } = await User.findByPk(userId);
-    articleGotNewComment({ ...info, firstname }, email);
+  bookmarks.forEach(async ({ userId: id }) => {
+    const { firstname, email, id: userId } = await User.findByPk(id);
+    articleGotNewComment({ ...info, firstname, userId }, email);
   });
 };
diff --git a/server/api/helpers/notification/followers.js b/server/api/helpers/notification/followers.js
@@ -4,11 +4,13 @@ import { newArticleMail } from '../mailer/mailer';
 export default async (authorId, id, title) => {
   const authorObj = await User.findByPk(authorId);
   const followers = await authorObj.getFollowers({
-    attributes: ['email', 'firstname', 'notifications']
+    attributes: ['email', 'firstname', 'id', 'notifications']
   });
 
   const info = { author: `${authorObj.firstname}`, id, title };
-  followers.forEach(async ({ firstname, email, notifications }) => {
-    if (notifications) await newArticleMail({ ...info, firstname }, email);
+  followers.forEach(async ({
+    firstname, id: userId, email, notifications
+  }) => {
+    if (notifications) await newArticleMail({ ...info, firstname, userId }, email);
   });
 };
diff --git a/server/api/routes/user.js b/server/api/routes/user.js
@@ -40,6 +40,6 @@ userRouter.get('/:userId/profile', getUserProfile);
 userRouter.patch('/:userId/profile', passport.authenticate('jwt', { session: false }),
   profileUpdateValidation, updateUserProfile);
 
-userRouter.patch('/:id/unsubscribe', passport.authenticate('jwt', { session: false }), unsubscribeMail);
+userRouter.patch('/:id/unsubscribe', unsubscribeMail);
 
 export default userRouter;