TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-28 22:43:30 +03:00
Code Issues Projects Releases Wiki Activity

🐛 Fix error message for login when password wrong (#8594)

Browse Source 
closes #8565

- isPasswordCorrect fn returns a specific error, which we simply forward
- no need to wrap a custom error into a new custom error
- the rule is always: if you are using a Ghost unit/function, you can expect that this unit returns a custom error
This commit is contained in:
Aileen Nowak 2017-06-19 15:37:58 +07:00 committed by Katharina Irrgang
parent bc301463c7
commit 35bd0aeb60
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/server/models/user.js
View File

@ -673,11 +673,7 @@ User = ghostBookshelf.Model.extend({
});
})
.catch(function onError(err) {
return Promise.reject(new errors.UnauthorizedError({
err: err,
context: i18n.t('errors.models.user.incorrectPassword'),
help: i18n.t('errors.models.user.userUpdateError.help')
}));
return Promise.reject(err);
});
}, function handleError(error) {
if (error.message === 'NotFound' || error.message === 'EmptyResponse') {
@ -705,6 +701,7 @@ User = ghostBookshelf.Model.extend({
}
return Promise.reject(new errors.ValidationError({
context: i18n.t('errors.models.user.incorrectPassword'),
message: i18n.t('errors.models.user.incorrectPassword'),
help: i18n.t('errors.models.user.userUpdateError.help'),
code: 'PASSWORD_INCORRECT'

4
core/test/functional/routes/api/authentication_spec.js
View File

@ -120,14 +120,14 @@ describe('Authentication API', function () {
client_secret: 'not_available'
}).expect('Content-Type', /json/)
.expect('Cache-Control', testUtils.cacheRules.private)
.expect(401)
.expect(422)
.end(function (err, res) {
if (err) {
return done(err);
}
var jsonResponse = res.body;
should.exist(jsonResponse.errors[0].errorType);
jsonResponse.errors[0].errorType.should.eql('UnauthorizedError');
jsonResponse.errors[0].errorType.should.eql('ValidationError');
done();
});
});

6
core/test/functional/routes/api/spam_prevention_spec.js
View File

@ -98,7 +98,7 @@ describe('Spam Prevention API', function () {
client_secret: 'not_available'
})
.expect('Content-Type', /json/)
.expect(401)
.expect(422)
.end(function (err) {
if (err) {
return done(err);
@ -155,7 +155,7 @@ describe('Spam Prevention API', function () {
client_id: 'ghost-admin',
client_secret: 'not_available'
}).expect('Content-Type', /json/)
.expect(401)
.expect(422)
.end(function (err) {
if (err) {
return done(err);
@ -220,7 +220,7 @@ describe('Spam Prevention API', function () {
client_id: 'ghost-admin',
client_secret: 'not_available'
}).expect('Content-Type', /json/)
.expect(401)
.expect(422)
.end(function (err) {
if (err) {
return done(err);

2
core/test/integration/model/model_users_spec.js
View File

@ -628,7 +628,7 @@ describe('User Model', function run() {
return UserModel.check(object).then(userWasLoggedIn)
.catch(function checkError(error) {
should.exist(error);
error.errorType.should.equal('UnauthorizedError');
error.errorType.should.equal('ValidationError');
});
});
});