back/methods/vn-user/is-token-valid.js

@@ -1,8 +1,5 @@
-const tokenConfig = require('./token-config');
-
-module.exports = async token => {
-    const accessTokenConfig = await tokenConfig();
 
+module.exports = async(token, accessTokenConfig) => {
     const now = new Date();
     const differenceMilliseconds = now - token.created;
     const differenceSeconds = Math.floor(differenceMilliseconds / 1000);

back/methods/vn-user/renew-token.js

@@ -1,7 +1,5 @@
 const UserError = require('vn-loopback/util/user-error');
-const tokenConfig = require('./token-config');
+const handlePromiseLogout = (Self, {id}, courtesyTime = 60) => {
-const DEFAULT_COURTESY_TIME = 60;
-const handlePromiseLogout = (Self, {id}, courtesyTime = DEFAULT_COURTESY_TIME) => {
     new Promise(res => {
         setTimeout(() => {
             res(Self.logout(id));
@@ -25,13 +23,14 @@ module.exports = Self => {
     });
 
     Self.renewToken = async function(ctx) {
-        const {accessToken: token} = ctx.req;
+        const models = Self.app.models;
+        const token = ctx.req.accessToken;
 
         // 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');
-
+        const fields = ['courtesyTime'];
-        const {courtesyTime} = await tokenConfig();
+        const {courtesyTime} = await models.AccessTokenConfig.findOne({fields});
 
         // Schedule to remove current token
         handlePromiseLogout(Self, token, courtesyTime);

back/methods/vn-user/token-config.js

@@ -1,9 +0,0 @@
-const DEFAULT_FIELDS = ['renewPeriod', 'courtesyTime'];
-const {models} = require('vn-loopback/server/server');
-let currentAccessTokenConfig = null;
-module.exports = async(fields = DEFAULT_FIELDS) => {
-    if (currentAccessTokenConfig) return currentAccessTokenConfig;
-    const accessTokenConfig = await models.AccessTokenConfig.findOne({fields});
-    if (!accessTokenConfig) currentAccessTokenConfig = accessTokenConfig;
-    return accessTokenConfig;
-};

back/methods/vn-user/validate-token.js

@@ -14,7 +14,9 @@ module.exports = Self => {
     });
 
     Self.validateToken = async function(token) {
-        const isValid = await isTokenValid(token);
+        const fields = ['renewPeriod', 'courtesyTime'];
+        const accessTokenConfig = await Self.app.models.AccessTokenConfig.findOne({fields});
+        const isValid = await isTokenValid(token, accessTokenConfig);
         return isValid;
     };
 };

db/changes/234601/00-updateCourtesyTime.sql

@@ -1,4 +0,0 @@
---  Auto-generated SQL script #202311061003
-UPDATE salix.accessTokenConfig
-	SET courtesyTime=60
-	WHERE id=1;

db/dump/fixtures.sql

@@ -2945,9 +2945,9 @@ INSERT INTO `vn`.`wagonTypeTray` (`id`, `typeFk`, `height`, `colorFk`)
         (2, 1, 50, 2),
         (3, 1, 0, 3);
 
-INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `courtesyTime`, `renewInterval`)
+INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `renewInterval`)
     VALUES
-        (1, 21600, 60, 300);
+        (1, 21600, 300);
 
 INSERT INTO `vn`.`travelConfig` (`id`, `warehouseInFk`, `warehouseOutFk`, `agencyFk`, `companyFk`)
     VALUES

front/core/services/token.js

@@ -82,7 +82,7 @@ export default class Token {
             if (!data) return;
             this.renewPeriod = data.renewPeriod;
             this.stopRenewer();
-            this.intervalId = setInterval(() => this.checkValidity(), data.renewInterval * 1000);
+            this.inservalId = setInterval(() => this.checkValidity(), data.renewInterval * 1000);
         });
     }
 
@@ -113,7 +113,7 @@ export default class Token {
     }
 
     stopRenewer() {
-        clearInterval(this.intervalId);
+        clearInterval(this.inservalId);
     }
 }
 Token.$inject = ['vnInterceptor', '$http', '$rootScope'];