adding support for redirects that are the same route but have a custo…

…m handler. Closes #121

src/index.js

@@ -21,6 +21,8 @@ const PROVIDERS = {
 // Options that apply to any provider
 const defaults = {
   idField: '_id',
+  shouldSetupSuccessRoute: true,
+  shouldSetupFailureRoute: true,
   successRedirect: '/auth/success',
   failureRedirect: '/auth/failure',
   tokenEndpoint: '/auth/token',
@@ -52,27 +54,17 @@ export default function auth(config = {}) {
 
     // Merge and flatten options
     const authOptions = Object.assign({}, defaults, app.get('auth'), config);
-
-    // If we should redirect on success and the redirect route is the same as the
-    // default then we'll set up a route handler. Otherwise we'll leave it to the developer
-    // to set up their own custom route handler.
-    if (authOptions.successRedirect === defaults.successRedirect) {
-      debug(`Setting up successRedirect route: ${authOptions.successRedirect}`);
-
-      app.get(authOptions.successRedirect, function(req, res){
-        res.sendFile(path.resolve(__dirname, 'public', 'auth-success.html'));
-      });
+
+    // If a custom success redirect is passed in or it is disabled then we
+    // won't setup the default route handler.
+    if (authOptions.successRedirect !== defaults.successRedirect) {
+      authOptions.shouldSetupSuccessRoute = false;
     }
 
-    // If we should redirect on failure and the redirect route is the same as the
-    // default then we'll set up a route handler. Otherwise we'll leave it to the developer
-    // to set up their own custom route handler.
-    if (authOptions.failureRedirect === defaults.failureRedirect) {
-      debug(`Setting up failureRedirect route: ${authOptions.failureRedirect}`);
-
-      app.get(authOptions.failureRedirect, function(req, res){
-        res.sendFile(path.resolve(__dirname, 'public', 'auth-fail.html'));
-      });
+    // If a custom failure redirect is passed in or it is disabled then we
+    // won't setup the default route handler.
+    if (authOptions.failureRedirect !== defaults.failureRedirect) {
+      authOptions.shouldSetupFailureRoute = false;
     }
 
     // Set the options on the app
@@ -145,6 +137,24 @@ export default function auth(config = {}) {
     // Register error handling middleware for redirecting to support
     // redirecting on authentication failure.
     app.use(middleware.failedLogin(authOptions));
+
+    // Setup route handler for default success redirect
+    if (authOptions.shouldSetupSuccessRoute) {
+      debug(`Setting up successRedirect route: ${authOptions.successRedirect}`);
+
+      app.get(authOptions.successRedirect, function(req, res){
+        res.sendFile(path.resolve(__dirname, 'public', 'auth-success.html'));
+      });
+    }
+
+    // Setup route handler for default failure redirect
+    if (authOptions.shouldSetupFailureRoute) {
+      debug(`Setting up failureRedirect route: ${authOptions.failureRedirect}`);
+
+      app.get(authOptions.failureRedirect, function(req, res){
+        res.sendFile(path.resolve(__dirname, 'public', 'auth-fail.html'));
+      });
+    }
   };
 }
 

test/src/index.test.js

@@ -40,6 +40,14 @@ describe('Feathers Authentication', () => {
           expect(app.get('auth').idField).to.equal('_id');
         });
 
+        it('sets shouldSetupSuccessRoute', () => {
+          expect(app.get('auth').shouldSetupSuccessRoute).to.equal(true);
+        });
+
+        it('sets shouldSetupFailureRoute', () => {
+          expect(app.get('auth').shouldSetupFailureRoute).to.equal(true);
+        });
+
         it('sets successRedirect', () => {
           expect(app.get('auth').successRedirect).to.equal('/auth/success');
         });
@@ -210,11 +218,13 @@ describe('Feathers Authentication', () => {
         it('allows disabling successRedirect', () => {
           app.configure(authentication({ successRedirect: false }));
           expect(app.get('auth').successRedirect).to.equal(false);
+          expect(app.get('auth').shouldSetupSuccessRoute).to.equal(false);
         });
 
         it('allows disabling failureRedirect', () => {
           app.configure(authentication({ failureRedirect: false }));
           expect(app.get('auth').failureRedirect).to.equal(false);
+          expect(app.get('auth').shouldSetupFailureRoute).to.equal(false);
         });
 
         it('allows overriding tokenEndpoint', () => {