From d4cd23853ffbd474ee7c55401437c47763a204ef Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 30 Nov 2023 07:32:16 +0100
Subject: [PATCH] refs #6264 perf: try to remove jasmine.clock()

---
 back/methods/vn-user/is-token-valid.js            | 6 ++----
 back/methods/vn-user/renew-token.js               | 2 +-
 back/methods/vn-user/specs/validate-token.spec.js | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/back/methods/vn-user/is-token-valid.js b/back/methods/vn-user/is-token-valid.js
index c5c05a178..23b68797e 100644
--- a/back/methods/vn-user/is-token-valid.js
+++ b/back/methods/vn-user/is-token-valid.js
@@ -2,10 +2,8 @@ const tokenConfig = require('./token-config');
 
 module.exports = async token => {
     const accessTokenConfig = await tokenConfig();
-    let now = Date.now();
-    if (Date?.vnNow !== undefined)
-        now = Date.vnNow();
+    const now = Date.now();
     const differenceMilliseconds = now - token.created;
     const differenceSeconds = Math.floor(differenceMilliseconds / 1000);
-    return differenceSeconds > accessTokenConfig.renewPeriod - accessTokenConfig.courtesyTime;
+    return differenceSeconds < accessTokenConfig.renewPeriod - accessTokenConfig.courtesyTime;
 };
diff --git a/back/methods/vn-user/renew-token.js b/back/methods/vn-user/renew-token.js
index 4226886fc..cb88e665d 100644
--- a/back/methods/vn-user/renew-token.js
+++ b/back/methods/vn-user/renew-token.js
@@ -29,7 +29,7 @@ module.exports = Self => {
 
         // Check if current token is valid
         const isValid = await Self.validateToken(token);
-        if (!isValid) throw new UserError(`The renew period has not been exceeded`, 'periodNotExceeded');
+        if (isValid) throw new UserError(`The renew period has not been exceeded`, 'periodNotExceeded');
 
         const {courtesyTime} = await tokenConfig();
 
diff --git a/back/methods/vn-user/specs/validate-token.spec.js b/back/methods/vn-user/specs/validate-token.spec.js
index 25207336d..ec254d0e5 100644
--- a/back/methods/vn-user/specs/validate-token.spec.js
+++ b/back/methods/vn-user/specs/validate-token.spec.js
@@ -29,13 +29,13 @@ describe('Validate Token', () => {
     });
 
     it('Token is not expired', async() => {
-        jasmine.clock().mockDate(new Date(startingTime + 21600000));
         const isValid = await models.VnUser.validateToken(ctx.req.accessToken);
 
         expect(isValid).toBeTrue();
     });
 
     it('Token is expired', async() => {
+        jasmine.clock().mockDate(new Date(startingTime + 21600000));
         const isValid = await models.VnUser.validateToken(ctx.req.accessToken);
 
         expect(isValid).toBeFalse();