From 97faa8cae920a6c4fc48c1221c0cbae362fccd31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 10:07:11 +0000 Subject: [PATCH 01/17] Bump datatables.net-dt from 1.12.0 to 1.12.1 Bumps [datatables.net-dt](https://github.com/DataTables/Dist-DataTables-DataTables) from 1.12.0 to 1.12.1. - [Release notes](https://github.com/DataTables/Dist-DataTables-DataTables/releases) - [Commits](https://github.com/DataTables/Dist-DataTables-DataTables/compare/1.12.0...1.12.1) --- updated-dependencies: - dependency-name: datatables.net-dt dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f2d0368f4..7b2161cee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "bootstrap-italia": "^1.4.3", "cross-env": "^7.0.3", "datatables.net": "^1.12.0", - "datatables.net-dt": "^1.12.0", + "datatables.net-dt": "^1.12.1", "datatables.net-responsive": "^2.3.0", "datatables.net-responsive-dt": "^2.3.0", "eslint": "^8.15.0", @@ -4230,9 +4230,9 @@ } }, "node_modules/datatables.net-dt": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/datatables.net-dt/-/datatables.net-dt-1.12.0.tgz", - "integrity": "sha512-V9t7RjcV+kSRBNIj61RYPN+nZuoodVPOdEUIcoelgRzsoR2XC0a1sU5Naevc/vE9CnJhaAyC3hfnW7njL5CWKQ==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/datatables.net-dt/-/datatables.net-dt-1.12.1.tgz", + "integrity": "sha512-HYsHbSYqOqlgsgjKMH/kkCB5455t51GmmtXRxgnDMRbjPLEIKo5CZmAlUe5mdD/RVPRtAUaj5K3SDlkEZ1bUmw==", "dev": true, "dependencies": { "datatables.net": ">=1.11.3", @@ -16017,9 +16017,9 @@ } }, "datatables.net-dt": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/datatables.net-dt/-/datatables.net-dt-1.12.0.tgz", - "integrity": "sha512-V9t7RjcV+kSRBNIj61RYPN+nZuoodVPOdEUIcoelgRzsoR2XC0a1sU5Naevc/vE9CnJhaAyC3hfnW7njL5CWKQ==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/datatables.net-dt/-/datatables.net-dt-1.12.1.tgz", + "integrity": "sha512-HYsHbSYqOqlgsgjKMH/kkCB5455t51GmmtXRxgnDMRbjPLEIKo5CZmAlUe5mdD/RVPRtAUaj5K3SDlkEZ1bUmw==", "dev": true, "requires": { "datatables.net": ">=1.11.3", diff --git a/package.json b/package.json index b9ba50d07..fbbd9addb 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "bootstrap-italia": "^1.4.3", "cross-env": "^7.0.3", "datatables.net": "^1.12.0", - "datatables.net-dt": "^1.12.0", + "datatables.net-dt": "^1.12.1", "datatables.net-responsive": "^2.3.0", "datatables.net-responsive-dt": "^2.3.0", "eslint": "^8.15.0", From 3a78bec529fa586c425f44bb7aa378aac437f6af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 10:07:27 +0000 Subject: [PATCH 02/17] Bump sass from 1.51.0 to 1.52.0 Bumps [sass](https://github.com/sass/dart-sass) from 1.51.0 to 1.52.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.51.0...1.52.0) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f2d0368f4..3178e8994 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "popper.js": "^1.16.1", "postcss": "^8.4.14", "resolve-url-loader": "^5.0.0", - "sass": "^1.51.0", + "sass": "^1.52.0", "sass-loader": "^13.0.0", "stylelint": "^14.8.2", "stylelint-config-standard-scss": "^3.0.0", @@ -10256,9 +10256,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.51.0.tgz", - "integrity": "sha512-haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.0.tgz", + "integrity": "sha512-6EnTglag2oVD8sNJCxUi2Jd3ICH9tJ5Mqudt/gIZNBR2uKJUBZuTpW9O1t04SkDLP7VFa76FCWTV2rwchqM8Kw==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -20494,9 +20494,9 @@ "dev": true }, "sass": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.51.0.tgz", - "integrity": "sha512-haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.0.tgz", + "integrity": "sha512-6EnTglag2oVD8sNJCxUi2Jd3ICH9tJ5Mqudt/gIZNBR2uKJUBZuTpW9O1t04SkDLP7VFa76FCWTV2rwchqM8Kw==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", diff --git a/package.json b/package.json index b9ba50d07..db49844dd 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "popper.js": "^1.16.1", "postcss": "^8.4.14", "resolve-url-loader": "^5.0.0", - "sass": "^1.51.0", + "sass": "^1.52.0", "sass-loader": "^13.0.0", "stylelint": "^14.8.2", "stylelint-config-standard-scss": "^3.0.0", From 11694655dac17906cbfe446b02c1c70e051c6563 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 10:37:20 +0000 Subject: [PATCH 03/17] Bump datatables.net from 1.12.0 to 1.12.1 Bumps [datatables.net](https://github.com/DataTables/Dist-DataTables) from 1.12.0 to 1.12.1. - [Release notes](https://github.com/DataTables/Dist-DataTables/releases) - [Commits](https://github.com/DataTables/Dist-DataTables/commits) --- updated-dependencies: - dependency-name: datatables.net dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 61356952e..fdf1c5ebc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "axios-extensions": "^3.1.3", "bootstrap-italia": "^1.4.3", "cross-env": "^7.0.3", - "datatables.net": "^1.12.0", + "datatables.net": "^1.12.1", "datatables.net-dt": "^1.12.1", "datatables.net-responsive": "^2.3.0", "datatables.net-responsive-dt": "^2.3.0", @@ -4221,9 +4221,9 @@ "dev": true }, "node_modules/datatables.net": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.12.0.tgz", - "integrity": "sha512-oCKzEqv7kDGOpdE4WE+hTEKgYZ0+pnQ6jDl/fr2HQKlb1AaNTWaeG/3skoGk51fyf80ET/bwlFyMI3hgvKv71Q==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.12.1.tgz", + "integrity": "sha512-e6XAMUoV41JdQPS/r9YRfRcmTPcCVvyZbWI+xog1Zg+kjVliMQbEkvWK5XFItmi64Cvwg+IqsZbTUJ1KSY3umA==", "dev": true, "dependencies": { "jquery": ">=1.7" @@ -16008,9 +16008,9 @@ "dev": true }, "datatables.net": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.12.0.tgz", - "integrity": "sha512-oCKzEqv7kDGOpdE4WE+hTEKgYZ0+pnQ6jDl/fr2HQKlb1AaNTWaeG/3skoGk51fyf80ET/bwlFyMI3hgvKv71Q==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.12.1.tgz", + "integrity": "sha512-e6XAMUoV41JdQPS/r9YRfRcmTPcCVvyZbWI+xog1Zg+kjVliMQbEkvWK5XFItmi64Cvwg+IqsZbTUJ1KSY3umA==", "dev": true, "requires": { "jquery": ">=1.7" diff --git a/package.json b/package.json index 6eee3243c..fff03d4b1 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "axios-extensions": "^3.1.3", "bootstrap-italia": "^1.4.3", "cross-env": "^7.0.3", - "datatables.net": "^1.12.0", + "datatables.net": "^1.12.1", "datatables.net-dt": "^1.12.1", "datatables.net-responsive": "^2.3.0", "datatables.net-responsive-dt": "^2.3.0", From 0820170d41038f9112df73950ada30251afbfffa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 10:07:58 +0000 Subject: [PATCH 04/17] Bump stylelint-webpack-plugin from 3.2.0 to 3.3.0 Bumps [stylelint-webpack-plugin](https://github.com/webpack-contrib/stylelint-webpack-plugin) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/webpack-contrib/stylelint-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/stylelint-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/stylelint-webpack-plugin/compare/v3.2.0...v3.3.0) --- updated-dependencies: - dependency-name: stylelint-webpack-plugin dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 86 +++++++++++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdf1c5ebc..e099355fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "sass-loader": "^13.0.0", "stylelint": "^14.8.2", "stylelint-config-standard-scss": "^3.0.0", - "stylelint-webpack-plugin": "^3.2.0", + "stylelint-webpack-plugin": "^3.3.0", "swagger-ui": "^4.11.1", "throttle-debounce": "^5.0.0", "upper-case-first": "^2.0.2" @@ -11153,14 +11153,14 @@ } }, "node_modules/stylelint-webpack-plugin": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/stylelint-webpack-plugin/-/stylelint-webpack-plugin-3.2.0.tgz", - "integrity": "sha512-KY4P+0wrs5G680LzNLt8UZDiX3j+UNNDt1BBEdlhZUiUUYAI0j9Lumf5QH9eRHx/uMZcpKbboiYWba0F+jMWTg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/stylelint-webpack-plugin/-/stylelint-webpack-plugin-3.3.0.tgz", + "integrity": "sha512-F53bapIZ9zI16ero8IWm6TrUE6SSibZBphJE9b5rR2FxtvmGmm1YmS+a5xjQzn63+cv71GVSCu4byX66fBLpEw==", "dev": true, "dependencies": { "globby": "^11.1.0", - "jest-worker": "^27.5.1", - "micromatch": "^4.0.4", + "jest-worker": "^28.1.0", + "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "schema-utils": "^4.0.0" }, @@ -11224,6 +11224,29 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/stylelint-webpack-plugin/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/stylelint-webpack-plugin/node_modules/jest-worker": { + "version": "28.1.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz", + "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==", + "dev": true, + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, "node_modules/stylelint-webpack-plugin/node_modules/json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -11249,6 +11272,21 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/stylelint-webpack-plugin/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/stylelint/node_modules/balanced-match": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", @@ -21237,14 +21275,14 @@ } }, "stylelint-webpack-plugin": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/stylelint-webpack-plugin/-/stylelint-webpack-plugin-3.2.0.tgz", - "integrity": "sha512-KY4P+0wrs5G680LzNLt8UZDiX3j+UNNDt1BBEdlhZUiUUYAI0j9Lumf5QH9eRHx/uMZcpKbboiYWba0F+jMWTg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/stylelint-webpack-plugin/-/stylelint-webpack-plugin-3.3.0.tgz", + "integrity": "sha512-F53bapIZ9zI16ero8IWm6TrUE6SSibZBphJE9b5rR2FxtvmGmm1YmS+a5xjQzn63+cv71GVSCu4byX66fBLpEw==", "dev": true, "requires": { "globby": "^11.1.0", - "jest-worker": "^27.5.1", - "micromatch": "^4.0.4", + "jest-worker": "^28.1.0", + "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "schema-utils": "^4.0.0" }, @@ -21284,6 +21322,23 @@ "slash": "^3.0.0" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "jest-worker": { + "version": "28.1.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz", + "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + } + }, "json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", @@ -21301,6 +21356,15 @@ "ajv-formats": "^2.1.1", "ajv-keywords": "^5.0.0" } + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } } } }, diff --git a/package.json b/package.json index fff03d4b1..274ae8479 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "sass-loader": "^13.0.0", "stylelint": "^14.8.2", "stylelint-config-standard-scss": "^3.0.0", - "stylelint-webpack-plugin": "^3.2.0", + "stylelint-webpack-plugin": "^3.3.0", "swagger-ui": "^4.11.1", "throttle-debounce": "^5.0.0", "upper-case-first": "^2.0.2" From adc97896e35fd6019ddbdaf9f08907957af1ba18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 10:08:21 +0000 Subject: [PATCH 05/17] Bump stylelint from 14.8.2 to 14.8.3 Bumps [stylelint](https://github.com/stylelint/stylelint) from 14.8.2 to 14.8.3. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/14.8.2...14.8.3) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 28 +++++++--------------------- package.json | 2 +- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdf1c5ebc..b535d6b89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,7 @@ "resolve-url-loader": "^5.0.0", "sass": "^1.52.0", "sass-loader": "^13.0.0", - "stylelint": "^14.8.2", + "stylelint": "^14.8.3", "stylelint-config-standard-scss": "^3.0.0", "stylelint-webpack-plugin": "^3.2.0", "swagger-ui": "^4.11.1", @@ -8185,12 +8185,6 @@ "node": ">=0.10.0" } }, - "node_modules/normalize-selector": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz", - "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=", - "dev": true - }, "node_modules/normalize-url": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", @@ -11030,9 +11024,9 @@ } }, "node_modules/stylelint": { - "version": "14.8.2", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.8.2.tgz", - "integrity": "sha512-tjDfexCYfoPdl/xcDJ9Fv+Ko9cvzbDnmdiaqEn3ovXHXasi/hbkt5tSjsiReQ+ENqnz0eltaX/AOO+AlzVdcNA==", + "version": "14.8.3", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.8.3.tgz", + "integrity": "sha512-aLpskXwSgFEBYbFRKA/BfuyYMGuXNtn2t5GqoffNPSezvw97x/vVNWcZNF0+cwt+LBjfvyq9/MRE3OjInGRgNA==", "dev": true, "dependencies": { "balanced-match": "^2.0.0", @@ -11058,7 +11052,6 @@ "meow": "^9.0.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", - "normalize-selector": "^0.2.0", "picocolors": "^1.0.0", "postcss": "^8.4.13", "postcss-media-query-parser": "^0.2.3", @@ -19007,12 +19000,6 @@ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", "dev": true }, - "normalize-selector": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz", - "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=", - "dev": true - }, "normalize-url": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", @@ -21104,9 +21091,9 @@ } }, "stylelint": { - "version": "14.8.2", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.8.2.tgz", - "integrity": "sha512-tjDfexCYfoPdl/xcDJ9Fv+Ko9cvzbDnmdiaqEn3ovXHXasi/hbkt5tSjsiReQ+ENqnz0eltaX/AOO+AlzVdcNA==", + "version": "14.8.3", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.8.3.tgz", + "integrity": "sha512-aLpskXwSgFEBYbFRKA/BfuyYMGuXNtn2t5GqoffNPSezvw97x/vVNWcZNF0+cwt+LBjfvyq9/MRE3OjInGRgNA==", "dev": true, "requires": { "balanced-match": "^2.0.0", @@ -21132,7 +21119,6 @@ "meow": "^9.0.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", - "normalize-selector": "^0.2.0", "picocolors": "^1.0.0", "postcss": "^8.4.13", "postcss-media-query-parser": "^0.2.3", diff --git a/package.json b/package.json index fff03d4b1..5d284a229 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "resolve-url-loader": "^5.0.0", "sass": "^1.52.0", "sass-loader": "^13.0.0", - "stylelint": "^14.8.2", + "stylelint": "^14.8.3", "stylelint-config-standard-scss": "^3.0.0", "stylelint-webpack-plugin": "^3.2.0", "swagger-ui": "^4.11.1", From e439c49e003f5063a0fbd068c6f25e9d7aee6e41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 10:08:49 +0000 Subject: [PATCH 06/17] Bump eslint from 8.15.0 to 8.16.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.15.0 to 8.16.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.15.0...v8.16.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 50 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdf1c5ebc..abcefe974 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "datatables.net-dt": "^1.12.1", "datatables.net-responsive": "^2.3.0", "datatables.net-responsive-dt": "^2.3.0", - "eslint": "^8.15.0", + "eslint": "^8.16.0", "eslint-plugin-vue": "^9.0.1", "eslint-webpack-plugin": "^3.1.1", "iframe-resizer": "^4.3.2", @@ -1658,15 +1658,15 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.3.tgz", - "integrity": "sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz", + "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", "espree": "^9.3.2", - "globals": "^13.9.0", + "globals": "^13.15.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -4723,12 +4723,12 @@ } }, "node_modules/eslint": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.15.0.tgz", - "integrity": "sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz", + "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.2.3", + "@eslint/eslintrc": "^1.3.0", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -4746,7 +4746,7 @@ "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", "glob-parent": "^6.0.1", - "globals": "^13.6.0", + "globals": "^13.15.0", "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", @@ -5007,9 +5007,9 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "13.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", - "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", + "version": "13.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz", + "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -13878,15 +13878,15 @@ "dev": true }, "@eslint/eslintrc": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.3.tgz", - "integrity": "sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz", + "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", "espree": "^9.3.2", - "globals": "^13.9.0", + "globals": "^13.15.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -16427,12 +16427,12 @@ "dev": true }, "eslint": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.15.0.tgz", - "integrity": "sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz", + "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==", "dev": true, "requires": { - "@eslint/eslintrc": "^1.2.3", + "@eslint/eslintrc": "^1.3.0", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -16450,7 +16450,7 @@ "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", "glob-parent": "^6.0.1", - "globals": "^13.6.0", + "globals": "^13.15.0", "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", @@ -16541,9 +16541,9 @@ } }, "globals": { - "version": "13.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", - "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", + "version": "13.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz", + "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==", "dev": true, "requires": { "type-fest": "^0.20.2" diff --git a/package.json b/package.json index fff03d4b1..220f2336f 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "datatables.net-dt": "^1.12.1", "datatables.net-responsive": "^2.3.0", "datatables.net-responsive-dt": "^2.3.0", - "eslint": "^8.15.0", + "eslint": "^8.16.0", "eslint-plugin-vue": "^9.0.1", "eslint-webpack-plugin": "^3.1.1", "iframe-resizer": "^4.3.2", From 3cbe31b216f38f69989ad8bf9e6fc0b7b5015da0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 11:17:27 +0000 Subject: [PATCH 07/17] Bump sass from 1.52.0 to 1.52.1 Bumps [sass](https://github.com/sass/dart-sass) from 1.52.0 to 1.52.1. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.52.0...1.52.1) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 04d67e75b..6b3c473b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "popper.js": "^1.16.1", "postcss": "^8.4.14", "resolve-url-loader": "^5.0.0", - "sass": "^1.52.0", + "sass": "^1.52.1", "sass-loader": "^13.0.0", "stylelint": "^14.8.3", "stylelint-config-standard-scss": "^3.0.0", @@ -10250,9 +10250,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.0.tgz", - "integrity": "sha512-6EnTglag2oVD8sNJCxUi2Jd3ICH9tJ5Mqudt/gIZNBR2uKJUBZuTpW9O1t04SkDLP7VFa76FCWTV2rwchqM8Kw==", + "version": "1.52.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz", + "integrity": "sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -20519,9 +20519,9 @@ "dev": true }, "sass": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.0.tgz", - "integrity": "sha512-6EnTglag2oVD8sNJCxUi2Jd3ICH9tJ5Mqudt/gIZNBR2uKJUBZuTpW9O1t04SkDLP7VFa76FCWTV2rwchqM8Kw==", + "version": "1.52.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz", + "integrity": "sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", diff --git a/package.json b/package.json index f125e8603..2f094c94e 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "popper.js": "^1.16.1", "postcss": "^8.4.14", "resolve-url-loader": "^5.0.0", - "sass": "^1.52.0", + "sass": "^1.52.1", "sass-loader": "^13.0.0", "stylelint": "^14.8.3", "stylelint-config-standard-scss": "^3.0.0", From 292c2003a883e01b85d842ae02bec354f49af4ab Mon Sep 17 00:00:00 2001 From: Davide Porrovecchio Date: Tue, 24 May 2022 11:44:48 +0200 Subject: [PATCH 08/17] Add new config params --- build.xml | 2 ++ config/single-digital-gateway-service.php | 2 ++ env/build.properties.example | 2 ++ env/build.properties.testing | 2 ++ env/env-dusk.template | 2 ++ env/env-laravel.template | 2 ++ 6 files changed, 12 insertions(+) diff --git a/build.xml b/build.xml index 58c820f57..170bdeb0c 100644 --- a/build.xml +++ b/build.xml @@ -120,6 +120,8 @@ + + diff --git a/config/single-digital-gateway-service.php b/config/single-digital-gateway-service.php index 6b3d0b208..8a1fa91af 100644 --- a/config/single-digital-gateway-service.php +++ b/config/single-digital-gateway-service.php @@ -3,6 +3,8 @@ return [ 'api_key' => env('SDG_API_KEY'), 'api_public_url' => env('SDG_API_PUBLIC_URL'), + 'api_uniqueid_endpoint' => env('SDG_API_UNIQUEID_ENDPOINT'), + 'api_stats_is_endpoint' => env('SDG_API_STATS_IS_ENDPOINT'), 'ssl_verify' => env('SDG_API_SSL_VERIFY'), 'storage_directory' => env('SDG_STORAGE_DIRECTORY', 'sdg'), 'storage_disk' => env('SDG_STORAGE_DISK', 'persistent'), diff --git a/env/build.properties.example b/env/build.properties.example index 45d0ccac5..8ad880a2c 100644 --- a/env/build.properties.example +++ b/env/build.properties.example @@ -284,6 +284,8 @@ ANALYTICS_WIDGETS_BASE_URL=/ # --------------------------------------- SDG_API_PUBLIC_URL= +SDG_API_UNIQUEID_ENDPOINT= +SDG_API_STATS_IS_ENDPOINT= SDG_API_SSL_VERIFY=false SDG_API_KEY= SDG_STORAGE_DIRECTORY=sdg diff --git a/env/build.properties.testing b/env/build.properties.testing index 5f6355d07..6f352d835 100644 --- a/env/build.properties.testing +++ b/env/build.properties.testing @@ -283,6 +283,8 @@ ANALYTICS_WIDGETS_BASE_URL=/ # ---------------------- SDG_API_PUBLIC_URL= +SDG_API_UNIQUEID_ENDPOINT= +SDG_API_STATS_IS_ENDPOINT= SDG_API_SSL_VERIFY=false SDG_API_KEY= SDG_STORAGE_DIRECTORY=sdg diff --git a/env/env-dusk.template b/env/env-dusk.template index a539256d7..abdf62276 100644 --- a/env/env-dusk.template +++ b/env/env-dusk.template @@ -95,6 +95,8 @@ ANALYTICS_PUBLIC_DASHBOARD_ID= ANALYTICS_CRON_ARCHIVING_ENABLED=@MATOMO_CRON_ARCHIVING_ENABLED@ SDG_API_PUBLIC_URL=@SDG_API_PUBLIC_URL@ +SDG_API_UNIQUEID_ENDPOINT=@SDG_API_UNIQUEID_ENDPOINT@ +SDG_API_STATS_IS_ENDPOINT=@SDG_API_STATS_IS_ENDPOINT@ SDG_API_SSL_VERIFY=@SDG_API_SSL_VERIFY@ SDG_API_KEY=@SDG_API_KEY@ SDG_STORAGE_DIRECTORY=@SDG_STORAGE_DIRECTORY@ diff --git a/env/env-laravel.template b/env/env-laravel.template index 29307066e..862e36f7f 100644 --- a/env/env-laravel.template +++ b/env/env-laravel.template @@ -123,6 +123,8 @@ ANALYTICS_PUBLIC_DASHBOARD_ID=@ANALYTICS_PUBLIC_DASHBOARD_ID@ ANALYTICS_CRON_ARCHIVING_ENABLED=@MATOMO_CRON_ARCHIVING_ENABLED@ SDG_API_PUBLIC_URL=@SDG_API_PUBLIC_URL@ +SDG_API_UNIQUEID_ENDPOINT=@SDG_API_UNIQUEID_ENDPOINT@ +SDG_API_STATS_IS_ENDPOINT=@SDG_API_STATS_IS_ENDPOINT@ SDG_API_SSL_VERIFY=@SDG_API_SSL_VERIFY@ SDG_API_KEY=@SDG_API_KEY@ SDG_STORAGE_DIRECTORY=@SDG_STORAGE_DIRECTORY@ From fcabc150cd3bc60c834fabeee8eb99b5c7bc47aa Mon Sep 17 00:00:00 2001 From: Davide Porrovecchio Date: Tue, 24 May 2022 11:45:24 +0200 Subject: [PATCH 09/17] Update client to use new config params --- app/Services/SingleDigitalGatewayService.php | 23 ++++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/app/Services/SingleDigitalGatewayService.php b/app/Services/SingleDigitalGatewayService.php index acaa44365..70cf8dd06 100644 --- a/app/Services/SingleDigitalGatewayService.php +++ b/app/Services/SingleDigitalGatewayService.php @@ -19,18 +19,25 @@ class SingleDigitalGatewayService { /** - * Local service URL. + * Base service URL. * - * @var string the local URL + * @var string the base service URL */ protected $serviceBaseUri; /** - * Public service URL. + * Unique ID endpoint. * - * @var string the public URL + * @var string the unique ID endpoint */ - protected $servicePublicUrl; + protected $serviceUniqueIdEndpoint; + + /** + * Stats IS endpoint. + * + * @var string the stats IS endpoint + */ + protected $serviceStatsIsEndpoint; /** * SSL verification flag. @@ -52,6 +59,8 @@ class SingleDigitalGatewayService public function __construct() { $this->serviceBaseUri = config('single-digital-gateway-service.api_public_url'); + $this->serviceUniqueIdEndpoint = config('single-digital-gateway-service.api_uniqueid_endpoint'); + $this->serviceStatsIsEndpoint = config('single-digital-gateway-service.api_stats_is_endpoint'); $this->SSLVerify = config('single-digital-gateway-service.ssl_verify'); $this->apiKey = config('single-digital-gateway-service.api_key'); $this->storageDisk = config('single-digital-gateway-service.storage_disk'); @@ -65,7 +74,7 @@ public function __construct() */ public function getUniqueID(): string { - return $this->apiCall('unique-id'); + return $this->apiCall($this->serviceUniqueIdEndpoint); } /** @@ -97,7 +106,7 @@ public function sendStatisticsInformation($dataset): void $requestDatetime = Carbon::now()->format('Y-m-d_H-i-s'); Storage::disk($this->storageDisk)->put($this->storageDirectory . "/requests/req_{$requestDatetime}.json", json_encode($dataset, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . PHP_EOL); - $response = $this->apiCall('statistics/information-services', 'POST', [], (array) $dataset); + $response = $this->apiCall($this->serviceStatsIsEndpoint, 'POST', [], (array) $dataset); $responseDatetime = Carbon::now()->format('Y-m-d_H-i-s'); Storage::disk($this->storageDisk)->put($this->storageDirectory . "/responses/res_{$responseDatetime}.json", json_encode(json_decode($response), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . PHP_EOL); From b51a245c72335ee2217dc1b8a2b1281a82925627 Mon Sep 17 00:00:00 2001 From: Davide Porrovecchio Date: Tue, 24 May 2022 14:03:11 +0200 Subject: [PATCH 10/17] Add WaiCustom matomo plugin --- build.xml | 1 + containers/docker-compose.yml | 1 + containers/matomo/Dockerfile | 11 +++++++++++ env/build.properties.example | 1 + env/build.properties.testing | 1 + env/env-containers.template | 1 + 6 files changed, 16 insertions(+) diff --git a/build.xml b/build.xml index 170bdeb0c..d3ee6802d 100644 --- a/build.xml +++ b/build.xml @@ -142,6 +142,7 @@ + diff --git a/containers/docker-compose.yml b/containers/docker-compose.yml index 49c12b8ec..99da60ea8 100644 --- a/containers/docker-compose.yml +++ b/containers/docker-compose.yml @@ -145,6 +145,7 @@ services: - MATOMO_PLUGIN_VISITORGENERATOR_VERSION=${MATOMO_PLUGIN_VISITORGENERATOR_VERSION} - MATOMO_PLUGIN_RESETDATABASE_VERSION=${MATOMO_PLUGIN_RESETDATABASE_VERSION} - MATOMO_PLUGIN_RESTRICTANONYMOUSACCESS_VERSION=${MATOMO_PLUGIN_RESTRICTANONYMOUSACCESS_VERSION} + - MATOMO_PLUGIN_WAICUSTOM_VERSION=${MATOMO_PLUGIN_WAICUSTOM_VERSION} - MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_VERSION=${MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_VERSION} - MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_ENABLED=${MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_ENABLED} - MATOMO_PLUGIN_CUSTOMPDFREPORT_VERSION=${MATOMO_PLUGIN_CUSTOMPDFREPORT_VERSION} diff --git a/containers/matomo/Dockerfile b/containers/matomo/Dockerfile index 428b00e6a..7e724b61a 100644 --- a/containers/matomo/Dockerfile +++ b/containers/matomo/Dockerfile @@ -8,6 +8,7 @@ RUN mkdir -p /opt/matomo ARG MATOMO_VERSION ARG MATOMO_WAI_THEME_VERSION ARG MATOMO_PLUGIN_RESTRICTANONYMOUSACCESS_VERSION +ARG MATOMO_PLUGIN_WAICUSTOM_VERSION ARG MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_VERSION ARG MATOMO_PLUGIN_UPDATEEXPOSEDFQDNLIST_VERSION ARG MATOMO_PLUGIN_DISABLESITETRACKING_VERSION @@ -49,6 +50,16 @@ RUN curl -fsSL -o WAIMatomoTheme.tar.gz \ && tar -xf WAIMatomoTheme.tar.gz -C /opt/matomo/plugins \ && rm -rf WAIMatomoTheme.tar.gz +RUN if [ -n "$MATOMO_PLUGIN_WAICUSTOM_VERSION" ]; then \ + curl -fsSL -o WaiCustom.zip \ + "https://github.com/AgID/wai-matomo-plugin-WaiCustom/archive/${MATOMO_PLUGIN_WAICUSTOM_VERSION}.zip" \ + && unzip WaiCustom.zip -d /opt/matomo/plugins \ + && mv /opt/matomo/plugins/wai-matomo-plugin-WaiCustom-${MATOMO_PLUGIN_WAICUSTOM_VERSION} /opt/matomo/plugins/WaiCustom \ + && rm -rf WaiCustom.zip \ + && sed -i -E -e 's/(@MATOMO_PLUGINS@)/Plugins[] = "WaiCustom"\n\1/g' /opt/matomo/config/config.ini.php \ + && sed -i -E -e 's/(@MATOMO_PLUGINS_INSTALLED@)/PluginsInstalled[] = "WaiCustom"\n\1/g' /opt/matomo/config/config.ini.php \ +;fi + RUN if [ -n "$MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_VERSION" ]; then \ curl -fsSL -o SuperUserOnlyRestrictions.zip \ "https://github.com/AgID/wai-matomo-plugin-SuperUserOnlyRestrictions/archive/${MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_VERSION}.zip" \ diff --git a/env/build.properties.example b/env/build.properties.example index 8ad880a2c..8028e4ee4 100644 --- a/env/build.properties.example +++ b/env/build.properties.example @@ -230,6 +230,7 @@ MATOMO_PLUGIN_PROTECTTRACKID_VERSION=1.0.0 MATOMO_PLUGIN_CUSTOMDIMENSIONS_VERSION=3.1.10 MATOMO_PLUGIN_LOGINFILTERIP_VERSION=0.1.0 MATOMO_PLUGIN_RESTRICTANONYMOUSACCESS_VERSION=0.2.0 +MATOMO_PLUGIN_WAICUSTOM_VERSION=0.2.0 MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_VERSION=1.0.0 MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_ENABLED=0 MATOMO_PLUGIN_TRACKERHOSTNAME_VERSION=0.1.0 diff --git a/env/build.properties.testing b/env/build.properties.testing index 6f352d835..4c9d94419 100644 --- a/env/build.properties.testing +++ b/env/build.properties.testing @@ -229,6 +229,7 @@ MATOMO_PLUGIN_PROTECTTRACKID_VERSION=1.0.0 MATOMO_PLUGIN_CUSTOMDIMENSIONS_VERSION=3.1.10 MATOMO_PLUGIN_LOGINFILTERIP_VERSION=0.1.0 MATOMO_PLUGIN_RESTRICTANONYMOUSACCESS_VERSION=0.2.0 +MATOMO_PLUGIN_WAICUSTOM_VERSION=0.2.0 MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_VERSION=1.0.0 MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_ENABLED=0 MATOMO_PLUGIN_TRACKERHOSTNAME_VERSION=0.1.0 diff --git a/env/env-containers.template b/env/env-containers.template index 18d0639c2..5b5e57718 100644 --- a/env/env-containers.template +++ b/env/env-containers.template @@ -73,6 +73,7 @@ MATOMO_PLUGIN_CUSTOMPDFREPORT_VERSION=@MATOMO_PLUGIN_CUSTOMPDFREPORT_VERSION@ MATOMO_PLUGIN_VISITORGENERATOR_VERSION=@MATOMO_PLUGIN_VISITORGENERATOR_VERSION@ MATOMO_PLUGIN_RESETDATABASE_VERSION=@MATOMO_PLUGIN_RESETDATABASE_VERSION@ MATOMO_PLUGIN_RESTRICTANONYMOUSACCESS_VERSION=@MATOMO_PLUGIN_RESTRICTANONYMOUSACCESS_VERSION@ +MATOMO_PLUGIN_WAICUSTOM_VERSION=@MATOMO_PLUGIN_WAICUSTOM_VERSION@ MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_VERSION=@MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_VERSION@ MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_ENABLED=@MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_ENABLED@ MATOMO_WAI_URL=@HOSTNAME@ From 7609d6b0318a5e13ea9889e5ed11fa371cce581b Mon Sep 17 00:00:00 2001 From: Davide Porrovecchio Date: Tue, 24 May 2022 14:04:21 +0200 Subject: [PATCH 11/17] Bump RestrictAnonymousAccess matomo plugin version --- env/build.properties.example | 2 +- env/build.properties.testing | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/env/build.properties.example b/env/build.properties.example index 8028e4ee4..6a5e1365e 100644 --- a/env/build.properties.example +++ b/env/build.properties.example @@ -229,7 +229,7 @@ MATOMO_PLUGIN_QUEUEDTRACKING_VERSION=3.3.6 MATOMO_PLUGIN_PROTECTTRACKID_VERSION=1.0.0 MATOMO_PLUGIN_CUSTOMDIMENSIONS_VERSION=3.1.10 MATOMO_PLUGIN_LOGINFILTERIP_VERSION=0.1.0 -MATOMO_PLUGIN_RESTRICTANONYMOUSACCESS_VERSION=0.2.0 +MATOMO_PLUGIN_RESTRICTANONYMOUSACCESS_VERSION=0.3.0 MATOMO_PLUGIN_WAICUSTOM_VERSION=0.2.0 MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_VERSION=1.0.0 MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_ENABLED=0 diff --git a/env/build.properties.testing b/env/build.properties.testing index 4c9d94419..5e04d91cb 100644 --- a/env/build.properties.testing +++ b/env/build.properties.testing @@ -228,7 +228,7 @@ MATOMO_PLUGIN_QUEUEDTRACKING_VERSION=3.3.6 MATOMO_PLUGIN_PROTECTTRACKID_VERSION=1.0.0 MATOMO_PLUGIN_CUSTOMDIMENSIONS_VERSION=3.1.10 MATOMO_PLUGIN_LOGINFILTERIP_VERSION=0.1.0 -MATOMO_PLUGIN_RESTRICTANONYMOUSACCESS_VERSION=0.2.0 +MATOMO_PLUGIN_RESTRICTANONYMOUSACCESS_VERSION=0.3.0 MATOMO_PLUGIN_WAICUSTOM_VERSION=0.2.0 MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_VERSION=1.0.0 MATOMO_PLUGIN_SUPERUSERONLYRESTRICTIONS_ENABLED=0 From 7331bfffa37724d8601e8af6390f856be51d98d3 Mon Sep 17 00:00:00 2001 From: Davide Porrovecchio Date: Tue, 24 May 2022 14:05:15 +0200 Subject: [PATCH 12/17] Use better API call to check website activation --- app/Contracts/AnalyticsService.php | 14 +++++------- app/Services/MatomoService.php | 34 ++++++++++++------------------ app/Traits/ActivatesWebsite.php | 5 +---- 3 files changed, 19 insertions(+), 34 deletions(-) diff --git a/app/Contracts/AnalyticsService.php b/app/Contracts/AnalyticsService.php index e2be2f7bf..6e7719578 100644 --- a/app/Contracts/AnalyticsService.php +++ b/app/Contracts/AnalyticsService.php @@ -192,28 +192,24 @@ public function setWebsiteAccess(string $userLogin, int $access, string $idSites /** * @param string $idSite the Analytics Service website ID - * @param int $minutes the minutes period * * @throws CommandErrorException if command is unsuccessful * @throws AnalyticsServiceException if unable to connect the Analytics Service * - * @return int the live number of website visits + * @return bool wether the site has collected any visits */ - public function getLiveVisits(string $idSite, int $minutes): int; + public function isActive(string $idSite): bool; /** - * Get total number of visits for a specified site - * registered in the Analytics Service. - * * @param string $idSite the Analytics Service website ID - * @param string $from the date range + * @param int $minutes the minutes period * * @throws CommandErrorException if command is unsuccessful * @throws AnalyticsServiceException if unable to connect the Analytics Service * - * @return int the total reported website visits + * @return int the live number of website visits */ - public function getSiteTotalVisitsFrom(string $idSite, string $from): int; + public function getLiveVisits(string $idSite, int $minutes): int; /** * Get the number of visits for a specified site diff --git a/app/Services/MatomoService.php b/app/Services/MatomoService.php index d3ff92571..bce0a2665 100644 --- a/app/Services/MatomoService.php +++ b/app/Services/MatomoService.php @@ -429,54 +429,46 @@ public function setWebsiteAccess(string $userLogin, int $access, string $idSites /** * @param string $idSite the Analytics Service website ID - * @param int $minutes the minutes period * * @throws CommandErrorException if command is unsuccessful * @throws AnalyticsServiceException if unable to connect the Analytics Service * - * @return int the live number of website visits + * @return bool wether the site has collected any visits */ - public function getLiveVisits(string $idSite, int $minutes): int + public function isActive(string $idSite): bool { $params = [ - 'method' => 'Live.getCounters', + 'method' => 'WaiCustom.isActive', 'idSite' => $idSite, - 'lastMinutes' => $minutes, 'token_auth' => $this->tokenAuth, ]; - $response = $this->apiCall($params); - if (!empty($response)) { - return $response[0]['visits']; - } - return 0; + return $this->apiCall($params)['value']; } /** - * Get total number of visits for a specified site - * registered in the Analytics Service. - * * @param string $idSite the Analytics Service website ID - * @param string $from the date range + * @param int $minutes the minutes period * * @throws CommandErrorException if command is unsuccessful * @throws AnalyticsServiceException if unable to connect the Analytics Service * - * @return int the total reported website visits + * @return int the live number of website visits */ - // TODO: Needs rework to verify that the requested range is available - public function getSiteTotalVisitsFrom(string $idSite, string $from): int + public function getLiveVisits(string $idSite, int $minutes): int { $params = [ - 'method' => 'VisitsSummary.get', + 'method' => 'Live.getCounters', 'idSite' => $idSite, - 'period' => 'range', - 'date' => $from . ',' . now()->format('Y-m-d'), + 'lastMinutes' => $minutes, 'token_auth' => $this->tokenAuth, ]; $response = $this->apiCall($params); + if (!empty($response)) { + return $response[0]['visits']; + } - return $response['nb_visits'] ?? 0; + return 0; } /** diff --git a/app/Traits/ActivatesWebsite.php b/app/Traits/ActivatesWebsite.php index fac7348a2..2aa4ce4d6 100644 --- a/app/Traits/ActivatesWebsite.php +++ b/app/Traits/ActivatesWebsite.php @@ -34,10 +34,7 @@ public function hasActivated(Website $website): bool { $analyticsService = app()->make('analytics-service'); - $liveVisits = $analyticsService->getLiveVisits($website->analytics_id, 60); - $totalVisits = $analyticsService->getSiteTotalVisitsFrom($website->analytics_id, $website->created_at->format('Y-m-d')); - - return $liveVisits > 0 || $totalVisits > 0; + return $analyticsService->isActive($website->analytics_id); } /** From 73b0fe4f6b3999b8f3d9b323d4e5168816039604 Mon Sep 17 00:00:00 2001 From: Davide Porrovecchio Date: Tue, 24 May 2022 14:53:57 +0200 Subject: [PATCH 13/17] Update tests --- tests/Feature/PendingWebsiteCheckJsonRoutesTest.php | 10 ++++------ tests/Unit/ProcessPendingWebsitesTest.php | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/Feature/PendingWebsiteCheckJsonRoutesTest.php b/tests/Feature/PendingWebsiteCheckJsonRoutesTest.php index 7067e22e5..8173c0864 100644 --- a/tests/Feature/PendingWebsiteCheckJsonRoutesTest.php +++ b/tests/Feature/PendingWebsiteCheckJsonRoutesTest.php @@ -142,9 +142,9 @@ public function testCheckWebsiteActiveRoute(): void } /** - * Test fail request due to missing website. + * Test request with missing website into Analytics Service not activated. */ - public function testCheckWebsiteFailedRoute(): void + public function testCheckMissingWebsiteNotActiveRoute(): void { do { $website = factory(Website::class)->make([ @@ -164,9 +164,7 @@ public function testCheckWebsiteFailedRoute(): void ]) ->json('get', route('websites.tracking.check', ['website' => $website->slug])); - $response->assertJson([ - 'result' => 'error', - 'message' => 'Bad Request', - ]); + $response->assertStatus(303); + $response->assertExactJson([]); } } diff --git a/tests/Unit/ProcessPendingWebsitesTest.php b/tests/Unit/ProcessPendingWebsitesTest.php index 7c0cfa795..99420d8d2 100644 --- a/tests/Unit/ProcessPendingWebsitesTest.php +++ b/tests/Unit/ProcessPendingWebsitesTest.php @@ -267,9 +267,9 @@ public function testCheckWebsiteSecondaryActivated(): void } /** - * Test job complete with failed website due to missing website into Analytics Service. + * Test job complete with missing website into Analytics Service not activated. */ - public function testMissingAnalyticsWebsiteFail(): void + public function testMissingAnalyticsWebsite(): void { $user = factory(User::class)->state('pending')->create(); $publicAdministration = factory(PublicAdministration::class)->create(); @@ -283,7 +283,7 @@ public function testMissingAnalyticsWebsiteFail(): void $job->handle(); Event::assertDispatched(PendingWebsitesCheckCompleted::class, function ($event) use ($website) { - return in_array(['website' => $website->slug, 'reason' => 'Invalid command for Analytics Service'], $event->getFailed(), true) + return empty($event->getFailed()) && empty($event->getPurged()) && empty($event->getPurging()) && empty($event->getActivated()); From 2ebb1feabaf8b84106bcc0f2a7d73a3b2cc51254 Mon Sep 17 00:00:00 2001 From: Davide Porrovecchio Date: Tue, 24 May 2022 14:56:37 +0200 Subject: [PATCH 14/17] Remove unused class --- tests/Unit/ProcessPendingWebsitesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/ProcessPendingWebsitesTest.php b/tests/Unit/ProcessPendingWebsitesTest.php index 99420d8d2..bf7ba1eda 100644 --- a/tests/Unit/ProcessPendingWebsitesTest.php +++ b/tests/Unit/ProcessPendingWebsitesTest.php @@ -282,7 +282,7 @@ public function testMissingAnalyticsWebsite(): void $job = new ProcessPendingWebsites(); $job->handle(); - Event::assertDispatched(PendingWebsitesCheckCompleted::class, function ($event) use ($website) { + Event::assertDispatched(PendingWebsitesCheckCompleted::class, function ($event) { return empty($event->getFailed()) && empty($event->getPurged()) && empty($event->getPurging()) From 4fe833b24b58d4cd5b1a1db63512269d8de31fcf Mon Sep 17 00:00:00 2001 From: Davide Porrovecchio Date: Tue, 24 May 2022 16:02:59 +0200 Subject: [PATCH 15/17] Add method to get site settings --- app/Contracts/AnalyticsService.php | 14 ++++++++++++++ app/Services/MatomoService.php | 22 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/app/Contracts/AnalyticsService.php b/app/Contracts/AnalyticsService.php index 6e7719578..cfb908b27 100644 --- a/app/Contracts/AnalyticsService.php +++ b/app/Contracts/AnalyticsService.php @@ -191,6 +191,8 @@ public function loginAndRedirectUser(string $userLogin, string $hashedPassword, public function setWebsiteAccess(string $userLogin, int $access, string $idSites): void; /** + * Check wether there is some tracking data for a given website. + * * @param string $idSite the Analytics Service website ID * * @throws CommandErrorException if command is unsuccessful @@ -200,6 +202,18 @@ public function setWebsiteAccess(string $userLogin, int $access, string $idSites */ public function isActive(string $idSite): bool; + /** + * Get settings for a specified website. + * + * @param string $idSite the Analytics Service website ID + * + * @throws CommandErrorException if command is unsuccessful + * @throws AnalyticsServiceException if unable to connect the Analytics Service + * + * @return array the settings for the website + */ + public function getSiteSettings(string $idSite): array + /** * @param string $idSite the Analytics Service website ID * @param int $minutes the minutes period diff --git a/app/Services/MatomoService.php b/app/Services/MatomoService.php index bce0a2665..d2c0483b6 100644 --- a/app/Services/MatomoService.php +++ b/app/Services/MatomoService.php @@ -428,6 +428,8 @@ public function setWebsiteAccess(string $userLogin, int $access, string $idSites } /** + * Check wether there is some tracking data for a given website. + * * @param string $idSite the Analytics Service website ID * * @throws CommandErrorException if command is unsuccessful @@ -446,6 +448,26 @@ public function isActive(string $idSite): bool return $this->apiCall($params)['value']; } + /** + * Get settings for a specified website. + * + * @param string $idSite the Analytics Service website ID + * + * @throws CommandErrorException if command is unsuccessful + * @throws AnalyticsServiceException if unable to connect the Analytics Service + * + * @return array the settings for the website + */ + public function getSiteSettings(string $idSite): array { + $params = [ + 'method' => 'SitesManager.getSiteSettings', + 'idSite' => $idSite, + 'token_auth' => $this->tokenAuth, + ]; + + return $this->apiCall($params); + } + /** * @param string $idSite the Analytics Service website ID * @param int $minutes the minutes period From 97c4d50a88b1d42f675ccd6c3884fd8d7d3f91a7 Mon Sep 17 00:00:00 2001 From: Davide Porrovecchio Date: Tue, 24 May 2022 17:16:26 +0200 Subject: [PATCH 16/17] Fix code style --- app/Services/MatomoService.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Services/MatomoService.php b/app/Services/MatomoService.php index d2c0483b6..f88e273c1 100644 --- a/app/Services/MatomoService.php +++ b/app/Services/MatomoService.php @@ -458,7 +458,8 @@ public function isActive(string $idSite): bool * * @return array the settings for the website */ - public function getSiteSettings(string $idSite): array { + public function getSiteSettings(string $idSite): array + { $params = [ 'method' => 'SitesManager.getSiteSettings', 'idSite' => $idSite, From f187530ea0b1548e979450bd567442ee9b336d7b Mon Sep 17 00:00:00 2001 From: Davide Porrovecchio Date: Tue, 24 May 2022 17:20:21 +0200 Subject: [PATCH 17/17] Add missing semicolon --- app/Contracts/AnalyticsService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Contracts/AnalyticsService.php b/app/Contracts/AnalyticsService.php index cfb908b27..f012369b4 100644 --- a/app/Contracts/AnalyticsService.php +++ b/app/Contracts/AnalyticsService.php @@ -212,7 +212,7 @@ public function isActive(string $idSite): bool; * * @return array the settings for the website */ - public function getSiteSettings(string $idSite): array + public function getSiteSettings(string $idSite): array; /** * @param string $idSite the Analytics Service website ID