Skip to content

Fixed getUserFromClient not being awaited in client credentials grant. #218

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

Merged
merged 5 commits into from
Aug 15, 2023
Merged

Fixed getUserFromClient not being awaited in client credentials grant. #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6db51a
Fixed getUserFromClient not awaited.
shrihari-prakash Aug 15, 2023
fc8f4dc
Merge branch 'node-oauth:release-5.0.0' into release-5.0.0
shrihari-prakash Aug 15, 2023
bfc4e8f
Added tests.
shrihari-prakash Aug 15, 2023
204aa1d
Merge branch 'release-5.0.0' of https://github.com/node-oauth/node-oa…
shrihari-prakash Aug 15, 2023
76c1c62
Merge branch 'release-5.0.0' of https://github.com/shrihari-prakash/n…
shrihari-prakash Aug 15, 2023
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
2 changes: 1 addition & 1 deletion lib/grant-types/client-credentials-grant-type.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class ClientCredentialsGrantType extends AbstractGrantType {
}

const scope = this.getScope(request);
const user = this.getUserFromClient(client);
const user = await this.getUserFromClient(client);

return this.saveToken(user, client, scope);
}
Expand Down
13 changes: 10 additions & 3 deletions test/integration/grant-types/client-credentials-grant-type_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,21 @@ describe('ClientCredentialsGrantType integration', function() {
it('should return a token', function() {
const token = {};
const model = {
getUserFromClient: function() { return {}; },
saveToken: function() { return token; },
getUserFromClient: async function(client) {
client.foo.should.equal('bar');
return { id: '123'};
},
saveToken: async function(_token, client, user) {
client.foo.should.equal('bar');
user.id.should.equal('123');
return token;
},
validateScope: function() { return 'foo'; }
};
const grantType = new ClientCredentialsGrantType({ accessTokenLifetime: 120, model: model });
const request = new Request({ body: {}, headers: {}, method: {}, query: {} });

return grantType.handle(request, {})
return grantType.handle(request, { foo: 'bar' })
.then(function(data) {
data.should.equal(token);
})
Expand Down