Merge remote-tracking branch 'curtislacy/Connection-Returns' into loadingview

Author: Becky Sroufe

app/app-js/modules/menu/menuPanel/menuPanel.view.js

@@ -48,7 +48,7 @@ define(function (require) {
       if (this.model.get('connected')) {
         window.location.assign('/disconnect/' + this.model.get('serviceKey'));
       } else {
-        window.location.assign('/auth/' + this.model.get('serviceKey'));
+        window.location.assign('/auth/' + this.model.get('serviceKey') + '?auth-return=' + encodeURIComponent( window.location.pathname + window.location.hash ));
       }
     },
 

server.js

@@ -47,6 +47,7 @@ passport.use( 'facebook', new FacebookStrategy(
 			owner: 'facebook:' + profile.id,
 			accessToken: accessToken
 		};
+		console.trace( '** Facebook strategy!' );
 		return done( null, allUserData );
 	}
 ));
@@ -152,6 +153,13 @@ app.configure(function () {
 		}
 		next();
 	} );
+	app.use( function( req, res, next ) {
+		if( req.query[ 'auth-return' ])
+		{
+			req.session[ 'auth-return' ] = req.query[ 'auth-return' ];
+		}
+		next();
+	});
 	app.use(express.static(__dirname+'/dist'));
 
 });
@@ -169,37 +177,55 @@ app.get('/auth/connections', function (req, res) {
 	}
 });
 
-app.get( '/auth/facebook',
-	passport.authenticate( 'facebook' ));
-app.get( 
-	'/auth/facebook/callback',
-	passport.authenticate( 'facebook', { failureRedirect: '#auth-failure' }),
+app.get( '/auth/imap',
 	function( req, res ) {
-		res.redirect( '/' );
+		res.redirect( '/#imap' );
 	}
 );
-app.get( '/auth/twitter',
-	passport.authenticate( 'twitter' ));
-app.get( 
-	'/auth/twitter/callback',
-	passport.authenticate( 'twitter', { failureRedirect: '#auth-failure' }),
+
+app.get( '/auth/facebook/callback',
+	passport.authenticate( 'facebook', { failureRedirect: '#auth-failure' } ),
 	function( req, res ) {
-		res.redirect( '/' );
+		if( req.session[ 'auth-return' ] )
+			res.redirect( req.session[ 'auth-return' ]);
+		else
+			res.redirect( '/' );
 	}
 );
-app.get( '/auth/gmail',
-	passport.authenticate( 'gmail' ));
-app.get( 
-	'/auth/gmail/callback',
-	passport.authenticate( 'gmail', { failureRedirect: '#auth-failure' }),
+
+app.get( '/auth/twitter/callback',
+	passport.authenticate( 'twitter', { failureRedirect: '#auth-failure' } ),
 	function( req, res ) {
-		res.redirect( '/' );
+		if( req.session[ 'auth-return' ] )
+			res.redirect( req.session[ 'auth-return' ]);
+		else
+			res.redirect( '/' );
 	}
 );
-app.post( '/auth/imap/callback',
-	passport.authenticate( 'imap', { failureRedirect: '#auth-failure' }),
+
+app.get( '/auth/imap/callback',
+	passport.authenticate( 'imap', { failureRedirect: '#auth-failure' } ),
+	function( req, res ) {
+		if( req.session[ 'auth-return' ] )
+			res.redirect( req.session[ 'auth-return' ]);
+		else
+			res.redirect( '/' );
+	}
+);
+
+app.get( '/auth/gmail/callback',
+	passport.authenticate( 'gmail', { failureRedirect: '#auth-failure' } ),
+	function( req, res ) {
+		if( req.session[ 'auth-return' ] )
+			res.redirect( req.session[ 'auth-return' ]);
+		else
+			res.redirect( '/' );
+	}
+);
+
+app.get( '/auth/:service',
 	function( req, res ) {
-		res.redirect( '/' );
+		( passport.authenticate( req.params.service ))( req, res );
 	}
 );