Skip to content
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

fix: use urlencoded content-type for POST #203

Merged
merged 2 commits into from
Dec 2, 2017
Merged

fix: use urlencoded content-type for POST #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ef46e5
fix: use urlencoded content-type for POST
JustinBeckwith Dec 1, 2017
2a5e434
fix tests
JustinBeckwith Dec 2, 2017
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
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"client library"
],
"dependencies": {
"gtoken": "^2.0.1",
"gtoken": "^2.0.2",
"axios": "^0.17.1",
"jws": "^3.1.4",
"lodash.isstring": "^4.0.1"
Expand Down
16 changes: 12 additions & 4 deletions src/auth/oauth2client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,12 @@ export class OAuth2Client extends AuthClient {
grant_type: 'authorization_code'
};

const res = await this.transporter.request<CredentialRequest>(
{method: 'POST', url, data: values});
const res = await this.transporter.request<CredentialRequest>({
method: 'POST',
url,
data: querystring.stringify(values),
headers: {'Content-Type': 'application/x-www-form-urlencoded'}

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

});

const tokens = res.data as Credentials;
if (res.data && res.data.expires_in) {
Expand Down Expand Up @@ -244,8 +248,12 @@ export class OAuth2Client extends AuthClient {
};

// request for new token
const res = await this.transporter.request<CredentialRequest>(
{method: 'POST', url, data});
const res = await this.transporter.request<CredentialRequest>({
method: 'POST',
url,
data: querystring.stringify(data),
headers: {'Content-Type': 'application/x-www-form-urlencoded'}
});
const tokens = res.data as Credentials;
// TODO: de-duplicate this code from a few spots
if (res.data && res.data.expires_in) {
Expand Down
56 changes: 13 additions & 43 deletions test/test.oauth2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ describe('OAuth2 client', () => {
response_type: 'code token'
};

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
const generated = oauth2client.generateAuthUrl(opts);
Expand All @@ -64,7 +63,6 @@ describe('OAuth2 client', () => {
response_type: 'code token'
};

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
const generated = oauth2client.generateAuthUrl(opts);
Expand All @@ -78,7 +76,6 @@ describe('OAuth2 client', () => {
it('should set response_type param to code if none is given while' +
'generating the consent page url',
(done) => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
const generated = oauth2client.generateAuthUrl();
Expand Down Expand Up @@ -160,7 +157,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
const login = oauth2client.verifySignedJwtWithCerts(
Expand Down Expand Up @@ -202,7 +198,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -245,7 +240,6 @@ describe('OAuth2 client', () => {
data += '.' + signature;

const validAudiences = ['testaudience', 'extra-audience'];
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -285,7 +279,6 @@ describe('OAuth2 client', () => {
// Originally: data += '.'+signature;
data += signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -328,7 +321,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -371,7 +363,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -408,7 +399,6 @@ describe('OAuth2 client', () => {
new Buffer(idToken).toString('base64') + '.' +
'broken-signature';

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -448,7 +438,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -490,7 +479,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -534,7 +522,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -579,7 +566,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
oauth2client.verifySignedJwtWithCerts(
Expand Down Expand Up @@ -621,7 +607,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -665,7 +650,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -707,7 +691,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
assert.throws(() => {
Expand Down Expand Up @@ -749,7 +732,6 @@ describe('OAuth2 client', () => {

data += '.' + signature;

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
oauth2client.verifySignedJwtWithCerts(
Expand All @@ -765,7 +747,6 @@ describe('OAuth2 client', () => {
.replyWithFile(
200,
path.join(__dirname, '../../test/fixtures/oauthcerts.json'));
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
oauth2client.getFederatedSignonCerts((err, certs) => {
Expand All @@ -792,7 +773,6 @@ describe('OAuth2 client', () => {
.replyWithFile(
200,
path.join(__dirname, '../../test/fixtures/oauthcerts.json'));
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
oauth2client.getFederatedSignonCerts((err, certs) => {
Expand All @@ -809,7 +789,6 @@ describe('OAuth2 client', () => {
});

it('should set redirect_uri if not provided in options', () => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
const generated = oauth2client.generateAuthUrl({});
Expand All @@ -819,7 +798,6 @@ describe('OAuth2 client', () => {
});

it('should set client_id if not provided in options', () => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
const generated = oauth2client.generateAuthUrl({});
Expand All @@ -829,7 +807,6 @@ describe('OAuth2 client', () => {
});

it('should override redirect_uri if provided in options', () => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
const generated =
Expand All @@ -840,7 +817,6 @@ describe('OAuth2 client', () => {
});

it('should override client_id if provided in options', () => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
const generated =
Expand All @@ -851,7 +827,6 @@ describe('OAuth2 client', () => {
});

it('should return error in callback on request', (done) => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
oauth2client.request({}, (err, result) => {
Expand All @@ -862,7 +837,6 @@ describe('OAuth2 client', () => {
});

it('should return error in callback on refreshAccessToken', (done) => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
oauth2client.refreshAccessToken((err, result) => {
Expand All @@ -877,7 +851,10 @@ describe('OAuth2 client', () => {

beforeEach(() => {
scope = nock('https://accounts.google.com')
.post('/o/oauth2/token')
.post('/o/oauth2/token', undefined, {
reqheaders:
{'content-type': 'application/x-www-form-urlencoded'}
})
.reply(200, {access_token: 'abc123', expires_in: 1});

nock('http://example.com').get('/').reply(200);
Expand All @@ -888,20 +865,16 @@ describe('OAuth2 client', () => {
});

it('should refresh token if missing access token', (done) => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);

oauth2client.credentials = {refresh_token: 'refresh-token-placeholder'};

oauth2client.request({url: 'http://example.com'}, () => {
assert.equal('abc123', oauth2client.credentials.access_token);
const client = new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
client.credentials = {refresh_token: 'refresh-token-placeholder'};
client.request({url: 'http://example.com'}, err => {
console.error(err);
assert.equal('abc123', client.credentials.access_token);
done();
});
});

it('should refresh if access token is expired', (done) => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);

Expand All @@ -918,7 +891,6 @@ describe('OAuth2 client', () => {
});

it('should not refresh if not expired', (done) => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);

Expand All @@ -937,7 +909,6 @@ describe('OAuth2 client', () => {
});

it('should assume access token is not expired', (done) => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);

Expand All @@ -960,7 +931,6 @@ describe('OAuth2 client', () => {
error: {code: statusCode, message: 'Invalid Credentials'}
});

const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);

Expand All @@ -982,7 +952,6 @@ describe('OAuth2 client', () => {
const scope = nock('https://accounts.google.com')
.get('/o/oauth2/revoke?token=abc')
.reply(200, {success: true});
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
oauth2client.credentials = {access_token: 'abc', refresh_token: 'abc'};
Expand All @@ -997,7 +966,6 @@ describe('OAuth2 client', () => {

it('should clear credentials and return error if no access token to revoke',
(done) => {
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
oauth2client.credentials = {refresh_token: 'abc'};
Expand All @@ -1015,11 +983,13 @@ describe('OAuth2 client', () => {
const now = (new Date()).getTime();
const scope =
nock('https://accounts.google.com')
.post('/o/oauth2/token')
.post('/o/oauth2/token', undefined, {
reqheaders:
{'Content-Type': 'application/x-www-form-urlencoded'}
})
.reply(
200,
{access_token: 'abc', refresh_token: '123', expires_in: 10});
const auth = new GoogleAuth();
const oauth2client =
new OAuth2Client(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI);
oauth2client.getToken('code here', (err, tokens) => {
Expand Down