Skip to content

Fix the Jwt.expired getter wrong comparison of micro timestamp and timestamp #648

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 2 commits into from
Jul 7, 2021
Merged

Fix the Jwt.expired getter wrong comparison of micro timestamp and timestamp #648

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
ce9d0d7
[Fix] core/Jwt expired getter return always true due to wrong compara…
Jul 6, 2021
8d6d2c4
[Test] Jwt expiration test : convert micro timestamp to timestamp
Jul 7, 2021
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 src/core/Jwt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Jwt {
}

get expired () {
return Date.now() > this.expiresAt;
return Math.round(Date.now() / 1000) > this.expiresAt;
}

_decode () {
Expand Down
4 changes: 2 additions & 2 deletions test/core/Jwt.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('Jwt', () => {
describe('#constructor', () => {
it('should construct a Jwt instance and decode the payload', () => {
const
expiresAt = Date.now() + 3600 * 1000,
expiresAt = Math.round(Date.now() / 1000) + 3600 * 1000,
encodedJwt = generateJwt('user-gordon', expiresAt);

authenticationToken = new Jwt(encodedJwt);
Expand All @@ -41,7 +41,7 @@ describe('Jwt', () => {

describe('#get expired', () => {
it('should return a boolean according to expiresAt', () => {
const encodedJwt = generateJwt('user-gordon', Date.now() - 1000);
const encodedJwt = generateJwt('user-gordon', Math.round(Date.now() / 1000) - 1000);

authenticationToken = new Jwt(encodedJwt);

Expand Down
4 changes: 2 additions & 2 deletions test/mocks/generateJwt.mock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
function generateJwt (userId = 'test-user', expiresAt = null) {
const
header = { alg: 'HS256', typ: 'JWT' },
payload = { _id: userId, iat: Date.now(), exp: expiresAt },
payload = { _id: userId, iat: Math.round(Date.now() / 1000), exp: expiresAt },
signature = 'who cares?';

expiresAt = expiresAt || Date.now() + 3600 * 1000;
expiresAt = expiresAt || Math.round(Date.now() / 1000) + 3600 * 1000;

return [ header, payload, signature]
.map(data => Buffer.from(JSON.stringify(data)).toString('base64'))
Expand Down