From 57ceee0897e4f70103a7690eafca75bff27279b0 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <me@raisedadead.com>
Date: Sat, 28 Jul 2018 12:34:27 +0530
Subject: [PATCH] fix: update email template

---
 server/boot/authentication.js                     | 4 ++++
 server/middlewares/email-not-verified-notice.js   | 1 +
 server/middlewares/privacy-terms-notice.js        | 1 +
 server/views/emails/user-request-update-email.ejs | 6 ++----
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/boot/authentication.js b/server/boot/authentication.js
index ecc6e352f4..2c43ce027b 100644
--- a/server/boot/authentication.js
+++ b/server/boot/authentication.js
@@ -210,6 +210,10 @@ module.exports = function enableAuthentication(app) {
 
   router.get(
     '/passwordless-change',
+    (req, res) => res.redirect(301, '/confirm-email')
+  );
+  router.get(
+    '/confirm-email',
     ifNoUserRedirectHome,
     passwordlessGetValidators,
     getPasswordlessAuth
diff --git a/server/middlewares/email-not-verified-notice.js b/server/middlewares/email-not-verified-notice.js
index 9928f4ae25..ae65a65282 100644
--- a/server/middlewares/email-not-verified-notice.js
+++ b/server/middlewares/email-not-verified-notice.js
@@ -6,6 +6,7 @@ const EXCLUDED_PATHS = [
   '/signout',
   '/accept-privacy-terms',
   '/update-email',
+  '/confirm-email',
   '/passwordless-change',
   '/external/services/user'
 ];
diff --git a/server/middlewares/privacy-terms-notice.js b/server/middlewares/privacy-terms-notice.js
index ea2a5316ed..76a2e175d3 100644
--- a/server/middlewares/privacy-terms-notice.js
+++ b/server/middlewares/privacy-terms-notice.js
@@ -4,6 +4,7 @@ const EXCLUDED_PATHS = [
   '/signout',
   '/accept-privacy-terms',
   '/update-email',
+  '/confirm-email',
   '/passwordless-change',
   '/external/services/user'
 ];
diff --git a/server/views/emails/user-request-update-email.ejs b/server/views/emails/user-request-update-email.ejs
index d63c21ff98..3cbdfd99ea 100644
--- a/server/views/emails/user-request-update-email.ejs
+++ b/server/views/emails/user-request-update-email.ejs
@@ -1,8 +1,6 @@
-Thank you for updating your email address.
+Please confirm this address for freeCodeCamp:
 
-Please confirm your updated email address by clicking this link:
-
-<%= host %>/passwordless-change?email=<%= loginEmail %>&token=<%= loginToken %>&emailChange=<%= emailChange %>
+<%= host %>/confirm-email?email=<%= loginEmail %>&token=<%= loginToken %>&emailChange=<%= emailChange %>
 
 Happy coding!