wiki-cafe/node-oauth
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jfromaniello/bug129'

Browse Source
This commit is contained in:
ciaranj
2013-03-05 17:43:51 +00:00
parent a295a66b60 798157c185
commit 8be23c309c
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/oauth2.js
View File

@ -75,7 +75,7 @@ exports.OAuth2.prototype._request= function(method, url, headers, post_body, acc
realHeaders['Host']= parsedUrl.host; realHeaders['Host']= parsedUrl.host;
realHeaders['Content-Length']= post_body ? Buffer.byteLength(post_body) : 0; realHeaders['Content-Length']= post_body ? Buffer.byteLength(post_body) : 0;
if( access_token ) { if( access_token && !('Authorization' in headers)) {
if( ! parsedUrl.query ) parsedUrl.query= {}; if( ! parsedUrl.query ) parsedUrl.query= {};
parsedUrl.query[this._accessTokenName]= access_token; parsedUrl.query[this._accessTokenName]= access_token;
} }

13
tests/oauth2.js
View File

@ -1,7 +1,8 @@
var vows = require('vows'), var vows = require('vows'),
assert = require('assert'), assert = require('assert'),
https = require('https'), https = require('https'),
OAuth2= require('../lib/oauth2').OAuth2; OAuth2= require('../lib/oauth2').OAuth2,
url = require('url');
vows.describe('OAuth2').addBatch({ vows.describe('OAuth2').addBatch({
'Given an OAuth2 instance with clientId and clientSecret, ': { 'Given an OAuth2 instance with clientId and clientSecret, ': {
@ -16,6 +17,16 @@ vows.describe('OAuth2').addBatch({
assert.equal( refresh_token, "refresh"); assert.equal( refresh_token, "refresh");
}); });
}, },
'we should not include access token in both querystring and headers': function (oa) {
oa._request = new OAuth2("clientId", "clientSecret")._request.bind(oa);
oa._executeRequest= function( http_library, options, post_body, callback) {
callback(null, url.parse(options.path, true).query, options.headers);
};
oa.get("/userinfo", 'access', function(error, query, headers) {
assert.ok( !('access_token' in query), "access_token not in query");
assert.ok( 'Authorization' in headers, "Authorization in headers");
});
},
'we should correctly extract the token if received as a JSON literal': function (oa) { 'we should correctly extract the token if received as a JSON literal': function (oa) {
oa._request= function(method, url, headers, post_body, access_token, callback) { oa._request= function(method, url, headers, post_body, access_token, callback) {
callback(null, '{"access_token":"access","refresh_token":"refresh"}'); callback(null, '{"access_token":"access","refresh_token":"refresh"}');