Merge pull request #197 from browngraphicslab/import

logging in now directs you to original target url and restored logout…

1 files changed, 3 insertions, 2 deletions

diff --git a/src/server/index.ts b/src/server/index.ts
index c9ec11bfa..2073046ce 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -103,14 +103,15 @@ enum Method {
  */
 function addSecureRoute(method: Method,
     handler: (user: DashUserModel, res: express.Response, req: express.Request) => void,
-    onRejection: (res: express.Response) => any = (res) => res.redirect(RouteStore.logout),
+    onRejection: (res: express.Response, req: express.Request) => any = res => res.redirect(RouteStore.login),
     ...subscribers: string[]
 ) {
     let abstracted = (req: express.Request, res: express.Response) => {
         if (req.user) {
             handler(req.user, res, req);
         } else {
-            onRejection(res);
+            req.session!.target = `http://localhost:${port}${req.originalUrl}`;
+            onRejection(res, req);
         }
     };
     subscribers.forEach(route => {