configured redirection back to the original route upon successful log…

…in for #8
travi-org · Mar 7, 2016 · 8270f82 · 8270f82
1 parent 45b615b
commit 8270f82
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 9 deletions.
diff --git a/lib/auth/routes.js b/lib/auth/routes.js
@@ -13,9 +13,17 @@ exports.register = function (server, options, next) {
             if (!request.auth.isAuthenticated) {
                 reply(Boom.unauthorized(`Authentication failed due to: ${request.auth.error.message}`));
             } else {
-                reply.view('login', {
-                    profile: request.auth.credentials.profile
-                });
+                const originalRoute = request.auth.credentials.query.next;
+
+                request.cookieAuth.set(request.auth.credentials);
+
+                if (originalRoute) {
+                    reply.redirect(originalRoute);
+                } else {
+                    reply.view('login', {
+                        profile: request.auth.credentials.profile
+                    });
+                }
             }
         }
     });

diff --git a/test/unit/auth/routes-test.js b/test/unit/auth/routes-test.js
@@ -31,13 +31,20 @@ suite('auth routes', () => {
             profile = any.simpleObject(),
             server = {
                 route: sinon.stub()
+            },
+            request = {
+                auth: {
+                    isAuthenticated: true,
+                    credentials: {
+                        profile,
+                        query: {}
+                    }
+                },
+                cookieAuth: {
+                    set: sinon.spy()
+                }
             };
-        server.route.withArgs(sinon.match({path: '/login'})).yieldsTo('handler', {
-            auth: {
-                isAuthenticated: true,
-                credentials: {profile}
-            }
-        }, reply);
+        server.route.withArgs(sinon.match({path: '/login'})).yieldsTo('handler', request, reply);
 
         routes.register(server, null, next);
 
@@ -48,6 +55,7 @@ suite('auth routes', () => {
                 auth: 'auth0'
             }
         }));
+        assert.calledWith(request.cookieAuth.set, request.auth.credentials);
         assert.calledWith(reply.view, 'login', {profile});
         assert.calledOnce(next);
     });
@@ -73,6 +81,35 @@ suite('auth routes', () => {
         assert.calledWith(reply, error);
     });
 
+    test('that request is redirected to original route when login not loaded directly', () => {
+        const
+            originalRoute = any.string(),
+            reply = {redirect: sinon.spy()},
+            profile = any.simpleObject(),
+            server = {
+                route: sinon.stub()
+            },
+            request = {
+                auth: {
+                    isAuthenticated: true,
+                    credentials: {
+                        profile,
+                        query: {
+                            next: originalRoute
+                        }
+                    }
+                },
+                cookieAuth: {
+                    set: sinon.spy()
+                }
+            };
+        server.route.withArgs(sinon.match({path: '/login'})).yieldsTo('handler', request, reply);
+
+        routes.register(server, null, sinon.spy());
+
+        assert.calledOnce(reply.redirect, originalRoute);
+    });
+
     test('that the scopes route is defined', () => {
         const
             next = sinon.spy(),