Skip to content

Update the library to support the OAuth 2.0 authorization #7

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
suhoij wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update the library to support the OAuth 2.0 authorization #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04821e2
Update the library to support the OAuth 2.0 authorization, by sending…
suhoij Dec 7, 2016
bf23fab
Reworked the old code to support current Authorization scheme, by rem…
suhoij Dec 8, 2016
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
24 changes: 11 additions & 13 deletions lib/hubspot/hubspot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ hubspotAPI.prototype.execute = function (verbParams, path, availableParams, give
var body;
var currentParam;
var parsedResponse;
var requestOptions;

var verb = verbParams && verbParams.verb || verbParams;
var headers = {
Expand All @@ -75,30 +74,32 @@ hubspotAPI.prototype.execute = function (verbParams, path, availableParams, give

var finalParams = {};

var requestOptions = {
method: verb,
headers: headers,
encoding: null
};

for (var i = 0; i < availableParams.length; i++) {
currentParam = availableParams[i];
if (typeof givenParams[currentParam] !== 'undefined')
finalParams[currentParam] = givenParams[currentParam];
}

/**
* For OAuth: &access_token=TOKEN
* For OAuth 2.0: Set header "Authorization" = "Bearer " + TOKEN
* For API Keys: &hapikey=KEY
* @see http://developers.hubspot.com/auth/oauth_overview
* @see http://developers.hubspot.com/docs/methods/auth/oauth-overview
*/
if (this.api_key) {
authParams.hapikey = this.api_key;
finalParams.hapikey = this.api_key;
}

if (this.access_token) {
authParams.access_token = this.access_token;
requestOptions.headers["Authorization"] = "Bearer " + this.access_token;
}

requestOptions = {
method: verb,
headers: headers,
encoding: null
};


// some endpoints use array-like parameters that must be stringified.
// also must user querystring instead of qs.
Expand All @@ -119,9 +120,6 @@ hubspotAPI.prototype.execute = function (verbParams, path, availableParams, give
requestOptions[verbParams.json ? 'json' : 'form'] = finalParams;

uri = uri + "?" + qs.stringify(authParams);
} else {
var allParams = _.merge(authParams, finalParams);

}

requestOptions.uri = uri;
Expand Down