verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Vicent Llopis 2023-05-25 10:19:00 +02:00
parent f471d62d41
commit 886c4a15b5
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/changes/232201/00-salix.sql
View File

@ -4,3 +4,7 @@ CREATE TABLE `salix`.`accessTokenConfig` (
`renewInterval` int(10) unsigned DEFAULT NULL, `renewInterval` int(10) unsigned DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
INSERT IGNORE INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `renewInterval`)
VALUES
(1, 21600, 300);

2
db/dump/fixtures.sql
View File

@ -2888,4 +2888,4 @@ INSERT INTO `vn`.`wagonTypeTray` (`id`, `typeFk`, `height`, `colorFk`)
INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `renewInterval`) INSERT INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `renewInterval`)
VALUES VALUES
(0, 50, 100); (1, 21600, 300);

11
front/salix/components/layout/index.js
View File

@ -18,11 +18,13 @@ export class Layout extends Component {
} }
getAccessTokenConfig() { getAccessTokenConfig() {
this.$http.get('AccessTokenConfigs/findOne').then(json => { this.$http.get('AccessTokenConfigs').then(json => {
window.localStorage.renewPeriod = json.data.renewPeriod; const firtsResult = json.data[0];
window.localStorage.renewInterval = json.data.renewInterval; if (!firtsResult) return;
window.localStorage.renewPeriod = firtsResult.renewPeriod;
window.localStorage.renewInterval = firtsResult.renewInterval;
const intervalMilliseconds = json.data.renewInterval * 1000; const intervalMilliseconds = firtsResult.renewInterval * 1000;
this.inservalId = setInterval(this.checkTokenValidity.bind(this), intervalMilliseconds); this.inservalId = setInterval(this.checkTokenValidity.bind(this), intervalMilliseconds);
}); });
} }
@ -35,7 +37,6 @@ export class Layout extends Component {
if (differenceSeconds > window.localStorage.renewPeriod) { if (differenceSeconds > window.localStorage.renewPeriod) {
this.$http.post('VnUsers/renewToken') this.$http.post('VnUsers/renewToken')
.then(json => { .then(json => {
console.log('fin renewToken');
if (json.data.token) { if (json.data.token) {
let remember = true; let remember = true;
if (window.sessionStorage.vnToken) remember = false; if (window.sessionStorage.vnToken) remember = false;