From c223c309aadf9483bf5e5c806eb8df7e17f015d2 Mon Sep 17 00:00:00 2001 From: ciaranj Date: Mon, 19 Apr 2010 20:13:55 +0100 Subject: [PATCH] Removed all twitter references ;) --- lib/oauth.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/oauth.js b/lib/oauth.js index 13ddad8..14bed89 100644 --- a/lib/oauth.js +++ b/lib/oauth.js @@ -143,9 +143,14 @@ exports.OAuth.prototype.getOauthAccessToken= function(oauth_token, oauth_token_s query+= orderedParameters[i][0]+"="+ orderedParameters[i][1] + "&"; } query= query.substring(0, query.length-1); - var oauthProvider= http.createClient(80, 'twitter.com'); - var headers= {'Host': 'twitter.com'} - var request = oauthProvider.request("GET", "/oauth/access_token"+"?"+query, headers); + + var parsedUrl= URL.parse( this._accessUrl, false ); + if( parsedUrl.protocol == "http:" && !parsedUrl.port ) parsedUrl.port= 80; + if( parsedUrl.protocol == "https:" && !parsedUrl.port ) parsedUrl.port= 443; + + var oauthProvider= http.createClient(parsedUrl.port, parsedUrl.hostname); + var headers= {'Host': parsedUrl.hostname} + var request = oauthProvider.request(method, parsedUrl.pathname + "?" + query, headers); var data=""; var self= this; request.addListener('response', function (response) { @@ -180,6 +185,9 @@ exports.OAuth.prototype.getOAuthRequestToken= function(callback) { var method= "POST"; var sig= this._getSignature( method, this._requestUrl, this._normaliseRequestParams(oauthParameters)); + var parsedUrl= URL.parse( this._requestUrl, false ); + if( parsedUrl.protocol == "http:" && !parsedUrl.port ) parsedUrl.port= 80; + if( parsedUrl.protocol == "https:" && !parsedUrl.port ) parsedUrl.port= 443; var orderedParameters= this._sortRequestParams( oauthParameters ); orderedParameters[orderedParameters.length]= ["oauth_signature", sig]; @@ -193,15 +201,15 @@ exports.OAuth.prototype.getOAuthRequestToken= function(callback) { authHeader= authHeader.substring(0, authHeader.length-1); headers["Authorization"]= authHeader; - headers["Host"] = "twitter.com" + headers["Host"] = parsedUrl.hostname headers["Accept"]= "*/*" headers["Connection"]= "close" headers["User-Agent"]= "Express authentication" headers["Content-length"]= 0 headers["Content-Type"]= "application/x-www-form-urlencoded" - var oauthProvider= http.createClient(80, 'twitter.com'); - var request = oauthProvider.request(method, "/oauth/request_token", headers); + var oauthProvider= http.createClient(parsedUrl.port, parsedUrl.hostname); + var request = oauthProvider.request(method, parsedUrl.pathname, headers); var data=""; var self= this; request.addListener('response', function (response) {