Merge pull request #5526 from FreeCodeCamp/fix/commit-signin-redirect

Fix commit redirect for non signed user.

common/models/user.js

@@ -1,6 +1,7 @@
 import { Observable } from 'rx';
 import uuid from 'node-uuid';
 import moment from 'moment';
+import dedent from 'dedent';
 import debugFactory from 'debug';
 
 import { saveUser, observeMethod } from '../../server/utils/rx';
@@ -91,9 +92,10 @@ module.exports = function(User) {
         }
 
         req.flash('error', {
-          msg:
-            `The ${req.body.email} email address is already associated with an account. 
-            Try signing in with it here instead.`
+          msg: dedent`
+      The ${req.body.email} email address is already associated with an account.
+      Try signing in with it here instead.
+          `
         });
 
         return res.redirect('/email-signin');
@@ -171,10 +173,14 @@ module.exports = function(User) {
     }
 
     return req.logIn({ id: accessToken.userId.toString() }, function(err) {
-      if (err) {
-        return next(err);
-      }
+      if (err) { return next(err); }
+
       debug('user logged in');
+
+      if (req.session && req.session.returnTo) {
+        return res.redirect(req.session.returnTo);
+      }
+
       req.flash('success', { msg: 'Success! You are logged in.' });
       return res.redirect('/');
     });

server/boot/a-extendUser.js

@@ -56,9 +56,12 @@ module.exports = function(app) {
   });
 
   // send welcome email to new camper
-  User.afterRemote('create', function(ctx, user, next) {
+  User.afterRemote('create', function({ req, res }, user, next) {
     debug('user created, sending email');
     if (!user.email) { return next(); }
+    const redirect = req.session && req.session.returnTo ?
+      req.session.returnTo :
+      '/';
 
     var mailOptions = {
       type: 'email',
@@ -81,13 +84,13 @@ module.exports = function(app) {
     debug('sending welcome email');
     Email.send(mailOptions, function(err) {
       if (err) { return next(err); }
-      ctx.req.logIn(user, function(err) {
+      req.logIn(user, function(err) {
         if (err) { return next(err); }
 
-        ctx.req.flash('success', {
+        req.flash('success', {
           msg: [ "Welcome to Free Code Camp! We've created your account." ]
         });
-        ctx.res.redirect('/');
+        res.redirect(redirect);
       });
     });
   });

server/boot/commit.js

@@ -22,11 +22,18 @@ import {
   ifNoUserRedirectTo
 } from '../utils/middleware';
 
-const sendNonUserToFront = ifNoUserRedirectTo('/');
+const sendNonUserToSignIn = ifNoUserRedirectTo(
+  '/login',
+  'You must be signed in to commit to a nonprofit.',
+  'info'
+);
+
 const sendNonUserToCommit = ifNoUserRedirectTo(
   '/commit',
-  'Must be signed in to update commit'
+  'You must be signed in to update commit',
+  'info'
 );
+
 const debug = debugFactory('freecc:commit');
 
 function findNonprofit(name) {
@@ -52,7 +59,7 @@ export default function commit(app) {
 
   router.get(
     '/commit/pledge',
-    sendNonUserToFront,
+    sendNonUserToSignIn,
     pledge
   );
 

server/middlewares/add-return-to.js

@@ -16,7 +16,8 @@ const pathsWhiteList = [
   'news',
   'challenges',
   'map',
-  'news'
+  'news',
+  'commit'
 ];
 
 const pathsOfNoReturnRegex = new RegExp(pathsOfNoReturn.join('|'), 'i');
@@ -35,7 +36,7 @@ export default function addReturnToUrl() {
     ) {
       return next();
     }
-    req.session.returnTo = req.path;
+    req.session.returnTo = req.originalUrl;
     next();
   };
 }

server/utils/middleware.js

@@ -1,11 +1,11 @@
-export function ifNoUserRedirectTo(url, message) {
+export function ifNoUserRedirectTo(url, message, type = 'errors') {
   return function(req, res, next) {
     const { path } = req;
     if (req.user) {
       return next();
     }
 
-    req.flash('errors', {
+    req.flash(type, {
       msg: message || `You must be signed to go to ${path}`
     });