Update strategies to use req.originalUrl not req.url as that gets tri…

…mmed

lib/auth.strategies/bitbucket.js

@@ -37,7 +37,7 @@ module.exports= function(options, server) {
 
   // Declare the method that actually does the authentication
   that.authenticate = function(request, response, callback) {
-    var parsedUrl = url.parse(request.url, true);
+    var parsedUrl = url.parse(request.originalUrl, true);
     //todo: makw the call timeout ....
     var self = this;
     if (parsedUrl.query &&
@@ -76,7 +76,7 @@ module.exports= function(options, server) {
           self.trace( 'Error retrieving the OAuth Request Token: ' + JSON.stringify(error) );
           callback(null); // Ignore the error upstream, treat as validation failure.
         } else {
-          request.session['bitbucket_redirect_url'] = request.url;
+          request.session['bitbucket_redirect_url'] = request.originalUrl;
           request.session.auth["bitbucket_oauth_token_secret"] = oauth_token_secret;
           request.session.auth["bitbucket_oauth_token"] = oauth_token;
 

lib/auth.strategies/facebook.js

@@ -33,7 +33,7 @@ module.exports= function(options, server) {
   // Declare the method that actually does the authentication
   that.authenticate= function(request, response, callback) {
     //todo: makw the call timeout ....
-    var parsedUrl= url.parse(request.url, true);
+    var parsedUrl= url.parse(request.originalUrl, true);
     var self= this; 
     this._facebook_fail= function(callback) {
          request.getAuthDetails()['facebook_login_attempt_failed'] = true;
@@ -70,7 +70,7 @@ module.exports= function(options, server) {
         }
       }
       else {
-         request.session['facebook_redirect_url']= request.url;
+         request.session['facebook_redirect_url']= request.originalUrl;
          var redirectUrl= my._oAuth.getAuthorizeUrl({redirect_uri : my._redirectUri, scope: my.scope, display:my.display})
          self.redirect(response, redirectUrl, callback);
        }

lib/auth.strategies/foursquare.js

@@ -34,7 +34,7 @@ Facebook= module.exports= function(options, server) {
   // Declare the method that actually does the authentication
   that.authenticate= function(request, response, callback) {
     //todo: makw the call timeout ....
-    var parsedUrl= url.parse(request.url, true);
+    var parsedUrl= url.parse(request.originalUrl, true);
     var self= this; 
     this._foursquare_fail= function(callback) {
          request.getAuthDetails()['foursquare_login_attempt_failed']= true;
@@ -71,7 +71,7 @@ Facebook= module.exports= function(options, server) {
         }
       }
       else {
-         request.session['foursquare_redirect_url']= request.url;
+         request.session['foursquare_redirect_url']= request.originalUrl;
          var redirectUrl= my._oAuth.getAuthorizeUrl({redirect_uri : my._redirectUri, response_type: "code" })
          self.redirect(response, redirectUrl, callback);
        }

lib/auth.strategies/getglue.js

@@ -44,7 +44,7 @@ module.exports= function(options, server) {
   // Declare the method that actually does the authentication
   that.authenticate = function(request, response, callback) {
     //todo: if multiple connect middlewares were doing this, it would be more efficient to do it in the stack??
-    var parsedUrl = url.parse(request.url, true);
+    var parsedUrl = url.parse(request.originalUrl, true);
     //todo: make the call timeout ....
     var self = this;
 
@@ -90,7 +90,7 @@ module.exports= function(options, server) {
           } else {
             request.session.auth["getglue_oauth_token"] = oauth_token;
             request.session.auth["getglue_oauth_token_secret"] = oauth_token_secret;
-            request.session['getglue_redirect_url'] = request.url;
+            request.session['getglue_redirect_url'] = request.originalUrl;
             self.redirect(response,  my._oAuth.signUrl(my._authorizeUrl, oauth_token, oauth_token_secret, "GET"), callback);
           }
         });

lib/auth.strategies/github.js

@@ -36,7 +36,7 @@ module.exports= function(options, server) {
   // Declare the method that actually does the authentication
   that.authenticate= function(request, response, callback) {
     //todo: makw the call timeout ....
-    var parsedUrl= url.parse(request.url, true);
+    var parsedUrl= url.parse(request.originalUrl, true);
     var self= this;
     if( request.getAuthDetails()['github_login_attempt_failed'] === true ) {
       // Because we bounce through authentication calls across multiple requests
@@ -67,7 +67,7 @@ module.exports= function(options, server) {
                                        });
       }
       else {
-         request.session['github_redirect_url']= request.url;
+         request.session['github_redirect_url']= request.originalUrl;
          var redirectUrl= my._oAuth.getAuthorizeUrl({redirect_uri : my._redirectUri, scope: my.scope })
          self.redirect(response, redirectUrl, callback);
        }

lib/auth.strategies/google.js

@@ -34,7 +34,7 @@ module.exports = function(options, server) {
   // Declare the method that actually does the authentication
   that.authenticate = function(request, response, callback) {
     //todo: if multiple connect middlewares were doing this, it would be more efficient to do it in the stack??
-    var parsedUrl = url.parse(request.url, true);
+    var parsedUrl = url.parse(request.originalUrl, true);
     //todo: makw the call timeout ....
     var self= this;
     if( request.getAuthDetails()['google_login_attempt_failed'] === true ) {
@@ -85,7 +85,7 @@ module.exports = function(options, server) {
             if(error) {
               callback(null); // Ignore the error upstream, treat as validation failure.
             } else {
-              request.session['google_redirect_url'] = request.url;
+              request.session['google_redirect_url'] = request.originalUrl;
               request.session.auth["google_oauth_token_secret"] = oauth_token_secret;
               request.session.auth["google_oauth_token"] = oauth_token;
               var authTokenURL = "https://www.google.com/accounts/OAuthAuthorizeToken?oauth_token=" + oauth_token;

lib/auth.strategies/google2.js

@@ -32,7 +32,7 @@ module.exports= function(options, server) {
   // Declare the method that actually does the authentication
   that.authenticate= function(request, response, callback) {
     //todo: makw the call timeout ....
-    var parsedUrl= url.parse(request.url, true);
+    var parsedUrl= url.parse(request.originalUrl, true);
     var self= this; 
     this._google2_fail= function(callback) {
          request.getAuthDetails()['google2_login_attempt_failed'] = true;
@@ -80,7 +80,7 @@ module.exports= function(options, server) {
       }
       else {
         self.trace( 'Phase 1/2 - Redirecting to Google Authorizing url' )
-         request.session['google2_redirect_url']= request.url;
+         request.session['google2_redirect_url']= request.originalUrl;
          var redirectUrl= my._oAuth.getAuthorizeUrl({redirect_uri : my._redirectUri, scope: my.scope, response_type: 'code' })
          self.redirect(response, redirectUrl, callback);
        }

lib/auth.strategies/http/digest.js

@@ -28,7 +28,7 @@ module.exports= function (options) {
     if(isDigest) {
       var credentials= authutils.splitAuthorizationHeader(authHeader);   
       var method= req.method;
-      var href= req.url;
+      var href= req.originalUrl;
       my._getSharedSecretForUser(credentials.username, function(error, password){
         if(error) callback(error);
         else {

lib/auth.strategies/http/mac.js

@@ -198,7 +198,7 @@ module.exports = function (options) {
             // Calculate signature
 
             var signature = signRequest(request.method,
-                                        request.url,
+                                        request.originalUrl,
                                         host,
                                         port,
                                         credentials.token,

lib/auth.strategies/janrain.js

@@ -78,7 +78,7 @@ module.exports= function(options, server) {
       request.end();
     }
     else {  // Phase 1
-      req.getAuthDetails()['janrain_redirect_url']= req.url;
+      req.getAuthDetails()['janrain_redirect_url']= req.originalUrl;
       self.redirect(res, my.signInUrl, callback);
     }
   }

lib/auth.strategies/sina.js

@@ -38,7 +38,7 @@ module.exports = function(options, server) {
   that.authenticate = function(request, response, callback) {
     //todo: if multiple connect middlewares were doing this, it would be more efficient to do it in the stack??
 
-    var parsedUrl = url.parse(request.url, true);
+    var parsedUrl = url.parse(request.originalUrl, true);
 
     //todo: makw the call timeout ....
     var self = this;
@@ -67,7 +67,7 @@ module.exports = function(options, server) {
         if (error) {
           callback(null); // Ignore the error upstream, treat as validation failure.
         } else {
-          request.session['sina_redirect_url'] = request.url;
+          request.session['sina_redirect_url'] = request.originalUrl;
           request.session.auth["sina_oauth_token_secret"] = oauth_token_secret;
           request.session.auth["sina_oauth_token"] = oauth_token;
 

lib/auth.strategies/twitter.js

@@ -33,7 +33,7 @@ module.exports= function(options, server) {
   // Declare the method that actually does the authentication
   that.authenticate= function(request, response, callback) {
     //todo: if multiple connect middlewares were doing this, it would be more efficient to do it in the stack??
-    var parsedUrl= url.parse(request.url, true);
+    var parsedUrl= url.parse(request.originalUrl, true);
 
     //todo: makw the call timeout ....
     var self= this;
@@ -78,7 +78,7 @@ module.exports= function(options, server) {
             callback(null); // Ignore the error upstream, treat as validation failure.
           } else {
             self.trace( 'Successfully retrieved the OAuth Request Token' );
-            request.session['twitter_redirect_url']= request.url;
+            request.session['twitter_redirect_url']= request.originalUrl;
             request.session.auth["twitter_oauth_token_secret"]= oauth_token_secret;
             request.session.auth["twitter_oauth_token"]= oauth_token;
             self.redirect(response, "http://twitter.com/oauth/authenticate?oauth_token=" + oauth_token, callback);

lib/auth.strategies/yahoo.js

@@ -33,7 +33,7 @@ module.exports= function(options, server) {
   // Declare the method that actually does the authentication
   that.authenticate= function(request, response, callback) {
     //todo: if multiple connect middlewares were doing this, it would be more efficient to do it in the stack??
-    var parsedUrl= url.parse(request.url, true);
+    var parsedUrl= url.parse(request.originalUrl, true);
     //todo: makw the call timeout ....
     var self= this; 
     if(    parsedUrl.query && parsedUrl.query.oauth_token
@@ -75,7 +75,7 @@ module.exports= function(options, server) {
            callback(null); // Ignore the error upstream, treat as validation failure.
          } else {
            self.trace( 'Successfully retrieved the OAuth Request Token' );
-           request.session['yahoo_redirect_url']= request.url;
+           request.session['yahoo_redirect_url']= request.originalUrl;
            request.session.auth["yahoo_oauth_token_secret"]= oauth_token_secret;
            request.session.auth["yahoo_oauth_token"]= oauth_token;
            self.redirect(response, "https://api.login.yahoo.com/oauth/v2/request_auth?oauth_token=" + oauth_token, callback);