Skip to content

fix(refresh-token): validate scope before revoking token #390 #389

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

fix(refresh-token): validate scope before revoking token #390 #389

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
4abe326
fix(refresh-token): validate scope before revoking token #390
runeb Jan 7, 2026
e971cfb
test(refresh-token): add test for extra scope validation #390
runeb Jan 7, 2026
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
4 changes: 3 additions & 1 deletion lib/grant-types/refresh-token-grant-type.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ class RefreshTokenGrantType extends AbstractGrantType {

let token;
token = await this.getRefreshToken(request, client);
token = await this.revokeToken(token);

// Validate scope before revoking token to prevent destroying tokens on scope validation errors
const scope = this.getScope(request, token);

token = await this.revokeToken(token);

return this.saveToken(token.user, client, scope);
}

Expand Down
29 changes: 29 additions & 0 deletions test/integration/grant-types/refresh-token-grant-type_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
const InvalidArgumentError = require('../../../lib/errors/invalid-argument-error');
const InvalidGrantError = require('../../../lib/errors/invalid-grant-error');
const InvalidRequestError = require('../../../lib/errors/invalid-request-error');
const InvalidScopeError = require('../../../lib/errors/invalid-scope-error');
const RefreshTokenGrantType = require('../../../lib/grant-types/refresh-token-grant-type');
const Request = require('../../../lib/request');
const ServerError = require('../../../lib/errors/server-error');
Expand Down Expand Up @@ -182,6 +183,34 @@ describe('RefreshTokenGrantType integration', function() {

grantType.handle(request, client).should.be.an.instanceOf(Promise);
});

it('should throw an error if extra `scope` is requested', async function() {
const client = { id: 123 };
const token = {
accessToken: 'foo',
client: { id: 123 },
user: { name: 'foo' },
refreshTokenExpiresAt: new Date(new Date() * 2)
};
const model = {
getRefreshToken: async function() {
return token;
},
revokeToken: () => should.fail(),
saveToken: () => should.fail()
};
const grantType = new RefreshTokenGrantType({ accessTokenLifetime: 123, model });
const request = new Request({ body: { refresh_token: 'foobar', scope: 'read' }, headers: {}, method: {}, query: {} });

try {
await grantType.handle(request, client);

should.fail();
} catch (e) {
e.should.be.an.instanceOf(InvalidScopeError);
e.message.should.equal('Invalid scope: Unable to add extra scopes');
}
});
});

describe('getRefreshToken()', function() {
Expand Down