From ecaeb1a966ccba8b57ad0895b60aff8405e85433 Mon Sep 17 00:00:00 2001 From: Lucas ONeil Date: Tue, 29 Oct 2024 22:53:56 -0700 Subject: [PATCH 1/2] Demo app updates Signed-off-by: Lucas ONeil --- demo/vue/app/frontend/package-lock.json | 39 +++++++++++++------------ demo/vue/app/frontend/package.json | 8 ++--- demo/vue/app/package-lock.json | 15 +++++----- demo/vue/app/package.json | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/demo/vue/app/frontend/package-lock.json b/demo/vue/app/frontend/package-lock.json index e9c03bec..bc482147 100644 --- a/demo/vue/app/frontend/package-lock.json +++ b/demo/vue/app/frontend/package-lock.json @@ -9,9 +9,9 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@babel/eslint-parser": "^7.25.8", + "@babel/eslint-parser": "^7.25.9", "@bcgov/bc-sans": "^2.1.0", - "@vue/eslint-config-prettier": "^10.0.0", + "@vue/eslint-config-prettier": "^10.1.0", "axios": "^1.7.7", "core-js": "^3.38.1", "eslint": "^8.57.0", @@ -31,11 +31,11 @@ "@vue/cli-service": "^5.0.8", "@vue/test-utils": "^1.3.0", "axios-mock-adapter": "^2.1.0", - "eslint-plugin-vue": "^9.29.0", + "eslint-plugin-vue": "^9.30.0", "eslint-plugin-vuetify": "^1.1.0", "lodash": "^4.17.21", "prettier": "^3.3.3", - "sass": "^1.79.5", + "sass": "^1.80.5", "sass-loader": "^14.2.1", "vue-cli-plugin-vuetify": "^2.5.8", "vue-template-compiler": "^2.7.16", @@ -116,9 +116,9 @@ } }, "node_modules/@babel/eslint-parser": { - "version": "7.25.8", - "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.8.tgz", - "integrity": "sha512-Po3VLMN7fJtv0nsOjBDSbO1J71UhzShE9MuOSkWEV9IZQXzhZklYtzKZ8ZD/Ij3a0JBv1AG3Ny2L3jvAHQVOGg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.9.tgz", + "integrity": "sha512-5UXfgpK0j0Xr/xIdgdLEhOFxaDZ0bRPWJJchRpqOSur/3rZoPbqqki5mm0p4NE2cs28krBEiSM2MB7//afRSQQ==", "license": "MIT", "dependencies": { "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1", @@ -4594,9 +4594,9 @@ "dev": true }, "node_modules/@vue/eslint-config-prettier": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-10.0.0.tgz", - "integrity": "sha512-iDEjsfT+UXQTJfe+4mstb/B5BSZ5RpL6FO3F97XxElIXdD04gkH+F7PR4fBMEVyJi4892G4LQVPQ8oXxVyp8Dw==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-10.1.0.tgz", + "integrity": "sha512-J6wV91y2pXc0Phha01k0WOHBTPsoSTf4xlmMjoKaeSxBpAdsgTppGF5RZRdOHM7OA74zAXD+VLANrtYXpiPKkQ==", "license": "MIT", "dependencies": { "eslint-config-prettier": "^9.1.0", @@ -7441,9 +7441,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "9.29.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.29.0.tgz", - "integrity": "sha512-hamyjrBhNH6Li6R1h1VF9KHfshJlKgKEg3ARbGTn72CMNDSMhWbgC7NdkRDEh25AFW+4SDATzyNM+3gWuZii8g==", + "version": "9.30.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.30.0.tgz", + "integrity": "sha512-CyqlRgShvljFkOeYK8wN5frh/OGTvkj1S7wlr2Q2pUvwq+X5VYiLd6ZjujpgSgLnys2W8qrBLkXQ41SUYaoPIQ==", "dev": true, "license": "MIT", "dependencies": { @@ -8959,10 +8959,11 @@ } }, "node_modules/http-proxy-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", - "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", + "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dev": true, + "license": "MIT", "dependencies": { "@types/http-proxy": "^1.17.8", "http-proxy": "^1.18.1", @@ -14580,9 +14581,9 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.79.5", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.5.tgz", - "integrity": "sha512-W1h5kp6bdhqFh2tk3DsI771MoEJjvrSY/2ihJRJS4pjIyfJCw0nTsxqhnrUzaLMOJjFchj8rOvraI/YUVjtx5g==", + "version": "1.80.5", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.5.tgz", + "integrity": "sha512-TQd2aoQl/+zsxRMEDSxVdpPIqeq9UFc6pr7PzkugiTx3VYCFPUaa3P4RrBQsqok4PO200Vkz0vXQBNlg7W907g==", "dev": true, "license": "MIT", "dependencies": { diff --git a/demo/vue/app/frontend/package.json b/demo/vue/app/frontend/package.json index e13ed993..c253b92c 100644 --- a/demo/vue/app/frontend/package.json +++ b/demo/vue/app/frontend/package.json @@ -17,9 +17,9 @@ "reinstall": "npm run purge && npm install" }, "dependencies": { - "@babel/eslint-parser": "^7.25.8", + "@babel/eslint-parser": "^7.25.9", "@bcgov/bc-sans": "^2.1.0", - "@vue/eslint-config-prettier": "^10.0.0", + "@vue/eslint-config-prettier": "^10.1.0", "axios": "^1.7.7", "core-js": "^3.38.1", "eslint": "^8.57.0", @@ -39,11 +39,11 @@ "@vue/cli-service": "^5.0.8", "@vue/test-utils": "^1.3.0", "axios-mock-adapter": "^2.1.0", - "eslint-plugin-vue": "^9.29.0", + "eslint-plugin-vue": "^9.30.0", "eslint-plugin-vuetify": "^1.1.0", "lodash": "^4.17.21", "prettier": "^3.3.3", - "sass": "^1.79.5", + "sass": "^1.80.5", "sass-loader": "^14.2.1", "vue-cli-plugin-vuetify": "^2.5.8", "vue-template-compiler": "^2.7.16", diff --git a/demo/vue/app/package-lock.json b/demo/vue/app/package-lock.json index 152fd1c3..4fca9b68 100644 --- a/demo/vue/app/package-lock.json +++ b/demo/vue/app/package-lock.json @@ -22,7 +22,7 @@ "fs-extra": "^11.2.0", "js-yaml": "^4.1.0", "jsonwebtoken": "^9.0.2", - "keycloak-connect": "^26.0.0", + "keycloak-connect": "^26.0.2", "winston": "^3.15.0", "winston-transport": "^4.8.0" }, @@ -2861,10 +2861,9 @@ "dev": true }, "node_modules/elliptic": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", - "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", - "license": "MIT", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz", + "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==", "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", @@ -7706,9 +7705,9 @@ } }, "node_modules/keycloak-connect": { - "version": "26.0.0", - "resolved": "https://registry.npmjs.org/keycloak-connect/-/keycloak-connect-26.0.0.tgz", - "integrity": "sha512-pfUk+MV72MWpWRbCFkZfXlG8hhdUVgpmXVzQTZK/qIk8beyd5cau5q19Qk4x56M1uScy6RorAeACEBw708I2Xg==", + "version": "26.0.2", + "resolved": "https://registry.npmjs.org/keycloak-connect/-/keycloak-connect-26.0.2.tgz", + "integrity": "sha512-vFvJ5ct0f24I69BWHtwc244vhaP2vJb1ROoSrnVp5gf69/cY36cK2MqVfDogZf7bxNYg4GaUOb82FsZvGryfDw==", "license": "Apache-2.0", "dependencies": { "jwk-to-pem": "^2.0.0" diff --git a/demo/vue/app/package.json b/demo/vue/app/package.json index 958e2ef0..05628be1 100644 --- a/demo/vue/app/package.json +++ b/demo/vue/app/package.json @@ -44,7 +44,7 @@ "fs-extra": "^11.2.0", "js-yaml": "^4.1.0", "jsonwebtoken": "^9.0.2", - "keycloak-connect": "^26.0.0", + "keycloak-connect": "^26.0.2", "winston": "^3.15.0", "winston-transport": "^4.8.0" }, From 29779dcb12e3c83b2e6adca88c2823843458d255 Mon Sep 17 00:00:00 2001 From: Lucas ONeil Date: Tue, 29 Oct 2024 22:54:03 -0700 Subject: [PATCH 2/2] Python dependencies Signed-off-by: Lucas ONeil --- poetry.lock | 18 +++++++++--------- pyproject.toml | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/poetry.lock b/poetry.lock index 57365258..b554fb82 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1281,17 +1281,17 @@ testing = ["coverage (>=6.2)", "hypothesis (>=5.7.1)"] [[package]] name = "pytest-cov" -version = "5.0.0" +version = "6.0.0" description = "Pytest plugin for measuring coverage." optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "pytest-cov-5.0.0.tar.gz", hash = "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857"}, - {file = "pytest_cov-5.0.0-py3-none-any.whl", hash = "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652"}, + {file = "pytest-cov-6.0.0.tar.gz", hash = "sha256:fde0b595ca248bb8e2d76f020b465f3b107c9632e6a1d1705f17834c89dcadc0"}, + {file = "pytest_cov-6.0.0-py3-none-any.whl", hash = "sha256:eee6f1b9e61008bd34975a4d5bab25801eb31898b032dd55addc93e96fcaaa35"}, ] [package.dependencies] -coverage = {version = ">=5.2.1", extras = ["toml"]} +coverage = {version = ">=7.5", extras = ["toml"]} pytest = ">=4.6" [package.extras] @@ -1332,13 +1332,13 @@ docs = ["sphinx"] [[package]] name = "python-multipart" -version = "0.0.12" +version = "0.0.16" description = "A streaming multipart parser for Python" optional = false python-versions = ">=3.8" files = [ - {file = "python_multipart-0.0.12-py3-none-any.whl", hash = "sha256:43dcf96cf65888a9cd3423544dd0d75ac10f7aa0c3c28a175bbcd00c9ce1aebf"}, - {file = "python_multipart-0.0.12.tar.gz", hash = "sha256:045e1f98d719c1ce085ed7f7e1ef9d8ccc8c02ba02b5566d5f7521410ced58cb"}, + {file = "python_multipart-0.0.16-py3-none-any.whl", hash = "sha256:c2759b7b976ef3937214dfb592446b59dfaa5f04682a076f78b117c94776d87a"}, + {file = "python_multipart-0.0.16.tar.gz", hash = "sha256:8dee37b88dab9b59922ca173c35acb627cc12ec74019f5cd4578369c6df36554"}, ] [[package]] @@ -1907,4 +1907,4 @@ h11 = ">=0.9.0,<1" [metadata] lock-version = "2.0" python-versions = ">=3.12,<4.0" -content-hash = "8fc3815dd042ed357bf73034e7f7a3e544ab6472c2d26ff5f7d66ff3506b95c5" +content-hash = "a0958e0a26a8dc62224dc44e2dea176c659d49c2a46a822c6eeb0bf201cd2e3c" diff --git a/pyproject.toml b/pyproject.toml index 4b641b63..faf8157a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,28 +14,28 @@ repository = "https://github.com/bcgov/vc-authn-oidc" [tool.poetry.dependencies] python = ">=3.12,<4.0" -fastapi = "^0.115.2" +fastapi = "^0.115.4" jinja2 = "^3.1.4" oic = "^1.7.0" pymongo = "^4.10.1" pyop = "^3.4.1" -python-multipart = "^0.0.12" # required by fastapi to serve/upload files +python-multipart = "^0.0.16" # required by fastapi to serve/upload files qrcode = { version = "^8.0", extras = ["pil"]} structlog = "^24.4.0" uvicorn = { version = "^0.32.0", extras = ["standard"] } python-socketio = "^5.11.4" # required to run websockets canonicaljson = "^2.0.0" # used to provide unique consistent user identifiers" -pydantic-settings = "^2.5.2" +pydantic-settings = "^2.6.0" [tool.poetry.group.dev.dependencies] black = "^24.10.0" mock = "^5.1.0" mongomock = "^4.1.2" pytest-asyncio = "^0.24.0" -pytest-cov = "^5.0.0" +pytest-cov = "^6.0.0" pytest = "^8.3.3" requests-mock = "^1.12.1" -setuptools = "^75.2.0" +setuptools = "^75.3.0" [tool.pytest.ini_options] testpaths = "oidc-controller"