fix(auth): Add verification route for email

common/app/routes/Settings/components/Email-Settings.jsx

@@ -132,9 +132,9 @@ class EmailSettings extends PureComponent {
           <FullWidthRow>
             <HelpBlock>
               <Alert bsStyle='info'>
-              A change of email address has not been verified.
-              To use your new email, you must verify it first using the link
-              we sent you.
+              Your email has not been verified.
+              To use your email, you must
+              <a href='/update-email'> verify it here first</a>.
               </Alert>
             </HelpBlock>
           </FullWidthRow>

server/boot/authentication.js

@@ -38,9 +38,33 @@ module.exports = function enableAuthentication(app) {
   ifUserRedirect,
   (req, res) => res.redirect(301, '/auth/auth0'));
 
+  router.get(
+    '/update-email',
+    ifNoUserRedirectHome,
+    (req, res) => res.render('account/update-email', {
+      title: 'Update your email'
+    })
+  );
+
   router.get('/signout', (req, res) => {
     req.logout();
-    res.redirect('/');
+    req.session.destroy( (err) => {
+      if (err) {
+        throw wrapHandledError(
+          new Error('could not destroy session'),
+          {
+            type: 'info',
+            message: 'Oops, something is not right.',
+            redirectTo: '/'
+          }
+        );
+      }
+      res.clearCookie('jwt_access_token');
+      res.clearCookie('access_token');
+      res.clearCookie('userId');
+      res.clearCookie('_csrf');
+      res.redirect('/');
+   });
   });
 
   router.get(

server/boot/user.js

@@ -5,12 +5,12 @@ import { curry } from 'lodash';
 import {
   ifNoUser401,
   ifNoUserRedirectTo,
-  ifNotVerifiedRedirectToSettings
+  ifNotVerifiedRedirectToUpdateEmail
 } from '../utils/middleware';
 
 const debug = debugFactory('fcc:boot:user');
-const sendNonUserToMap = ifNoUserRedirectTo('/map');
-const sendNonUserToMapWithMessage = curry(ifNoUserRedirectTo, 2)('/map');
+const sendNonUserToHome = ifNoUserRedirectTo('/');
+const sendNonUserToHomeWithMessage = curry(ifNoUserRedirectTo, 2)('/');
 
 module.exports = function(app) {
   const router = app.loopback.Router();
@@ -24,7 +24,7 @@ module.exports = function(app) {
   );
   api.get(
     '/account',
-    sendNonUserToMap,
+    sendNonUserToHome,
     getAccount
   );
   api.post(
@@ -34,15 +34,15 @@ module.exports = function(app) {
   );
   api.get(
     '/account/unlink/:social',
-    sendNonUserToMap,
+    sendNonUserToHome,
     getUnlinkSocial
   );
 
   // Ensure these are the last routes!
   router.get(
     '/user/:username/report-user/',
-    sendNonUserToMapWithMessage('You must be signed in to report a user'),
-    ifNotVerifiedRedirectToSettings,
+    sendNonUserToHomeWithMessage('You must be signed in to report a user'),
+    ifNotVerifiedRedirectToUpdateEmail,
     getReportUserProfile
   );
 
@@ -119,6 +119,10 @@ module.exports = function(app) {
       if (err) { return next(err); }
       req.logout();
       req.flash('success', 'You have successfully deleted your account.');
+      res.clearCookie('jwt_access_token');
+      res.clearCookie('access_token');
+      res.clearCookie('userId');
+      res.clearCookie('_csrf');
       return res.status(200).end();
     });
   }

server/middleware.json

@@ -58,6 +58,7 @@
     "./middlewares/jade-helpers": {},
     "./middlewares/flash-cheaters": {},
     "./middlewares/passport-login": {},
+    "./middlewares/email-not-verified-notice": {},
     "./middlewares/privacy-terms-notice": {}
   },
   "files": {},

server/middlewares/email-not-verified-notice.js

@@ -0,0 +1,32 @@
+import dedent from 'dedent';
+
+const ALLOWED_METHODS = ['GET'];
+const EXCLUDED_PATHS = [
+  '/api/flyers/findOne',
+  '/signout',
+  '/update-email'
+];
+
+export default function emailNotVerifiedNotice() {
+  return function(req, res, next) {
+    if (
+      ALLOWED_METHODS.indexOf(req.method) !== -1 &&
+      EXCLUDED_PATHS.indexOf(req.path) === -1
+    ) {
+      const { user } = req;
+      if (user && (!user.email || user.email === '' || !user.emailVerified)) {
+        req.flash(
+          'danger',
+          dedent`
+  New privacy laws now require that we have an email address where we can reach
+  you. Please verify your email address below and click the link we send you to
+  confirm.
+          `
+        );
+        res.redirect('/update-email');
+        return next;
+      }
+    }
+    return next();
+  };
+}

server/utils/middleware.js

@@ -32,7 +32,7 @@ export function ifNoUser401(req, res, next) {
   return res.status(401).end();
 }
 
-export function ifNotVerifiedRedirectToSettings(req, res, next) {
+export function ifNotVerifiedRedirectToUpdateEmail(req, res, next) {
   const { user } = req;
   if (!user) {
     return next();

server/views/account/update-email.jade

@@ -0,0 +1,57 @@
+extends ../layout
+block content
+  .container
+    .row.flashMessage.negative-30
+        .col-xs-12
+            #flash-board.alert.fade.in(style='display: none;')
+                button.close(type='button', data-dismiss='alert')
+                    span.ion-close-circled#flash-close
+                #flash-content
+  h2.text-center Update your email address here:
+  form.form-horizontal.update-email(method='POST', action='/api/users/#{user.id}/update-email', name="updateEmailForm")
+    .row
+      .col-sm-6.col-sm-offset-3
+        input(type='hidden', name='_csrf', value=_csrf)
+        .form-group
+          input.input-lg.form-control(type='email', name='email', id='email', value=user.email || '', placeholder=user.email || 'Enter your new email', autofocus, required, autocomplete="off")
+        .form-group
+          button.btn.btn-lg.btn-primary.btn-block(type='submit')= !user.email || user.emailVerified ? 'Update my Email' : 'Verify Email'
+          a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/signout')
+            | Sign out
+
+    script.
+       $(document).ready(function() {
+        $('form').submit(function(event){
+          event.preventDefault();
+          $('#flash-board').hide();
+          var $form = $(event.target);
+          $.ajax({
+              type        : 'POST',
+              url         : $form.attr('action'),
+              data        : $form.serialize(),
+              dataType    : 'json',
+              encode      : true,
+              xhrFields   : { withCredentials:  true }
+          })
+          .fail(error => {
+            if (error.responseText){
+                var data = JSON.parse(error.responseText);
+                if(data.message)
+                $('#flash-content').html(data.message);
+                $('#flash-board')
+                  .removeClass('alert-success')
+                  .addClass('alert-info')
+                  .fadeIn();
+              }
+          })
+          .done(data =>{
+            if(data && data.message){
+              $('#flash-content').html(data.message);
+              $('#flash-board')
+                  .removeClass('alert-info')
+                  .addClass('alert-success')
+                  .fadeIn();
+            }
+          });
+        });
+       });

server/views/partials/navbar.jade

@@ -14,7 +14,7 @@ nav.navbar.navbar-default.navbar-static-top.nav-height
                 a(href='https://forum.freecodecamp.org', target='_blank' rel='noopener') Forum
             if !user
                 li
-                    a(href='/signin') Start Coding
+                    a(href='/signin') Sign in
             else
                 li
                   a(href='/settings') Settings