Re-enabled support for redirect after log in

davidmerfield · Jan 11, 2019 · be632d6 · be632d6
1 parent 6f8b94f
commit be632d6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/dashboard/routes/log_in.js b/app/dashboard/routes/log_in.js
@@ -157,6 +157,7 @@ function checkEmail (req, res, next) {
 
     req.user = user;
     res.locals.email = user.email;
+    res.locals.then = req.query.then;
 
     next();
   });
@@ -190,7 +191,7 @@ function checkPassword (req, res, next) {
 
   var user = req.user;
   var password = req.body && req.body.password;
-  var then = (req.query && req.query.then) || '/';
+  var then = req.query.then || req.body.then || '/';
 
   if (password === '') {
     return next(new LogInError('NOPASSWORD'));

diff --git a/app/dashboard/views/log-in-email.html b/app/dashboard/views/log-in-email.html
@@ -28,7 +28,7 @@
   {{/error}}
   </div>
 
-  <form style="max-width:18rem" method="POST" action="?_csrf={{csrf}}">
+  <form style="max-width:18rem" method="POST">
 
   <label class="pt3 db" for="email">Your email address</label>
   <input class="w-100 mt1 mb3 br2 pa2 ba b--black-30" id="email" type="text" size="20" class="email" name="email" autofocus/>

diff --git a/app/dashboard/views/log-in-password.html b/app/dashboard/views/log-in-password.html
@@ -3,7 +3,7 @@
 
 <div class="w-right-offset">
 
-  <form method="POST" action="?_csrf={{csrf}}">
+  <form method="POST">
 
     <input type="hidden" name="email" value="{{email}}" />
 
@@ -25,9 +25,10 @@
 
   </form>
 
-  <form style="max-width:18rem" method="POST" action="?_csrf={{csrf}}">
+  <form style="max-width:18rem" method="POST">
 
   <label class="pt3 db" for="email">Your password</label>
+  <input type="hidden" name="then" value="{{then}}" />
   <input type="hidden" name="email" value="{{email}}" />
   <input class="w-100 mt1 mb3 br2 pa2 ba b--black-30" id="password" type="password" name="password" autofocus/>