Parse out the location properly before we kick off an authentication flow, so that we can come back where we started.

Author: Curtis Lacy

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') + '?auth-return=%2F%23tryUri%2Ffacebook%2Fuserprofile');
+        window.location.assign('/auth/' + this.model.get('serviceKey') + '?auth-return=' + encodeURIComponent( window.location.pathname + window.location.hash ));
       }
     },
 

server.js

@@ -186,7 +186,6 @@ app.get( '/auth/imap',
 app.get( '/auth/facebook/callback',
 	passport.authenticate( 'facebook', { failureRedirect: '#auth-failure' } ),
 	function( req, res ) {
-		console.log( 'About to do redirect!' );
 		if( req.session[ 'auth-return' ] )
 			res.redirect( req.session[ 'auth-return' ]);
 		else
@@ -197,7 +196,6 @@ app.get( '/auth/facebook/callback',
 app.get( '/auth/twitter/callback',
 	passport.authenticate( 'twitter', { failureRedirect: '#auth-failure' } ),
 	function( req, res ) {
-		console.log( 'About to do redirect!' );
 		if( req.session[ 'auth-return' ] )
 			res.redirect( req.session[ 'auth-return' ]);
 		else
@@ -208,7 +206,6 @@ app.get( '/auth/twitter/callback',
 app.get( '/auth/imap/callback',
 	passport.authenticate( 'imap', { failureRedirect: '#auth-failure' } ),
 	function( req, res ) {
-		console.log( 'About to do redirect!' );
 		if( req.session[ 'auth-return' ] )
 			res.redirect( req.session[ 'auth-return' ]);
 		else
@@ -219,7 +216,6 @@ app.get( '/auth/imap/callback',
 app.get( '/auth/gmail/callback',
 	passport.authenticate( 'gmail', { failureRedirect: '#auth-failure' } ),
 	function( req, res ) {
-		console.log( 'About to do redirect!' );
 		if( req.session[ 'auth-return' ] )
 			res.redirect( req.session[ 'auth-return' ]);
 		else