diff --git a/lib/auth.strategies/bitbucket.js b/lib/auth.strategies/bitbucket.js index 66d3f93..30d7048 100644 --- a/lib/auth.strategies/bitbucket.js +++ b/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; diff --git a/lib/auth.strategies/facebook.js b/lib/auth.strategies/facebook.js index 4ed1b83..f8a8bdc 100644 --- a/lib/auth.strategies/facebook.js +++ b/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); } diff --git a/lib/auth.strategies/foursquare.js b/lib/auth.strategies/foursquare.js index 6041b85..9093972 100644 --- a/lib/auth.strategies/foursquare.js +++ b/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); } diff --git a/lib/auth.strategies/getglue.js b/lib/auth.strategies/getglue.js index 9803a40..14550a7 100644 --- a/lib/auth.strategies/getglue.js +++ b/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); } }); diff --git a/lib/auth.strategies/github.js b/lib/auth.strategies/github.js index 98672c9..f6ed787 100644 --- a/lib/auth.strategies/github.js +++ b/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); } diff --git a/lib/auth.strategies/google.js b/lib/auth.strategies/google.js index 78e0b5c..44aa6fa 100644 --- a/lib/auth.strategies/google.js +++ b/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; diff --git a/lib/auth.strategies/google2.js b/lib/auth.strategies/google2.js index f0b6ada..34f086c 100644 --- a/lib/auth.strategies/google2.js +++ b/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); } diff --git a/lib/auth.strategies/http/digest.js b/lib/auth.strategies/http/digest.js index e1d60e9..fa20e7e 100644 --- a/lib/auth.strategies/http/digest.js +++ b/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 { diff --git a/lib/auth.strategies/http/mac.js b/lib/auth.strategies/http/mac.js index cf374a4..8a79c61 100644 --- a/lib/auth.strategies/http/mac.js +++ b/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, diff --git a/lib/auth.strategies/janrain.js b/lib/auth.strategies/janrain.js index 62cb0cb..4ed7872 100644 --- a/lib/auth.strategies/janrain.js +++ b/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); } } diff --git a/lib/auth.strategies/sina.js b/lib/auth.strategies/sina.js index 91f1e79..db17827 100644 --- a/lib/auth.strategies/sina.js +++ b/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; diff --git a/lib/auth.strategies/twitter.js b/lib/auth.strategies/twitter.js index f48cde5..fb89d84 100644 --- a/lib/auth.strategies/twitter.js +++ b/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); diff --git a/lib/auth.strategies/yahoo.js b/lib/auth.strategies/yahoo.js index a65617b..e6db346 100644 --- a/lib/auth.strategies/yahoo.js +++ b/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);