Removed un-neccessaryy custom query parsing code
This commit is contained in:
parent
a5d074ab5d
commit
bbc7a741fc
23
lib/oauth.js
23
lib/oauth.js
@ -1,6 +1,7 @@
|
||||
var sha1= require('./sha1'),
|
||||
http= require('http'),
|
||||
URL= require('url');
|
||||
URL= require('url'),
|
||||
querystring= require('querystring');
|
||||
|
||||
exports.OAuth= function(requestUrl, accessUrl, authorizeUrl, consumerKey, consumerSecret, version, signatureMethod) {
|
||||
this._requestUrl= requestUrl;
|
||||
@ -54,16 +55,6 @@ exports.OAuth.prototype._normalizeUrl= function(url) {
|
||||
return parsedUrl.protocol + "//" + parsedUrl.hostname + port + parsedUrl.pathname;
|
||||
}
|
||||
|
||||
exports.OAuth.prototype._splitQueryString= function(stringToSplit) {
|
||||
var result= {};
|
||||
var parameters= stringToSplit.split("&");
|
||||
for(var key in parameters) {
|
||||
var parameterPair= parameters[key].split("=");
|
||||
result[parameterPair[0]]= parameterPair[1];
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Takes a literal in, then returns a sorted array
|
||||
exports.OAuth.prototype._sortRequestParams= function(argumentsHash) {
|
||||
var argument_pairs= [];
|
||||
@ -132,7 +123,6 @@ exports.OAuth.prototype._getNonce= function(nonceSize) {
|
||||
}
|
||||
|
||||
exports.OAuth.prototype.getOauthAccessToken= function(oauth_token, oauth_token_secret, callback) {
|
||||
require('sys').puts('getOauthAccessToken')
|
||||
var oauthParameters= {
|
||||
"oauth_timestamp": this._getTimestamp(),
|
||||
"oauth_nonce": this._getNonce(32),
|
||||
@ -167,7 +157,7 @@ exports.OAuth.prototype.getOauthAccessToken= function(oauth_token, oauth_token_s
|
||||
if( response.statusCode != 200 ) {
|
||||
callback( response.statusCode +" : " + data );
|
||||
} else {
|
||||
var results= self._splitQueryString(data);
|
||||
var results= querystring.parse( data );
|
||||
var oauth_token= results["oauth_token"];
|
||||
results["oauth_token"]= undefined;
|
||||
var oauth_token_secret= results["oauth_token_secret"];
|
||||
@ -179,9 +169,7 @@ exports.OAuth.prototype.getOauthAccessToken= function(oauth_token, oauth_token_s
|
||||
request.end();
|
||||
}
|
||||
|
||||
exports.OAuth.prototype.getOAuthRequestToken= function(callback) {
|
||||
require('sys').puts('getOauthRequestToken')
|
||||
|
||||
exports.OAuth.prototype.getOAuthRequestToken= function(callback) {
|
||||
var oauthParameters= {
|
||||
"oauth_timestamp": this._getTimestamp(),
|
||||
"oauth_nonce": this._getNonce(32),
|
||||
@ -190,7 +178,6 @@ exports.OAuth.prototype.getOAuthRequestToken= function(callback) {
|
||||
"oauth_consumer_key": this._consumerKey
|
||||
};
|
||||
var method= "POST";
|
||||
require('sys').puts(this._requestUrl)
|
||||
var sig= this._getSignature( method, this._requestUrl, this._normaliseRequestParams(oauthParameters));
|
||||
|
||||
|
||||
@ -226,7 +213,7 @@ exports.OAuth.prototype.getOAuthRequestToken= function(callback) {
|
||||
if( response.statusCode != 200 ) {
|
||||
callback( response.statusCode +" : " + data );
|
||||
} else {
|
||||
var results= self._splitQueryString(data);
|
||||
var results= querystring.parse(data);
|
||||
|
||||
var oauth_token= results["oauth_token"];
|
||||
var oauth_token_secret= results["oauth_token_secret"];
|
||||
|
Loading…
x
Reference in New Issue
Block a user