Skip to content

Only encode body in oauth signature if the content-type is x-www-form-urlencoded #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Only encode body in oauth signature if the content-type is x-www-form-urlencoded #11

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4dfd66
Only encode body in oauth signature if the content-type is x-www-form…
david-richer-adsk Feb 5, 2014
1c0077f
Reverse if so true is on top
david-richer-adsk Feb 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion superagent-oauth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@

/**
* Check if `obj` is an object.
*
* @param {Object} obj
* @return {Boolean}
* @api private
*/

function isObject(obj) {
return null != obj && 'object' == typeof obj;
}

module.exports = function (superagent) {

/**
Expand Down Expand Up @@ -54,12 +66,30 @@ module.exports = function (superagent) {
*/

Request.prototype.signOAuth = function () {

var req = this.request();
var type = req.getHeader('Content-Type');
var extra_params = this._oauth_query;

if ('application/x-www-form-urlencoded' == type && isObject(this._data)) {
if(!extra_params) {
Copy link
Contributor

@TooTallNate TooTallNate Feb 5, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about swap this? if (extra_params) {…

extra_params = this._data;
} else {
// merge
var keys = Object.keys(this._data), key;
for (var i = 0; i < keys.length; i++) {
key = keys[i];
extra_params[key] = this._data[key];
}
}
}

var params = this.oa._prepareParameters(
this.token
, this.secret
, this.method
, this.url
, this._data || this._oauth_query // XXX: what if there's query and body? merge?
, extra_params
);

var header = this.oa._isEcho
Expand Down