Skip to content

Commit

Permalink
bug(token-message):fix token message
Browse files Browse the repository at this point in the history
[Fixes #168073580]
  • Loading branch information
Ukhu committed Aug 23, 2019
1 parent 1f5c883 commit 042bea4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/middlewares/verifyToken.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ export default (request, response, next) => {
const token = request.headers.authorization || request.query.token || request.params.token;
const { route: { path } } = request;
if (!token) {
return responseMessage(response, 401, { error: 'no token provided' });
return responseMessage(response, 401, { error: 'you have to be signed in to continue' });
}
const secret = (path === verifyPath) ? ACCOUNT_VERIFICATION_SECRET : SECRET_KEY;

jwt.verify(token, secret, async (error, decoded) => {
if (error) {
const message = (error.name === 'TokenExpiredError') ? 'token expired' : 'invalid token';
const message = (error.name === 'TokenExpiredError') ? 'token expired, you have to be signed in to continue' : 'you have to be signed in to continue';
return responseMessage(response, 401, { error: message });
}
try {
Expand Down
6 changes: 3 additions & 3 deletions tests/comment.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe('COMMENT ROUTES', () => {
.end((error, response) => {
expect(response).to.have.status(401);
expect(response.body).to.be.an('object');
expect(response.body.error).to.equal('token expired');
expect(response.body.error).to.equal('token expired, you have to be signed in to continue');
done();
});
});
Expand All @@ -58,7 +58,7 @@ describe('COMMENT ROUTES', () => {
.end((error, response) => {
expect(response).to.have.status(401);
expect(response.body).to.be.an('object');
expect(response.body.error).to.equal('invalid token');
expect(response.body.error).to.equal('you have to be signed in to continue');
done();
});
});
Expand All @@ -70,7 +70,7 @@ describe('COMMENT ROUTES', () => {
.end((error, response) => {
expect(response).to.have.status(401);
expect(response.body).to.be.an('object');
expect(response.body.error).to.equal('no token provided');
expect(response.body.error).to.equal('you have to be signed in to continue');
done();
});
});
Expand Down
8 changes: 4 additions & 4 deletions tests/novel.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ describe('Test for novel CRUD', () => {
.send(validNovel)
.end((err, res) => {
expect(res).to.have.status(401);
expect(res.body.error).to.equal('no token provided');
expect(res.body.error).to.equal('you have to be signed in to continue');
done();
});
});
Expand All @@ -113,7 +113,7 @@ describe('Test for novel CRUD', () => {
.set('authorization', 'wrong token')
.end((err, res) => {
expect(res).to.have.status(401);
expect(res.body.error).to.equal('invalid token');
expect(res.body.error).to.equal('you have to be signed in to continue');
done();
});
});
Expand All @@ -125,7 +125,7 @@ describe('Test for novel CRUD', () => {
.post(endpoint)
.end((err, res) => {
expect(res).status(401);
expect(res.body).property('error').eq('no token provided');
expect(res.body).property('error').eq('you have to be signed in to continue');
done();
});
});
Expand All @@ -136,7 +136,7 @@ describe('Test for novel CRUD', () => {
.set('authorization', invalidToken)
.end((err, res) => {
expect(res).status(401);
expect(res.body).property('error').eq('invalid token');
expect(res.body).property('error').eq('you have to be signed in to continue');
done();
});
});
Expand Down
4 changes: 2 additions & 2 deletions tests/verifyUser.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe('Test for base api base url', () => {
.patch(`${invalidTokenUrl}`)
.end((err, res) => {
expect(res).to.have.status(401);
expect(res.body.error).to.equal('invalid token');
expect(res.body.error).to.equal('you have to be signed in to continue');
});
});

Expand Down Expand Up @@ -120,7 +120,7 @@ describe('Test for base api base url', () => {
.patch(`${expiredTokenUrl}`)
.end((err, res) => {
expect(res).to.have.status(401);
expect(res.body.error).to.equal('token expired');
expect(res.body.error).to.equal('token expired, you have to be signed in to continue');
done();
});
});
Expand Down

0 comments on commit 042bea4

Please sign in to comment.