diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 3bf1f743d..0b9df1143 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - node-version: [18.x, 20.x] + node-version: [20.x, 22.X] steps: - name: Harden Runner @@ -33,7 +33,7 @@ jobs: - run: npm ci - run: npm run lint - run: npm run ci-prettify - if: ${{ matrix.node-version == '18.x' }} + if: ${{ matrix.node-version == '20.x' }} - run: npm run compile --if-present - run: npm test - name: Test Report @@ -47,7 +47,7 @@ jobs: fail-on-error: 'false' - uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2 name: Upload Coverage Results - if: ${{ matrix.node-version == '18.x' }} + if: ${{ matrix.node-version == '20.x' }} - run: mv junit.xml rps-unit-${{ matrix.node-version }}.xml - name: Upload JEST Results uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 diff --git a/.releaserc.json b/.releaserc.json index cb19cfc52..adc3bfbdb 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -32,6 +32,5 @@ } ], "@semantic-release/git" - ] } diff --git a/package-lock.json b/package-lock.json index 95127a5ea..7cb66995a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,7 +52,7 @@ "jest-transform-stub": "^2.0.0", "nodemon": "^3.1.9", "prettier-config-standard": "^7.0.0", - "prettier-plugin-multiline-arrays": "^3.0.6", + "prettier-plugin-multiline-arrays": "^4.0.2", "sinon": "^19.0.2", "ts-jest": "^29.2.5", "ts-jest-mock-import-meta": "^1.2.1", @@ -89,24 +89,96 @@ "node": ">=6.0.0" } }, + "node_modules/@augment-vir/assert": { + "version": "31.5.0", + "resolved": "https://registry.npmjs.org/@augment-vir/assert/-/assert-31.5.0.tgz", + "integrity": "sha512-I/0MX2gqxif8AJtqCJGfmg0TUHHZJiDuM8cGQf5cyZF9A4OHy9YQuKVJ7TdSmbvxlC9dSfk63Zj0RthHN55vVw==", + "dev": true, + "dependencies": { + "@augment-vir/core": "^31.5.0", + "@date-vir/duration": "^7.1.1", + "deep-eql": "^5.0.2", + "expect-type": "^1.1.0", + "type-fest": "^4.31.0" + }, + "engines": { + "node": ">=22" + } + }, + "node_modules/@augment-vir/assert/node_modules/type-fest": { + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.31.0.tgz", + "integrity": "sha512-yCxltHW07Nkhv/1F6wWBr8kz+5BGMfP+RbRSYFnegVb0qV/UMT0G0ElBloPVerqn4M2ZV80Ir1FtCcYv1cT6vQ==", + "dev": true, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@augment-vir/common": { - "version": "28.2.4", - "resolved": "https://registry.npmjs.org/@augment-vir/common/-/common-28.2.4.tgz", - "integrity": "sha512-5Ib0OX7YlxAuFrG+MAoTsz6RlKMcbdMdoNGcEEKH/ezc/ZKMy/IHZ9Z/ZcCHYopZ4ocGXzVY4KUOiJ8+CXXvTA==", + "version": "31.5.0", + "resolved": "https://registry.npmjs.org/@augment-vir/common/-/common-31.5.0.tgz", + "integrity": "sha512-ObpiroFHzlYVriUEdlJWocJESK5kQL6RZAolwMsYFiQoi7VIh8XJP9IEH0MeGoOw1lLuOUbTDUsKSOBTQeZl6A==", "dev": true, - "license": "MIT", "dependencies": { - "browser-or-node": "^3.0.0", - "run-time-assertions": "^1.5.1", - "type-fest": "^4.20.1" + "@augment-vir/assert": "^31.5.0", + "@augment-vir/core": "^31.5.0", + "@date-vir/duration": "^7.1.1", + "ansi-styles": "^6.2.1", + "json5": "^2.2.3", + "type-fest": "^4.31.0", + "typed-event-target": "^4.0.2" + }, + "engines": { + "node": ">=22" + } + }, + "node_modules/@augment-vir/common/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/@augment-vir/common/node_modules/type-fest": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.21.0.tgz", - "integrity": "sha512-ADn2w7hVPcK6w1I0uWnM//y1rLXZhzB9mr0a3OirzclKF1Wp6VzevUmzz/NRAWunOT6E8HrnpGY7xOfc6K57fA==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.31.0.tgz", + "integrity": "sha512-yCxltHW07Nkhv/1F6wWBr8kz+5BGMfP+RbRSYFnegVb0qV/UMT0G0ElBloPVerqn4M2ZV80Ir1FtCcYv1cT6vQ==", + "dev": true, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@augment-vir/core": { + "version": "31.5.0", + "resolved": "https://registry.npmjs.org/@augment-vir/core/-/core-31.5.0.tgz", + "integrity": "sha512-P+UJ4ye0JdHDwAQl3erjV89zWhGkEAdwB7ah/7aSn6CFCFb+qXFVIxN7YzOCQHpybNmcy5RdTzcnKtmbekbE7Q==", + "dev": true, + "dependencies": { + "@date-vir/duration": "^7.1.1", + "browser-or-node": "^3.0.0", + "json5": "^2.2.3", + "type-fest": "^4.31.0" + }, + "engines": { + "node": ">=22" + } + }, + "node_modules/@augment-vir/core/node_modules/type-fest": { + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.31.0.tgz", + "integrity": "sha512-yCxltHW07Nkhv/1F6wWBr8kz+5BGMfP+RbRSYFnegVb0qV/UMT0G0ElBloPVerqn4M2ZV80Ir1FtCcYv1cT6vQ==", "dev": true, - "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=16" }, @@ -814,6 +886,32 @@ "kuler": "^2.0.0" } }, + "node_modules/@date-vir/duration": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@date-vir/duration/-/duration-7.1.1.tgz", + "integrity": "sha512-eiSgx5uQbSlBWFyPEp8ED5AwG4c2htNVl4KVSX01iAwiBN1669LLVvKdaftPhZNCbLV6oKrAW9Vy0d+GeZiodA==", + "dev": true, + "dependencies": { + "@types/luxon": "^3.4.2", + "luxon": "^3.5.0", + "type-fest": "^4.30.0" + }, + "engines": { + "node": ">=22" + } + }, + "node_modules/@date-vir/duration/node_modules/type-fest": { + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.31.0.tgz", + "integrity": "sha512-yCxltHW07Nkhv/1F6wWBr8kz+5BGMfP+RbRSYFnegVb0qV/UMT0G0ElBloPVerqn4M2ZV80Ir1FtCcYv1cT6vQ==", + "dev": true, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -1781,6 +1879,12 @@ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, + "node_modules/@types/luxon": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz", + "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==", + "dev": true + }, "node_modules/@types/mime": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz", @@ -2549,8 +2653,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-3.0.0.tgz", "integrity": "sha512-iczIdVJzGEYhP5DqQxYM9Hh7Ztpqqi+CXZpSmX8ALFs9ecXkQIeqRyM6TfxEfMVpwhl3dSuDvxdzzo9sUOIVBQ==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/browserslist": { "version": "4.22.2", @@ -3120,6 +3223,15 @@ } } }, + "node_modules/deep-eql": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", + "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -3617,11 +3729,13 @@ } }, "node_modules/expect-type": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-0.15.0.tgz", - "integrity": "sha512-yWnriYB4e8G54M5/fAFj7rCIBiKs1HAACaY13kCz6Ku0dezjS9aMcfcdVK2X8Tv2tEV1BPz/wKfQ7WA4S/d8aA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.1.0.tgz", + "integrity": "sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==", "dev": true, - "license": "Apache-2.0" + "engines": { + "node": ">=12.0.0" + } }, "node_modules/expect/node_modules/ansi-styles": { "version": "5.2.0", @@ -5861,6 +5975,15 @@ "yallist": "^3.0.2" } }, + "node_modules/luxon": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz", + "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==", + "dev": true, + "engines": { + "node": ">=12" + } + }, "node_modules/make-dir": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", @@ -6759,14 +6882,16 @@ } }, "node_modules/prettier-plugin-multiline-arrays": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/prettier-plugin-multiline-arrays/-/prettier-plugin-multiline-arrays-3.0.6.tgz", - "integrity": "sha512-FrWVa7MoDQo9b5XoLPrqIDClb0k+O8wOIsIr1DutRXhcerLY8PfIe/yYeTVD/vpRISkSXCBEYmj5Voe0wb5dEQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/prettier-plugin-multiline-arrays/-/prettier-plugin-multiline-arrays-4.0.2.tgz", + "integrity": "sha512-j8aWPMQl3QsTRR7e2HuNfwp429mB0IL1NQ8PjO0xq5W20O5L5h2XZ99vnqirceJizKhqhm8sOMmsmGcKEtlCFg==", "dev": true, - "license": "(MIT or CC0 1.0)", "dependencies": { - "@augment-vir/common": "^28.1.0", - "proxy-vir": "^1.0.0" + "@augment-vir/common": "^31.3.0", + "proxy-vir": "^2.0.1" + }, + "engines": { + "node": ">=22" }, "peerDependencies": { "prettier": ">=3.0.0" @@ -6837,45 +6962,16 @@ } }, "node_modules/proxy-vir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/proxy-vir/-/proxy-vir-1.0.0.tgz", - "integrity": "sha512-WV1gkBxUOwLSz0Bn09tisIqLK7leAqtFm/474t3L0hQKJw7/gdrkGcWw0/OT1PhSy+TDS6swfq7Niuoq3XJhkQ==", - "dev": true, - "license": "(MIT or CC0 1.0)", - "dependencies": { - "@augment-vir/common": "^23.3.4" - } - }, - "node_modules/proxy-vir/node_modules/@augment-vir/common": { - "version": "23.4.0", - "resolved": "https://registry.npmjs.org/@augment-vir/common/-/common-23.4.0.tgz", - "integrity": "sha512-QIrJ1doD00TNbOzeVrk9KgPTzRlIjayxERnhtbQjK/AFPj5yElcB03GbnGdQZPzws/R+5gfMM5cZiH7QyBP+Kg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/proxy-vir/-/proxy-vir-2.0.1.tgz", + "integrity": "sha512-hjy5mWzHZhgRGh0f90f0Bz3VrGUe0T+AlhwnETakzRdvaN9RtPYLQG1+ZuEzSDK95FAhPYd26nEi1xVrXqvBwg==", "dev": true, - "license": "MIT", "dependencies": { - "browser-or-node": "^2.1.1", - "run-time-assertions": "^1.0.0", - "type-fest": "^4.10.2" - } - }, - "node_modules/proxy-vir/node_modules/browser-or-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-2.1.1.tgz", - "integrity": "sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==", - "dev": true, - "license": "MIT" - }, - "node_modules/proxy-vir/node_modules/type-fest": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.21.0.tgz", - "integrity": "sha512-ADn2w7hVPcK6w1I0uWnM//y1rLXZhzB9mr0a3OirzclKF1Wp6VzevUmzz/NRAWunOT6E8HrnpGY7xOfc6K57fA==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=16" + "@augment-vir/assert": "^31.1.0", + "@augment-vir/common": "^31.1.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">=22" } }, "node_modules/pstree.remy": { @@ -7170,31 +7266,6 @@ "queue-microtask": "^1.2.2" } }, - "node_modules/run-time-assertions": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/run-time-assertions/-/run-time-assertions-1.5.1.tgz", - "integrity": "sha512-yyAFU3+ZGw+zjMu0s7uOSGqKIRDLaCnl80VIKdtwuu4ejxcWHCRj2mxL6elVNtI7fytHwk4e40e3IrdNkXihlw==", - "dev": true, - "license": "(MIT or CC0 1.0)", - "dependencies": { - "@augment-vir/common": "^28.0.0", - "expect-type": "~0.15.0", - "type-fest": "^4.18.2" - } - }, - "node_modules/run-time-assertions/node_modules/type-fest": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.21.0.tgz", - "integrity": "sha512-ADn2w7hVPcK6w1I0uWnM//y1rLXZhzB9mr0a3OirzclKF1Wp6VzevUmzz/NRAWunOT6E8HrnpGY7xOfc6K57fA==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -7846,6 +7917,93 @@ "node": ">= 0.6" } }, + "node_modules/typed-event-target": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/typed-event-target/-/typed-event-target-4.0.2.tgz", + "integrity": "sha512-vIAqC5HN/yuAn4+K4MFB6QBz4pAjp3se55KkRIbxX+EjGRyBJwbVasj2jgzUDhYeda9b0YbDng2N11A/bXvYwA==", + "dev": true, + "dependencies": { + "@augment-vir/assert": "^30.3.0", + "@augment-vir/common": "^30.3.0", + "@augment-vir/core": "^30.3.0" + }, + "engines": { + "node": ">=22" + } + }, + "node_modules/typed-event-target/node_modules/@augment-vir/assert": { + "version": "30.8.4", + "resolved": "https://registry.npmjs.org/@augment-vir/assert/-/assert-30.8.4.tgz", + "integrity": "sha512-kxak+lDEYo14pStluTCss+/wH05SqlSv3mEN/yBvtV5lMJBXhoPcJGMua7zWXNCEnOCGVU36+hDBwuh9IQxT/A==", + "dev": true, + "dependencies": { + "@augment-vir/core": "^30.8.4", + "@date-vir/duration": "^7.0.1", + "deep-eql": "^5.0.2", + "expect-type": "^1.1.0", + "type-fest": "^4.29.0" + }, + "engines": { + "node": ">=22" + } + }, + "node_modules/typed-event-target/node_modules/@augment-vir/common": { + "version": "30.8.4", + "resolved": "https://registry.npmjs.org/@augment-vir/common/-/common-30.8.4.tgz", + "integrity": "sha512-3w4WJOQKycuHmSod0BMjVyrUjHlHj+6vmabKvtRT96mz+b9Rstqg2EfM4zzlkuoM2k9biAbjeYSllwpmf631uQ==", + "dev": true, + "dependencies": { + "@augment-vir/assert": "^30.8.4", + "@augment-vir/core": "^30.8.4", + "@date-vir/duration": "^7.0.1", + "ansi-styles": "^6.2.1", + "json5": "^2.2.3", + "type-fest": "^4.29.0", + "typed-event-target": "^4.0.2" + }, + "engines": { + "node": ">=22" + } + }, + "node_modules/typed-event-target/node_modules/@augment-vir/core": { + "version": "30.8.4", + "resolved": "https://registry.npmjs.org/@augment-vir/core/-/core-30.8.4.tgz", + "integrity": "sha512-fOp0W+z2xkkkcH9lpsY6AUVp2vPbR5qo3fbVui9IrA4RJ6wXzio6+sP1yYw2iLJVmOOEYIWSbvZddDn+Ih6Ppw==", + "dev": true, + "dependencies": { + "@date-vir/duration": "^7.0.1", + "browser-or-node": "^3.0.0", + "json5": "^2.2.3", + "type-fest": "^4.29.0" + }, + "engines": { + "node": ">=22" + } + }, + "node_modules/typed-event-target/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/typed-event-target/node_modules/type-fest": { + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.31.0.tgz", + "integrity": "sha512-yCxltHW07Nkhv/1F6wWBr8kz+5BGMfP+RbRSYFnegVb0qV/UMT0G0ElBloPVerqn4M2ZV80Ir1FtCcYv1cT6vQ==", + "dev": true, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", diff --git a/package.json b/package.json index 9c8626501..b2fb563e8 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "jest-transform-stub": "^2.0.0", "nodemon": "^3.1.9", "prettier-config-standard": "^7.0.0", - "prettier-plugin-multiline-arrays": "^3.0.6", + "prettier-plugin-multiline-arrays": "^4.0.2", "sinon": "^19.0.2", "ts-jest": "^29.2.5", "ts-jest-mock-import-meta": "^1.2.1", diff --git a/src/routes/admin/domains/domain.ts b/src/routes/admin/domains/domain.ts index 2bf4c9904..e1078b738 100644 --- a/src/routes/admin/domains/domain.ts +++ b/src/routes/admin/domains/domain.ts @@ -38,7 +38,8 @@ export const domainInsertValidator = (): any => [ .isEmpty() .withMessage('Provisioning Cert Storage Format is required') .isIn(['raw', 'string']) - .withMessage("Provisioning Cert Storage Format should be either 'raw' or 'string'")] + .withMessage("Provisioning Cert Storage Format should be either 'raw' or 'string'") +] export const domainUpdateValidator = (): any => [ check('profileName') @@ -54,7 +55,8 @@ export const domainUpdateValidator = (): any => [ .withMessage('Provisioning Cert Storage Format is either "raw" or "string"'), check('provisioningCertPassword') .isLength({ max: 64 }) - .withMessage('Password should not exceed 64 characters in length')] + .withMessage('Password should not exceed 64 characters in length') +] function passwordValidator(): CustomValidator { return (value, { req }) => { diff --git a/src/routes/admin/ieee8021x/ieee8021xValidator.ts b/src/routes/admin/ieee8021x/ieee8021xValidator.ts index c5966f192..e2a535b53 100644 --- a/src/routes/admin/ieee8021x/ieee8021xValidator.ts +++ b/src/routes/admin/ieee8021x/ieee8021xValidator.ts @@ -31,7 +31,8 @@ export const ieee8021xValidator = (): any => [ export const ieee8021xEditValidator = (): any => [ ...ieee8021xValidator(), - check('version').not().isEmpty().withMessage('Version is required to patch/update a record.')] + check('version').not().isEmpty().withMessage('Version is required to patch/update a record.') +] export const validatePxeTimeout: CustomValidator = (value) => { if (typeof value !== 'number') { diff --git a/src/routes/admin/odataValidator.ts b/src/routes/admin/odataValidator.ts index 3d29d6839..02931a147 100644 --- a/src/routes/admin/odataValidator.ts +++ b/src/routes/admin/odataValidator.ts @@ -18,4 +18,5 @@ export const odataValidator = (): any => [ query('$count') .optional() .isBoolean() - .withMessage('To return total number of records in result set should be boolean')] + .withMessage('To return total number of records in result set should be boolean') +] diff --git a/src/routes/admin/wireless/wirelessValidator.ts b/src/routes/admin/wireless/wirelessValidator.ts index 73d2dfc37..def4f7ba1 100644 --- a/src/routes/admin/wireless/wirelessValidator.ts +++ b/src/routes/admin/wireless/wirelessValidator.ts @@ -90,7 +90,8 @@ export const wirelessValidator = (): any => [ export const wirelessEditValidator = (): any => [ ...wirelessValidator(), - check('version').not().isEmpty().withMessage('Version is required to patch/update a record.')] + check('version').not().isEmpty().withMessage('Version is required to patch/update a record.') +] const validateIEEE8021xConfigs = async (value: any, req: Request): Promise => { const isProfileExist = await req.db.ieee8021xProfiles.checkProfileExits(value, req.tenantId) diff --git a/src/stateMachines/activation.ts b/src/stateMachines/activation.ts index cf51e6247..77f2c6bcf 100644 --- a/src/stateMachines/activation.ts +++ b/src/stateMachines/activation.ts @@ -773,7 +773,6 @@ export class Activation { devices[context.clientId].status.Status = 'Admin control mode.' }, 'Set activation status' - ], target: 'UPDATE_CREDENTIALS' }, @@ -784,7 +783,6 @@ export class Activation { devices[context.clientId].status.Status = 'Admin control mode.' }, 'Set activation status' - ], target: 'DELAYED_TRANSITION' }, @@ -825,7 +823,6 @@ export class Activation { devices[context.clientId].status.Status = 'Upgraded to admin control mode.' }, 'Set activation status' - ], target: 'CHANGE_AMT_PASSWORD' }, @@ -836,7 +833,6 @@ export class Activation { devices[context.clientId].status.Status = 'Upgraded to admin control mode.' }, 'Set activation status' - ], target: 'CHANGE_AMT_PASSWORD' }, @@ -875,7 +871,6 @@ export class Activation { devices[context.clientId].status.Status = 'Client control mode.' }, 'Set activation status' - ], target: 'DELAYED_TRANSITION' }, @@ -886,7 +881,6 @@ export class Activation { devices[context.clientId].status.Status = 'Client control mode.' }, 'Set activation status' - ], target: 'DELAYED_TRANSITION' }, diff --git a/src/stateMachines/ciraConfiguration.ts b/src/stateMachines/ciraConfiguration.ts index 28d8db626..13d91fc57 100644 --- a/src/stateMachines/ciraConfiguration.ts +++ b/src/stateMachines/ciraConfiguration.ts @@ -665,7 +665,6 @@ export class CIRAConfiguration { event.output.Envelope.Body.PullResponse.Items.AMT_RemoteAccessPolicyAppliesToMPS }), 'Reset Retry Count' - ], target: 'PUT_REMOTE_ACCESS_POLICY_APPLIESTOMPS' }, diff --git a/src/stateMachines/common.ts b/src/stateMachines/common.ts index 95823c913..a181878ae 100644 --- a/src/stateMachines/common.ts +++ b/src/stateMachines/common.ts @@ -68,7 +68,8 @@ const invokeWsmanCall = async (context: any, maxRetries = 0): Promise => { try { const result = await Promise.race([ invokeWsmanCallInternal(context), - timeout(Environment.Config.delay_timer * 1000)]) + timeout(Environment.Config.delay_timer * 1000) + ]) return result as any } catch (error) { if (error instanceof UNEXPECTED_PARSE_ERROR && retries < maxRetries) { @@ -104,7 +105,8 @@ const eaTimeout = (ms): any => const invokeEnterpriseAssistantCall = async (context: any): Promise => { const result = await Promise.race([ invokeEnterpriseAssistantCallInternal(context), - eaTimeout(Environment.Config.delay_timer * 1000)]) + eaTimeout(Environment.Config.delay_timer * 1000) + ]) return result } diff --git a/src/stateMachines/deactivation.ts b/src/stateMachines/deactivation.ts index 94c0595ae..4f0dd143d 100644 --- a/src/stateMachines/deactivation.ts +++ b/src/stateMachines/deactivation.ts @@ -125,7 +125,6 @@ export class Deactivation { tenantId: ({ event }) => event.tenantId }), 'Reset Unauth Count' - ], target: 'UNPROVISIONING' } diff --git a/src/stateMachines/maintenance/maintenance.ts b/src/stateMachines/maintenance/maintenance.ts index e1febd6a0..240317588 100644 --- a/src/stateMachines/maintenance/maintenance.ts +++ b/src/stateMachines/maintenance/maintenance.ts @@ -77,7 +77,8 @@ export class Maintenance { CHANGE_PASSWORD: { entry: [ assign({ clientId: ({ event }) => event.clientId }), - sendTo('change-password', ({ event }) => event)], + sendTo('change-password', ({ event }) => event) + ], invoke: { id: 'change-password', src: 'changePassword', @@ -97,7 +98,8 @@ export class Maintenance { SYNC_HOST_NAME: { entry: [ assign({ clientId: ({ event }) => event.clientId }), - sendTo('sync-host-name', ({ event }) => event)], + sendTo('sync-host-name', ({ event }) => event) + ], invoke: { id: 'sync-host-name', src: 'syncHostName', @@ -131,7 +133,8 @@ export class Maintenance { SYNC_IP: { entry: [ assign({ clientId: ({ event }) => event.clientId }), - sendTo('sync-ip', ({ event }) => event)], + sendTo('sync-ip', ({ event }) => event) + ], invoke: { id: 'sync-ip', src: 'syncIP', @@ -162,7 +165,8 @@ export class Maintenance { SYNC_TIME: { entry: [ assign({ clientId: ({ event }) => event.clientId }), - sendTo('sync-time', ({ event }) => event)], + sendTo('sync-time', ({ event }) => event) + ], invoke: { id: 'sync-time', src: 'syncTime', @@ -186,7 +190,8 @@ export class Maintenance { SYNC_DEVICE_INFO: { entry: [ assign({ clientId: ({ event }) => event.clientId }), - sendTo('sync-device-info', ({ event }) => event)], + sendTo('sync-device-info', ({ event }) => event) + ], invoke: { id: 'sync-device-info', src: 'syncDeviceInfo', diff --git a/src/stateMachines/maintenance/syncIP.ts b/src/stateMachines/maintenance/syncIP.ts index 84581db20..b6d47389d 100644 --- a/src/stateMachines/maintenance/syncIP.ts +++ b/src/stateMachines/maintenance/syncIP.ts @@ -272,7 +272,6 @@ export class SyncIP { assign({ errorMessage: ({ event }) => coalesceMessage('at PULL_ETHERNET_PORT_SETTINGS', event.error) }) - ], target: 'FAILED' } diff --git a/src/stateMachines/tls.ts b/src/stateMachines/tls.ts index 914350b46..9a31a2716 100644 --- a/src/stateMachines/tls.ts +++ b/src/stateMachines/tls.ts @@ -334,7 +334,6 @@ export class TLS { target: 'ENTERPRISE_ASSISTANT_REQUEST' }, 'ADD_TRUSTED_ROOT_CERTIFICATE' - ] }, CHECK_CERT_MODE_AFTER_REQUEST: { @@ -344,7 +343,6 @@ export class TLS { target: 'ENTERPRISE_ASSISTANT_RESPONSE' }, 'ADD_CERTIFICATE' - ] }, ENTERPRISE_ASSISTANT_REQUEST: { @@ -512,7 +510,6 @@ export class TLS { target: 'CHECK_CERT_MODE_AFTER_REQUEST' }, 'CREATE_TLS_CREDENTIAL_CONTEXT' - ] }, ADD_CERTIFICATE: { @@ -600,7 +597,6 @@ export class TLS { tlsSettingData: ({ event }) => event.output.Envelope.Body.PullResponse.Items.AMT_TLSSettingData }), 'Reset Retry Count' - ], target: 'PUT_REMOTE_TLS_DATA' }, @@ -627,7 +623,6 @@ export class TLS { assign({ message: ({ event }) => event.output }) - ], target: 'WAIT_A_BIT' // should this be commit_changes? and then circle back to setting local tls data }, diff --git a/src/stateMachines/wiredNetworkConfiguration.ts b/src/stateMachines/wiredNetworkConfiguration.ts index f2a7a32d5..f8a6cf935 100644 --- a/src/stateMachines/wiredNetworkConfiguration.ts +++ b/src/stateMachines/wiredNetworkConfiguration.ts @@ -279,7 +279,6 @@ export class WiredConfiguration { }), 'Reset Unauth Count', 'Reset Retry Count' - ], target: 'PUT_ETHERNET_PORT_SETTINGS' } diff --git a/src/utils/ClientMsgJsonParser.ts b/src/utils/ClientMsgJsonParser.ts index e46392f3d..9c0ecd8c8 100644 --- a/src/utils/ClientMsgJsonParser.ts +++ b/src/utils/ClientMsgJsonParser.ts @@ -78,7 +78,8 @@ export class ClientMsgJsonParser { this.zeroLeftPad(bufUuid.readUInt16LE(4).toString(16), 4), this.zeroLeftPad(bufUuid.readUInt16LE(6).toString(16), 4), this.zeroLeftPad(bufUuid.readUInt16BE(8).toString(16), 4), - this.zeroLeftPad(bufUuid.slice(10).toString('hex').toLowerCase(), 12)].join('-') + this.zeroLeftPad(bufUuid.slice(10).toString('hex').toLowerCase(), 12) + ].join('-') return guid }