Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Fixed wrong status code for incorrect token requests (#9374)

Browse source 
closes #9346

- server returned 500, happened when you send an empty username/password
- return 400 instead
- error message is/was correct
This commit is contained in:
Hugo Marisco 2018-01-11 15:17:03 +00:00 • committed by Katharina Irrgang
parent b69b9780a9
commit ccb5fd837e
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/server/services/auth/oauth.js
View file

@ -179,7 +179,13 @@ oauth = {
accessToken: authUtils.getBearerAutorizationToken(req)
};
return oauthServer.token()(req, res, next);
return oauthServer.token()(req, res, function (err) {
if (err && err.status === 400) {
err = new common.errors.BadRequestError({err: err, message: err.message});
}
next(err);
});
}
};

32
core/test/unit/services/auth/oauth_spec.js
View file

@ -112,6 +112,38 @@ describe('OAuth', function () {
});
});
it('Can\'t generate access token without username.', function (done) {
req.body = {};
req.authInfo = {ip: '127.0.0.1'};
req.body.grant_type = 'password';
req.body.password = 'password';
res.setHeader = {};
res.end = {};
oAuth.generateAccessToken(req, res, function (err) {
err.errorType.should.eql('BadRequestError');
done();
});
});
it('Can\'t generate access token without password.', function (done) {
req.body = {};
req.authInfo = {ip: '127.0.0.1'};
req.body.grant_type = 'password';
req.body.username = 'username';
res.setHeader = {};
res.end = {};
oAuth.generateAccessToken(req, res, function (err) {
err.errorType.should.eql('BadRequestError');
done();
});
});
it('Handles database error.', function (done) {
req.body = {};
req.client = {