From b6c8ca20ee9e2eb7b932499300522913f0338175 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Mon, 19 Jun 2023 08:58:20 +0200 Subject: [PATCH 01/20] refs #5339 data --- modules/worker/back/models/operator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/worker/back/models/operator.js b/modules/worker/back/models/operator.js index e9b590fa6..63b5154ed 100644 --- a/modules/worker/back/models/operator.js +++ b/modules/worker/back/models/operator.js @@ -1,6 +1,6 @@ module.exports = function(Self) { Self.observe('after save', async function(ctx) { - const instance = ctx.instance; + const instance = ctx.data; const models = Self.app.models; const options = ctx.options; From cea6fae64949f828aaf202e06ee82963e357cc07 Mon Sep 17 00:00:00 2001 From: vicent Date: Tue, 20 Jun 2023 10:40:57 +0200 Subject: [PATCH 02/20] fix: eliminada variable que no estaba definida --- modules/ticket/back/methods/ticket/setDeleted.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js index 7cc300547..40f3db8c5 100644 --- a/modules/ticket/back/methods/ticket/setDeleted.js +++ b/modules/ticket/back/methods/ticket/setDeleted.js @@ -81,7 +81,7 @@ module.exports = Self => { throw new UserError('You must delete all the buy requests first'); // removes item shelvings - if (hasItemShelvingSales && isSalesAssistant) { + if (hasItemShelvingSales && canDeleteTicketWithPartPrepared) { const promises = []; for (let sale of sales) { if (sale.itemShelvingSale()) { From e99627c0b238c4019fdd894ee154d38616f839dc Mon Sep 17 00:00:00 2001 From: vicent Date: Tue, 20 Jun 2023 11:28:25 +0200 Subject: [PATCH 03/20] codigo innecesario --- modules/ticket/back/methods/ticket/setDeleted.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/ticket/back/methods/ticket/setDeleted.js b/modules/ticket/back/methods/ticket/setDeleted.js index 40f3db8c5..4d7fe73d4 100644 --- a/modules/ticket/back/methods/ticket/setDeleted.js +++ b/modules/ticket/back/methods/ticket/setDeleted.js @@ -81,17 +81,15 @@ module.exports = Self => { throw new UserError('You must delete all the buy requests first'); // removes item shelvings - if (hasItemShelvingSales && canDeleteTicketWithPartPrepared) { - const promises = []; - for (let sale of sales) { - if (sale.itemShelvingSale()) { - const itemShelvingSale = sale.itemShelvingSale(); - const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id, myOptions); - promises.push(destroyedShelving); - } + const promises = []; + for (let sale of sales) { + if (sale.itemShelvingSale()) { + const itemShelvingSale = sale.itemShelvingSale(); + const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id, myOptions); + promises.push(destroyedShelving); } - await Promise.all(promises); } + await Promise.all(promises); // Remove ticket greuges const ticketGreuges = await models.Greuge.find({where: {ticketFk: id}}, myOptions); From 18a810646136d890f9a38035d20c12720e84f079 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 22 Jun 2023 08:56:27 +0200 Subject: [PATCH 04/20] refs #5339 fix after save --- modules/worker/back/models/operator.js | 4 ++-- modules/worker/back/models/operator.json | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/modules/worker/back/models/operator.js b/modules/worker/back/models/operator.js index 63b5154ed..db1ac7e49 100644 --- a/modules/worker/back/models/operator.js +++ b/modules/worker/back/models/operator.js @@ -1,10 +1,10 @@ module.exports = function(Self) { Self.observe('after save', async function(ctx) { - const instance = ctx.data; + const instance = ctx.data || ctx.instance; const models = Self.app.models; const options = ctx.options; - if (!instance.sectorFk || !instance.labelerFk) return; + if (!instance?.sectorFk || !instance?.labelerFk) return; const sector = await models.Sector.findById(instance.sectorFk, { fields: ['mainPrinterFk'] diff --git a/modules/worker/back/models/operator.json b/modules/worker/back/models/operator.json index 9433a0fd5..2417078e1 100644 --- a/modules/worker/back/models/operator.json +++ b/modules/worker/back/models/operator.json @@ -16,18 +16,12 @@ "type": "number" }, "trainFk": { - "type": "number", - "required": true + "type": "number" }, "itemPackingTypeFk": { - "type": "string", - "required": true + "type": "string" }, "warehouseFk": { - "type": "number", - "required": true - }, - "sectorFk": { "type": "number" }, "labelerFk": { From c42b38c5ccdd296e8130db159d849891afdb05a1 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 26 Jun 2023 10:23:34 +0200 Subject: [PATCH 05/20] refs #5900 Code clean, refactor & accurated --- front/salix/components/log/index.html | 12 +++--- front/salix/components/log/index.js | 10 ++--- front/salix/components/log/style.scss | 1 + loopback/common/methods/log/pitInstance.js | 47 ++++++++++++++-------- 4 files changed, 43 insertions(+), 27 deletions(-) diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 084bf9834..16342783d 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -3,7 +3,7 @@ url="{{$ctrl.url}}" filter="$ctrl.filter" data="$ctrl.logs" - order="creationDate DESC, originFk DESC, id DESC" + order="creationDate DESC, id DESC" limit="20"> - -
-
+
{{$ctrl.instance.modelLog.modelI18n}} #{{$ctrl.instance.modelLog.id}} -
+
@@ -258,3 +255,6 @@
+ + diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index b5dac196e..3df367cae 100644 --- a/front/salix/components/log/index.js +++ b/front/salix/components/log/index.js @@ -67,7 +67,7 @@ export default class Controller extends Section { $onInit() { const match = this.url?.match(/(.*)Logs$/); - this.modelI18n = this.translateModel(match && match[1]); + this.modelI18n = match && this.translateModel(match[1]); } $postLink() { @@ -116,7 +116,7 @@ export default class Controller extends Section { const userChanged = originChanged || log.userFk != prevLog.userFk - || nLogs >= 6; + || nLogs >= 5; if (userChanged) { originLog.logs.push(userLog = { user: log.user, @@ -181,8 +181,8 @@ export default class Controller extends Section { props.push({ name: prop, nameI18n: firstUpper(locale.columns?.[prop]) || prop, - old: getVal(olds, prop), - val: getVal(vals, prop) + val: getVal(vals, prop), + old: olds && getVal(olds, prop) }); } props.sort( @@ -220,7 +220,7 @@ export default class Controller extends Section { const instance = res.data; const propNames = Object.keys(instance); const locale = window.validations[modelLog.model]?.locale || {}; - this.instance.props = this.parseProps(propNames, locale, instance, {}); + this.instance.props = this.parseProps(propNames, locale, instance); }) .finally(() => { this.instance.canceler = null; diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index 3ecbbb609..d729d09a3 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -228,6 +228,7 @@ vn-log { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + margin: 0; } & > .change-detail { color: $color-font-light; diff --git a/loopback/common/methods/log/pitInstance.js b/loopback/common/methods/log/pitInstance.js index 1c054c53e..cb671cb7e 100644 --- a/loopback/common/methods/log/pitInstance.js +++ b/loopback/common/methods/log/pitInstance.js @@ -37,37 +37,52 @@ module.exports = Self => { changedModelId: log.changedModelId }; + // Fetch creation and all update logs for record up to requested log + const createdWhere = { action: 'insert', creationDate: {lte: log.creationDate} }; const createdLog = await Self.findOne({ - fields: ['id', 'creationDate'], + fields: ['id', 'creationDate', 'newInstance'], where: Object.assign(createdWhere, where), - order: 'creationDate DESC' + order: 'creationDate DESC, id DESC' }); - if (!createdLog) - throw new NotFoundError('Cannot find creation log'); - const logsWhere = { - id: {between: [ - Math.min(id, createdLog.id), - Math.max(id, createdLog.id) - ]}, - creationDate: {between: [ - createdLog.creationDate, - log.creationDate - ]} + const instance = {}; + + let logsWhere = { + action: 'update' }; + if (createdLog) { + Object.assign(instance, createdLog.newInstance); + Object.assign(logsWhere, { + creationDate: {between: [ + createdLog.creationDate, + log.creationDate + ]}, + id: {between: [ + Math.min(id, createdLog.id), + Math.max(id, createdLog.id) + ]} + }); + } else { + Object.assign(logsWhere, { + creationDate: {lte: log.creationDate}, + id: {lte: id} + }); + } + const logs = await Self.find({ fields: ['newInstance'], where: Object.assign(logsWhere, where), - order: 'creationDate' + order: 'creationDate, id' }); - if (!logs.length) + if (!logs.length && !createdLog) throw new NotFoundError('No logs found for record'); - const instance = {}; + // Merge all logs in order into one instance + for (const log of logs) Object.assign(instance, log.newInstance); From 88e845b511c860b86131da6616ea8bb78b05c41b Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 26 Jun 2023 10:49:09 +0200 Subject: [PATCH 06/20] change applyFilters --- modules/travel/front/search-panel/index.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/travel/front/search-panel/index.js b/modules/travel/front/search-panel/index.js index 9cf417da1..089953127 100644 --- a/modules/travel/front/search-panel/index.js +++ b/modules/travel/front/search-panel/index.js @@ -37,6 +37,16 @@ class Controller extends SearchPanel { } applyFilters(param) { + if (typeof this.filter.scopeDays === 'number') { + const shippedFrom = Date.vnNew(); + shippedFrom.setHours(0, 0, 0, 0); + + const shippedTo = new Date(shippedFrom.getTime()); + shippedTo.setDate(shippedTo.getDate() + this.filter.scopeDays); + shippedTo.setHours(23, 59, 59, 999); + Object.assign(this.filter, {shippedFrom, shippedTo}); + } + this.model.applyFilter({}, this.filter) .then(() => { if (param && this.model._orgData.length === 1) From e980717d149466c5b2c87a7ff4b25f331e02e19a Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 26 Jun 2023 10:56:53 +0200 Subject: [PATCH 07/20] refs #5900, #5772 Changelog updated --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa2ebcd62..47eeb47a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,11 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - (Entradas -> Correo) Al cambiar el tipo de cambio enviará un correo a las personas designadas +- (General -> Históricos) Botón para ver el estado del registro en cada punto +- (General -> Históricos) Al filtar por registro se muestra todo el histórial desde que fue creado ### Changed +- (General -> Históricos) Los registros se muestran agrupados por usuario y entidad +- (Facturas -> Facturación global) Optimizada, generación de PDFs y notificaciones en paralelo ### Fixed -- +- (General -> Históricos) Duplicidades eliminadas +- (Facturas -> Facturación global) Solucionados fallos que paran el proceso ## [2324.01] - 2023-06-15 From ef8e1c4169b1008098615c34ba2429623a0b8b0a Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 26 Jun 2023 10:57:12 +0200 Subject: [PATCH 08/20] refs #5531 refs #5753 fix travelConfig sql --- db/changes/232402/00-hotFix_travelConfig.sql | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 db/changes/232402/00-hotFix_travelConfig.sql diff --git a/db/changes/232402/00-hotFix_travelConfig.sql b/db/changes/232402/00-hotFix_travelConfig.sql new file mode 100644 index 000000000..65450a74d --- /dev/null +++ b/db/changes/232402/00-hotFix_travelConfig.sql @@ -0,0 +1,22 @@ +CREATE TABLE `vn`.`travelConfig` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `warehouseInFk` smallint(6) unsigned NOT NULL DEFAULT 8 COMMENT 'Warehouse de origen', + `warehouseOutFk` smallint(6) unsigned NOT NULL DEFAULT 60 COMMENT 'Warehouse destino', + `agencyFk` int(11) NOT NULL DEFAULT 1378 COMMENT 'Agencia por defecto', + `companyFk` int(10) unsigned NOT NULL DEFAULT 442 COMMENT 'Compañía por defecto', + PRIMARY KEY (`id`), + KEY `travelConfig_FK` (`warehouseInFk`), + KEY `travelConfig_FK_1` (`warehouseOutFk`), + KEY `travelConfig_FK_2` (`agencyFk`), + KEY `travelConfig_FK_3` (`companyFk`), + CONSTRAINT `travelConfig_FK` FOREIGN KEY (`warehouseInFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `travelConfig_FK_1` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `travelConfig_FK_2` FOREIGN KEY (`agencyFk`) REFERENCES `agencyMode` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `travelConfig_FK_3` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; + +INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) + VALUES + ('Entry', 'addFromPackaging', 'WRITE', 'ALLOW', 'ROLE', 'production'), + ('Entry', 'addFromBuy', 'WRITE', 'ALLOW', 'ROLE', 'production'), + ('Supplier', 'getItemsPackaging', 'READ', 'ALLOW', 'ROLE', 'production'); From de62dd9ffdd7be7c13305b6f6df7562a2b7d476e Mon Sep 17 00:00:00 2001 From: carlossa Date: Mon, 26 Jun 2023 12:32:08 +0200 Subject: [PATCH 09/20] refs # e2e fix --- e2e/paths/10-travel/03_descriptor.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/paths/10-travel/03_descriptor.spec.js b/e2e/paths/10-travel/03_descriptor.spec.js index 3752400c6..4723cc4a3 100644 --- a/e2e/paths/10-travel/03_descriptor.spec.js +++ b/e2e/paths/10-travel/03_descriptor.spec.js @@ -9,7 +9,7 @@ describe('Travel descriptor path', () => { browser = await getBrowser(); page = browser.page; await page.loginAndModule('buyer', 'travel'); - await page.write(selectors.travelIndex.generalSearchFilter, '1'); + await page.write(selectors.travelIndex.generalSearchFilter, '3'); await page.keyboard.press('Enter'); await page.waitForState('travel.card.summary'); }); @@ -23,7 +23,7 @@ describe('Travel descriptor path', () => { await page.waitForState('travel.index'); const result = await page.countElement(selectors.travelIndex.anySearchResult); - expect(result).toBeGreaterThanOrEqual(7); + expect(result).toBeGreaterThanOrEqual(1); }); it('should navigate to the first search result', async() => { From 46ffd8d95af931bd0d5d2e42bacaaad192db4a25 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 27 Jun 2023 08:07:54 +0200 Subject: [PATCH 10/20] refs #5554 console.log --- back/methods/vn-user/renew-token.js | 2 ++ front/salix/components/layout/index.js | 1 + 2 files changed, 3 insertions(+) diff --git a/back/methods/vn-user/renew-token.js b/back/methods/vn-user/renew-token.js index 41470dfea..fb99992bf 100644 --- a/back/methods/vn-user/renew-token.js +++ b/back/methods/vn-user/renew-token.js @@ -27,6 +27,8 @@ module.exports = Self => { const accessTokenConfig = await models.AccessTokenConfig.findOne({fields: ['renewPeriod']}); + console.log(userId, created, now, differenceMilliseconds, differenceSeconds, accessTokenConfig.renewPeriod, differenceSeconds <= accessTokenConfig.renewPeriod); + if (differenceSeconds <= accessTokenConfig.renewPeriod) throw new UserError(`The renew period has not been exceeded`); diff --git a/front/salix/components/layout/index.js b/front/salix/components/layout/index.js index dc2313f4f..008d31ab2 100644 --- a/front/salix/components/layout/index.js +++ b/front/salix/components/layout/index.js @@ -49,6 +49,7 @@ export class Layout extends Component { const differenceMilliseconds = now - new Date(this.vnToken.created); const differenceSeconds = Math.floor(differenceMilliseconds / 1000); + console.log(this.vnToken.created, now, differenceMilliseconds, differenceSeconds, this.renewPeriod, differenceSeconds > this.renewPeriod); if (differenceSeconds > this.renewPeriod) { this.$http.post('VnUsers/renewToken') .then(json => { From 1cf5ff9a62114f3c3d269b867c13faa37a6a1d23 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 27 Jun 2023 08:24:31 +0200 Subject: [PATCH 11/20] refs #5554 new Date() --- back/methods/vn-user/renew-token.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/methods/vn-user/renew-token.js b/back/methods/vn-user/renew-token.js index fb99992bf..ee50d06d4 100644 --- a/back/methods/vn-user/renew-token.js +++ b/back/methods/vn-user/renew-token.js @@ -22,7 +22,7 @@ module.exports = Self => { const tokenId = ctx.req.accessToken.id; const now = new Date(); - const differenceMilliseconds = now - created; + const differenceMilliseconds = now - new Date(created); const differenceSeconds = Math.floor(differenceMilliseconds / 1000); const accessTokenConfig = await models.AccessTokenConfig.findOne({fields: ['renewPeriod']}); From 8e5a6dbab3087b1e8028dee180d3a5712cb43318 Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 27 Jun 2023 11:44:23 +0200 Subject: [PATCH 12/20] fix warn --- modules/travel/front/summary/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/travel/front/summary/index.html b/modules/travel/front/summary/index.html index 5d38ed08f..d9dbb0f90 100644 --- a/modules/travel/front/summary/index.html +++ b/modules/travel/front/summary/index.html @@ -92,7 +92,7 @@ {{entry.supplierName}} - {{entry.ref}} + {{entry.reference}} {{entry.hb}} {{entry.freightValue | currency: 'EUR': 2}} {{entry.packageValue | currency: 'EUR': 2}} From f8a972c2f2219a2dcb1aaa8aa84170981253aa0e Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 27 Jun 2023 14:48:22 +0200 Subject: [PATCH 13/20] refs #5094 fix translation --- modules/ticket/front/index/index.html | 2 +- modules/ticket/front/index/locale/es.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index d6e230ebe..59b8e8953 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -156,7 +156,7 @@ icon="install_mobile" ng-show="$ctrl.totalChecked > 0" ng-click="$ctrl.sendDocuware()" - vn-tooltip="Set as delivered and open delivery note(s)" + vn-tooltip="Set as delivered and send delivery note(s) to the tablet" tooltip-position="left"> Date: Wed, 28 Jun 2023 09:09:36 +0200 Subject: [PATCH 14/20] refs #5900 User avatar with sticky position --- front/salix/components/log/index.html | 4 +++- front/salix/components/log/index.js | 10 +++++----- front/salix/components/log/style.scss | 22 ++++++++++++++++------ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index 16342783d..6a1367e28 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -24,7 +24,8 @@
- + @@ -33,6 +34,7 @@ ng-src="/api/Images/user/160x160/{{::userLog.userFk}}/download?access_token={{::$ctrl.vnToken.token}}"> +
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index 3df367cae..176815eef 100644 --- a/front/salix/components/log/index.js +++ b/front/salix/components/log/index.js @@ -115,23 +115,21 @@ export default class Controller extends Section { // User const userChanged = originChanged - || log.userFk != prevLog.userFk - || nLogs >= 5; + || log.userFk != prevLog.userFk; if (userChanged) { originLog.logs.push(userLog = { user: log.user, userFk: log.userFk, logs: [] }); - nLogs = 0; } - nLogs++; // Model const modelChanged = userChanged || log.changedModel != prevLog.changedModel - || log.changedModelId != prevLog.changedModelId; + || log.changedModelId != prevLog.changedModelId + || nLogs >= 6; if (modelChanged) { userLog.logs.push(modelLog = { model: log.changedModel, @@ -140,7 +138,9 @@ export default class Controller extends Section { showValue: log.changedModelValue, logs: [] }); + nLogs = 0; } + nLogs++; modelLog.logs.push(log); diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index d729d09a3..1da55332e 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -44,11 +44,21 @@ vn-log { right: -4px; z-index: 1; } - & > vn-avatar { - cursor: pointer; + & > .user-avatar { + background-color: $color-bg; + padding: $spacing-sm 0; + margin-top: -$spacing-sm; + position: relative; // Compatibility with old browsers + position: sticky; + top: 72px; - &.system { - background-color: $color-main !important; + & > vn-avatar { + cursor: pointer; + display: block; + + &.system { + background-color: $color-main !important; + } } } & > .line { @@ -57,8 +67,8 @@ vn-log { width: 2px; left: 18px; z-index: -1; - top: 44px; - bottom: -2px; + top: 0; + bottom: -$spacing-sm; } } &:last-child > .timeline > .line { From 12481b5f3d61447d3da0464b5583779ac94e8155 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 28 Jun 2023 16:07:24 +0200 Subject: [PATCH 15/20] refs #5900 CSS fix --- front/salix/components/log/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index 1da55332e..07e3dc5b7 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -50,7 +50,7 @@ vn-log { margin-top: -$spacing-sm; position: relative; // Compatibility with old browsers position: sticky; - top: 72px; + top: 64px; & > vn-avatar { cursor: pointer; From d200a1a6950a9a458afcb46a19c78d3972ab14b9 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 28 Jun 2023 16:08:12 +0200 Subject: [PATCH 16/20] refs #5900 CSS fixes --- front/salix/components/log/style.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index 07e3dc5b7..09a762db3 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -48,7 +48,6 @@ vn-log { background-color: $color-bg; padding: $spacing-sm 0; margin-top: -$spacing-sm; - position: relative; // Compatibility with old browsers position: sticky; top: 64px; From 840a88bdc10860cf3354469178b16e7f1abacbaa Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 29 Jun 2023 07:14:45 +0200 Subject: [PATCH 17/20] refs #5833 remove console.logs --- back/methods/vn-user/renew-token.js | 2 -- front/salix/components/layout/index.js | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/back/methods/vn-user/renew-token.js b/back/methods/vn-user/renew-token.js index ee50d06d4..0642f1d6e 100644 --- a/back/methods/vn-user/renew-token.js +++ b/back/methods/vn-user/renew-token.js @@ -27,8 +27,6 @@ module.exports = Self => { const accessTokenConfig = await models.AccessTokenConfig.findOne({fields: ['renewPeriod']}); - console.log(userId, created, now, differenceMilliseconds, differenceSeconds, accessTokenConfig.renewPeriod, differenceSeconds <= accessTokenConfig.renewPeriod); - if (differenceSeconds <= accessTokenConfig.renewPeriod) throw new UserError(`The renew period has not been exceeded`); diff --git a/front/salix/components/layout/index.js b/front/salix/components/layout/index.js index 008d31ab2..449fd8d58 100644 --- a/front/salix/components/layout/index.js +++ b/front/salix/components/layout/index.js @@ -49,7 +49,6 @@ export class Layout extends Component { const differenceMilliseconds = now - new Date(this.vnToken.created); const differenceSeconds = Math.floor(differenceMilliseconds / 1000); - console.log(this.vnToken.created, now, differenceMilliseconds, differenceSeconds, this.renewPeriod, differenceSeconds > this.renewPeriod); if (differenceSeconds > this.renewPeriod) { this.$http.post('VnUsers/renewToken') .then(json => { @@ -59,6 +58,10 @@ export class Layout extends Component { this.vnToken.set(json.data.token, json.data.created, remember); } + }) + .catch(err => { + if (err.status != 400) + throw err; }); } } From 1d993c74e5a67e86a2e42cc5b02ff276c2cab070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Thu, 29 Jun 2023 10:39:07 +0200 Subject: [PATCH 18/20] refs #5590 fix total invoiceOut --- db/dump/fixtures.sql | 32 ++++++-- db/dump/structure.sql | 74 +++++++++++++------ modules/ticket/back/methods/sale/refund.js | 2 +- .../ticket/back/methods/sale/updatePrice.js | 2 +- modules/ticket/back/methods/ticket/addSale.js | 2 +- .../back/methods/ticket/updateDiscount.js | 2 +- 6 files changed, 81 insertions(+), 33 deletions(-) diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index c4338a555..cce9864e1 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -699,12 +699,12 @@ INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agen INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`) VALUES - (1 , 3, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave', 121, 'T1111111', 0, 1, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)), - (2 , 1, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, 'T1111111', 0, 1, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)), - (3 , 1, 7, 1, 6, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, 'T2222222', 0, 3, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)), - (4 , 3, 2, 1, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, 'T3333333', 0, 9, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)), - (5 , 3, 3, 3, 3, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, 'T4444444', 0, 10, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)), - (6 , 1, 3, 3, 3, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Mountain Drive Gotham', 1, 'A1111111', 0, 10, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)), + (1 , 3, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave', 121, NULL, 0, 1, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)), + (2 , 1, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 1, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)), + (3 , 1, 7, 1, 6, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 3, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH)), + (4 , 3, 2, 1, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 9, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH)), + (5 , 3, 3, 3, 3, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 10, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH)), + (6 , 1, 3, 3, 3, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Mountain Drive Gotham', 1, NULL, 0, 10, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH)), (7 , NULL, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 'Mountain Drive Gotham', 1, NULL, 0, 3, 5, 1, util.VN_CURDATE()), (8 , NULL, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1101, 'Bat cave', 121, NULL, 0, 3, 5, 1, util.VN_CURDATE()), (9 , NULL, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1104, 'Stark tower', 124, NULL, 0, 3, 5, 1, util.VN_CURDATE()), @@ -2572,6 +2572,26 @@ INSERT INTO `vn`.`ticketRecalc`(`ticketFk`) CALL `vn`.`ticket_doRecalc`(); +UPDATE `vn`.`ticket` + SET refFk = 'T1111111' + WHERE id IN (1,2); + +UPDATE `vn`.`ticket` + SET refFk = 'T2222222' + WHERE id = 3; + +UPDATE `vn`.`ticket` + SET refFk = 'T3333333' + WHERE id = 4; + +UPDATE `vn`.`ticket` + SET refFk = 'T4444444' + WHERE id = 5; + +UPDATE `vn`.`ticket` + SET refFk = 'A1111111' + WHERE id = 6; + INSERT INTO `vn`.`zoneAgencyMode`(`id`, `agencyModeFk`, `zoneFk`) VALUES (1, 1, 1), diff --git a/db/dump/structure.sql b/db/dump/structure.sql index b07e88fde..8edc5ab9e 100644 --- a/db/dump/structure.sql +++ b/db/dump/structure.sql @@ -12605,7 +12605,7 @@ BEGIN FROM myTicket t WHERE shipped BETWEEN TIMESTAMP(vFrom) AND TIMESTAMP(vTo, '23:59:59'); - CALL vn.ticketGetTotal; + CALL vn.ticketGetTotal(NULL); SELECT v.id, IFNULL(v.landed, v.shipped) landed, v.shipped, v.companyFk, v.nickname, @@ -47167,7 +47167,7 @@ BEGIN ENGINE = MEMORY SELECT vTicketId ticketFk; - CALL ticketGetTotal; + CALL ticketGetTotal(NULL); SELECT total INTO vTotal FROM tmp.ticketTotal; @@ -58494,6 +58494,13 @@ BEGIN DECLARE vIsCEESerial BOOL DEFAULT FALSE; DECLARE vIsCorrectInvoiceDate BOOL; DECLARE vMaxShipped DATE; + DECLARE vDone BOOL; + DECLARE vTicketFk INT; + DECLARE vCursor CURSOR FOR + SELECT id + FROM ticketToInvoice; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE; SET vInvoiceDate = IFNULL(vInvoiceDate, util.VN_CURDATE()); @@ -58579,6 +58586,20 @@ BEGIN FROM invoiceOut WHERE id = vNewInvoiceId; + OPEN vCursor; + l: LOOP + SET vDone = FALSE; + FETCH vCursor INTO vTicketFk; + + IF vDone THEN + LEAVE l; + END IF; + + CALL ticket_recalc(vTicketFk, vTaxArea); + + END LOOP; + CLOSE vCursor; + UPDATE ticket t JOIN tmp.ticketToInvoice ti ON ti.id = t.id SET t.refFk = vNewRef; @@ -58594,10 +58615,6 @@ BEGIN INSERT INTO ticketTracking(stateFk,ticketFk,workerFk) SELECT * FROM tmp.updateInter; - INSERT INTO ticketLog (action, userFk, originFk, description) - SELECT 'UPDATE', account.myUser_getId(), ti.id, CONCAT('Crea factura ', vNewRef) - FROM tmp.ticketToInvoice ti; - CALL invoiceExpenceMake(vNewInvoiceId); CALL invoiceTaxMake(vNewInvoiceId,vTaxArea); @@ -69870,7 +69887,7 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketGetTotal`() +CREATE DEFINER=`root`@`localhost` PROCEDURE `ticketGetTotal`(vTaxArea VARCHAR(25)) BEGIN /** * Calcula el total con IVA para un conjunto de tickets. @@ -69878,7 +69895,7 @@ BEGIN * @table tmp.ticket(ticketFk) Identificadores de los tickets a calcular * @return tmp.ticketTotal Total para cada ticket */ - CALL ticket_getTax(NULL); + CALL ticket_getTax(vTaxArea); DROP TEMPORARY TABLE IF EXISTS tmp.ticketTotal; CREATE TEMPORARY TABLE tmp.ticketTotal @@ -70029,7 +70046,7 @@ BEGIN AND clientFk = vClientFk AND shipped > '2001-01-01'; - CALL vn.ticketGetTotal; + CALL vn.ticketGetTotal(NULL); SELECT c.id, c.name as Cliente, @@ -71878,7 +71895,7 @@ proc: BEGIN LEAVE myLoop; END IF; - CALL ticket_recalc(vTicketFk); + CALL ticket_recalc(vTicketFk, NULL); END LOOP; CLOSE cCur; @@ -72333,15 +72350,15 @@ BEGIN JOIN ticket t ON t.id = tmpTicket.ticketFk; CALL addressTaxArea (); - - IF vTaxArea > '' THEN + + IF vTaxArea IS NOT NULL THEN UPDATE tmp.addressTaxArea SET areaFk = vTaxArea; END IF; + /* Solo se calcula la base imponible (taxableBase) y el impuesto se calculará posteriormente * No se debería cambiar el sistema por problemas con los decimales */ - DROP TEMPORARY TABLE IF EXISTS tmp.ticketTax; CREATE TEMPORARY TABLE tmp.ticketTax (PRIMARY KEY (ticketFk, code, rate)) @@ -72349,7 +72366,7 @@ BEGIN SELECT * FROM ( SELECT tmpTicket.ticketFk, bp.pgcFk, - SUM(s.quantity * s.price * (100 - s.discount)/100 ) AS taxableBase, + SUM(s.quantity * s.price * (100 - s.discount)/100 ) taxableBase, pgc.rate, tc.code, bp.priority @@ -72369,7 +72386,7 @@ BEGIN JOIN pgc ON pgc.code = bp.pgcFk JOIN taxClass tc ON tc.id = bp.taxClassFk GROUP BY tmpTicket.ticketFk, pgc.code, pgc.rate - HAVING taxableBase != 0) t3 + HAVING taxableBase <> 0) t3 ORDER BY priority; DROP TEMPORARY TABLE IF EXISTS tmp.ticketServiceTax; @@ -72378,7 +72395,7 @@ BEGIN ENGINE = MEMORY SELECT tt.ticketFk, pgc.code pgcFk, - SUM(ts.quantity * ts.price) AS taxableBase, + SUM(ts.quantity * ts.price) taxableBase, pgc.rate, tc.code FROM tmp.ticket tt @@ -72394,7 +72411,7 @@ BEGIN JOIN pgc ON pgc.code = bp.pgcFk JOIN taxClass tc ON tc.id = bp.taxClassFk GROUP BY tt.ticketFk, pgc.code - HAVING taxableBase != 0; + HAVING taxableBase <> 0; INSERT INTO tmp.ticketTax (ticketFk, pgcFk, taxableBase, rate, code) SELECT ts.ticketFk, ts.pgcFk, ts.taxableBase, ts.rate, ts.code @@ -72405,8 +72422,8 @@ BEGIN CREATE TEMPORARY TABLE tmp.ticketAmount (INDEX (ticketFk)) ENGINE = MEMORY - SELECT ticketFk, - taxableBase, + SELECT ticketFk, + taxableBase, SUM(CAST(taxableBase * rate / 100 AS DECIMAL(10, 2))) tax, code FROM tmp.ticketTax @@ -72725,20 +72742,31 @@ DELIMITER ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ; DELIMITER ;; -CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_recalc`(vTicketId INT) -BEGIN +CREATE DEFINER=`root`@`localhost` PROCEDURE `ticket_recalc`(vSelf INT, vTaxArea VARCHAR(25)) +proc:BEGIN /** * Calcula y guarda el total con/sin IVA en un ticket. * * @param vTicketId Identificador del ticket */ + DECLARE hasInvoice BOOL; + + SELECT COUNT(*) INTO hasInvoice + FROM ticket + WHERE id = vSelf + AND refFk IS NOT NULL; + + IF hasInvoice THEN + LEAVE proc; + END IF; + DROP TEMPORARY TABLE IF EXISTS tmp.ticket; CREATE TEMPORARY TABLE tmp.ticket ENGINE = MEMORY - SELECT vTicketId ticketFk; + SELECT vSelf ticketFk; - CALL ticketGetTotal; + CALL ticketGetTotal(vTaxArea); UPDATE ticket t JOIN tmp.ticketTotal tt ON tt.ticketFk = t.id diff --git a/modules/ticket/back/methods/sale/refund.js b/modules/ticket/back/methods/sale/refund.js index 7abcedd90..a8191610a 100644 --- a/modules/ticket/back/methods/sale/refund.js +++ b/modules/ticket/back/methods/sale/refund.js @@ -106,7 +106,7 @@ module.exports = Self => { } } - const query = `CALL vn.ticket_recalc(?)`; + const query = `CALL vn.ticket_recalc(?, NULL)`; await Self.rawSql(query, [refundTicket.id], myOptions); if (tx) await tx.commit(); diff --git a/modules/ticket/back/methods/sale/updatePrice.js b/modules/ticket/back/methods/sale/updatePrice.js index 649395da6..62e4ebd42 100644 --- a/modules/ticket/back/methods/sale/updatePrice.js +++ b/modules/ticket/back/methods/sale/updatePrice.js @@ -96,7 +96,7 @@ module.exports = Self => { await sale.updateAttributes({price: newPrice}, myOptions); await Self.rawSql('CALL vn.manaSpellersRequery(?)', [userId], myOptions); - await Self.rawSql('CALL vn.ticket_recalc(?)', [sale.ticketFk], myOptions); + await Self.rawSql('CALL vn.ticket_recalc(?, NULL)', [sale.ticketFk], myOptions); const salesPerson = sale.ticket().client().salesPersonUser(); if (salesPerson) { diff --git a/modules/ticket/back/methods/ticket/addSale.js b/modules/ticket/back/methods/ticket/addSale.js index 85b0510ae..2cd02a8a4 100644 --- a/modules/ticket/back/methods/ticket/addSale.js +++ b/modules/ticket/back/methods/ticket/addSale.js @@ -85,7 +85,7 @@ module.exports = Self => { }, myOptions); await Self.rawSql('CALL vn.sale_calculateComponent(?, NULL)', [newSale.id], myOptions); - await Self.rawSql('CALL vn.ticket_recalc(?)', [id], myOptions); + await Self.rawSql('CALL vn.ticket_recalc(?, NULL)', [id], myOptions); const sale = await models.Sale.findById(newSale.id, { include: { diff --git a/modules/ticket/back/methods/ticket/updateDiscount.js b/modules/ticket/back/methods/ticket/updateDiscount.js index 6feeafa1a..e092ee4ed 100644 --- a/modules/ticket/back/methods/ticket/updateDiscount.js +++ b/modules/ticket/back/methods/ticket/updateDiscount.js @@ -147,7 +147,7 @@ module.exports = Self => { await Promise.all(promises); await Self.rawSql('CALL vn.manaSpellersRequery(?)', [userId], myOptions); - await Self.rawSql('CALL vn.ticket_recalc(?)', [id], myOptions); + await Self.rawSql('CALL vn.ticket_recalc(?, NULL)', [id], myOptions); const ticket = await models.Ticket.findById(id, { include: { From 3bd890c3436d6a9367d9e80f8677efa74331a7f2 Mon Sep 17 00:00:00 2001 From: vicent Date: Thu, 29 Jun 2023 12:11:16 +0200 Subject: [PATCH 19/20] refs #5554 fix: solo llama al back cuando se tiene q renovar --- back/methods/vn-user/renew-token.js | 19 ++- back/methods/vn-user/signIn.js | 2 +- back/models/access-token-config.json | 4 + db/changes/232601/00-salix.sql | 5 +- front/core/services/auth.js | 7 +- front/core/services/interceptor.js | 12 +- front/core/services/token.js | 127 ++++++++++++++++---- front/salix/components/layout/index.html | 4 +- front/salix/components/layout/index.js | 41 +------ front/salix/components/layout/index.spec.js | 45 ------- front/salix/routes.js | 3 +- 11 files changed, 138 insertions(+), 131 deletions(-) diff --git a/back/methods/vn-user/renew-token.js b/back/methods/vn-user/renew-token.js index 0642f1d6e..9850267d6 100644 --- a/back/methods/vn-user/renew-token.js +++ b/back/methods/vn-user/renew-token.js @@ -17,23 +17,22 @@ module.exports = Self => { Self.renewToken = async function(ctx) { const models = Self.app.models; - const userId = ctx.req.accessToken.userId; - const created = ctx.req.accessToken.created; - const tokenId = ctx.req.accessToken.id; + const token = ctx.req.accessToken; const now = new Date(); - const differenceMilliseconds = now - new Date(created); + const differenceMilliseconds = now - token.created; const differenceSeconds = Math.floor(differenceMilliseconds / 1000); - const accessTokenConfig = await models.AccessTokenConfig.findOne({fields: ['renewPeriod']}); + const fields = ['renewPeriod', 'courtesyTime']; + const accessTokenConfig = await models.AccessTokenConfig.findOne({fields}); - if (differenceSeconds <= accessTokenConfig.renewPeriod) - throw new UserError(`The renew period has not been exceeded`); + if (differenceSeconds < accessTokenConfig.renewPeriod - accessTokenConfig.courtesyTime) + throw new UserError(`The renew period has not been exceeded`, 'periodNotExceeded'); - await Self.logout(tokenId); - const user = await Self.findById(userId); + await Self.logout(token.id); + const user = await Self.findById(token.userId); const accessToken = await user.createAccessToken(); - return {token: accessToken.id, created: accessToken.created}; + return {id: accessToken.id, ttl: accessToken.ttl}; }; }; diff --git a/back/methods/vn-user/signIn.js b/back/methods/vn-user/signIn.js index c98f1da54..e52d68df5 100644 --- a/back/methods/vn-user/signIn.js +++ b/back/methods/vn-user/signIn.js @@ -76,6 +76,6 @@ module.exports = Self => { let loginInfo = Object.assign({password}, userInfo); token = await Self.login(loginInfo, 'user'); - return {token: token.id, created: token.created}; + return {token: token.id, ttl: token.ttl}; }; }; diff --git a/back/models/access-token-config.json b/back/models/access-token-config.json index 6d90a0f4d..d5838a158 100644 --- a/back/models/access-token-config.json +++ b/back/models/access-token-config.json @@ -16,6 +16,10 @@ "type": "number", "required": true }, + "courtesyTime": { + "type": "number", + "required": true + }, "renewInterval": { "type": "number", "required": true diff --git a/db/changes/232601/00-salix.sql b/db/changes/232601/00-salix.sql index dc1ed69be..44366abce 100644 --- a/db/changes/232601/00-salix.sql +++ b/db/changes/232601/00-salix.sql @@ -1,10 +1,11 @@ CREATE TABLE `salix`.`accessTokenConfig` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `renewPeriod` int(10) unsigned DEFAULT NULL, + `courtesyTime` int(10) unsigned DEFAULT NULL, `renewInterval` int(10) unsigned DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci; -INSERT IGNORE INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `renewInterval`) +INSERT IGNORE INTO `salix`.`accessTokenConfig` (`id`, `renewPeriod`, `courtesyTime`, `renewInterval`) VALUES - (1, 21600, 300); + (1, 21600, 5, 300); diff --git a/front/core/services/auth.js b/front/core/services/auth.js index ef6c07637..92ff4b061 100644 --- a/front/core/services/auth.js +++ b/front/core/services/auth.js @@ -59,12 +59,13 @@ export default class Auth { password: password || undefined }; + const now = new Date(); return this.$http.post('VnUsers/signIn', params) - .then(json => this.onLoginOk(json, remember)); + .then(json => this.onLoginOk(json, now, remember)); } - onLoginOk(json, remember) { - this.vnToken.set(json.data.token, json.data.created, remember); + onLoginOk(json, now, remember) { + this.vnToken.set(json.data.token, now, json.data.ttl, remember); return this.loadAcls().then(() => { let continueHash = this.$state.params.continue; diff --git a/front/core/services/interceptor.js b/front/core/services/interceptor.js index 3f3d9912b..1c7b1a460 100644 --- a/front/core/services/interceptor.js +++ b/front/core/services/interceptor.js @@ -1,11 +1,15 @@ import ngModule from '../module'; import HttpError from 'core/lib/http-error'; -interceptor.$inject = ['$q', 'vnApp', 'vnToken', '$translate']; -function interceptor($q, vnApp, vnToken, $translate) { +interceptor.$inject = ['$q', 'vnApp', '$translate']; +function interceptor($q, vnApp, $translate) { let apiPath = 'api/'; + let token; return { + setToken(newToken) { + token = newToken; + }, setApiPath(path) { apiPath = path; }, @@ -14,8 +18,8 @@ function interceptor($q, vnApp, vnToken, $translate) { if (config.url.charAt(0) !== '/' && apiPath) config.url = `${apiPath}${config.url}`; - if (vnToken.token) - config.headers.Authorization = vnToken.token; + if (token) + config.headers.Authorization = token; if ($translate.use()) config.headers['Accept-Language'] = $translate.use(); if (config.filter) { diff --git a/front/core/services/token.js b/front/core/services/token.js index c1bb5a173..d0e0b7ced 100644 --- a/front/core/services/token.js +++ b/front/core/services/token.js @@ -6,37 +6,114 @@ import ngModule from '../module'; * @property {String} token The current login token or %null */ export default class Token { - constructor() { - try { - this.token = sessionStorage.getItem('vnToken'); - this.created = sessionStorage.getItem('vnTokenCreated'); - if (!this.token) { - this.token = localStorage.getItem('vnToken'); - this.created = localStorage.getItem('vnTokenCreated'); - } - } catch (e) {} - } - set(token, created, remember) { - this.unset(); - try { - if (remember) { - localStorage.setItem('vnToken', token); - localStorage.setItem('vnTokenCreated', created); - } else { - sessionStorage.setItem('vnToken', token); - sessionStorage.setItem('vnTokenCreated', created); - } - } catch (e) {} + constructor(vnInterceptor, $http, $rootScope) { + Object.assign(this, { + vnInterceptor, + $http, + $rootScope + }); - this.token = token; - this.created = created; + try { + this.getStorage(sessionStorage); + this.remember = true; + + if (!this.token) { + this.getStorage(localStorage); + this.remember = false; + } + } catch (e) {} } + + set(token, created, ttl, remember) { + this.unset(); + + Object.assign(this, { + token, + created, + ttl, + remember + }); + this.vnInterceptor.setToken(token); + + try { + if (remember) + this.setStorage(localStorage, token, created, ttl); + else + this.setStorage(sessionStorage, token, created, ttl); + } catch (e) {} + } + unset() { - localStorage.removeItem('vnToken'); - sessionStorage.removeItem('vnToken'); this.token = null; this.created = null; + this.ttl = null; + this.remember = null; + this.vnInterceptor.setToken(null); + + this.removeStorage(localStorage); + this.removeStorage(sessionStorage); + } + + getStorage(storage) { + this.token = storage.getItem('vnToken'); + this.created = storage.getItem('vnTokenCreated'); + this.renewPeriod = storage.getItem('vnTokenRenewPeriod'); + } + + setStorage(storage, token, created, ttl) { + storage.setItem('vnToken', token); + storage.setItem('vnTokenCreated', created); + storage.setItem('vnTokenTtl', ttl); + } + + removeStorage(storage) { + storage.removeItem('vnToken'); + storage.removeItem('vnTokenCreated'); + storage.removeItem('vnTokenTtl'); + } + + fetchConfig() { + const filter = {fields: ['renewInterval', 'renewPeriod']}; + this.$http.get('AccessTokenConfigs/findOne', {filter}).then(res => { + const data = res.data; + if (!data) return; + this.renewPeriod = data.renewPeriod; + this.stopRenewer(); + this.inservalId = setInterval(() => this.checkValidity(), data.renewInterval * 1000); + this.checkValidity(); + }); + } + + checkValidity() { + if (this.checking) return; + this.checking = true; + const renewPeriod = Math.min(this.ttl, this.renewPeriod) * 1000; + const maxDate = this.created.getTime() + renewPeriod; + const now = new Date(); + + if (now.getTime() <= maxDate) { + this.checking = false; + return; + } + + this.$http.post('VnUsers/renewToken') + .then(res => { + const token = res.data; + this.set(token.id, now, token.ttl, this.remember); + }) + .catch(res => { + if (res.data?.error?.code !== 'periodNotExceeded') + throw res; + }) + .finally(() => { + this.checking = false; + }); + } + + stopRenewer() { + clearInterval(this.inservalId); } } +Token.$inject = ['vnInterceptor', '$http', '$rootScope']; ngModule.service('vnToken', Token); diff --git a/front/salix/components/layout/index.html b/front/salix/components/layout/index.html index 5a525ef77..972defaa1 100644 --- a/front/salix/components/layout/index.html +++ b/front/salix/components/layout/index.html @@ -42,7 +42,7 @@