diff --git a/CHANGELOG.md b/CHANGELOG.md index bbc25c1..b5ae280 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -131,4 +131,12 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how - updated tenant export and import code to latest version - removed dependency on js-yaml delpoy cli handles directly - updated required vscode version to 1.76.2 -- updated test runner to use vscode version 1.76.2 \ No newline at end of file +- updated test runner to use vscode version 1.76.2 + +## [1.4.1] - 2023-03-29 + +### Added +- deploy cli config.json placed next to tenant.yml will be merged into deploy configuration. + +### Changed +- reverted to auth0 v2.42.0 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 7a1b725..1039b7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.4.0", "license": "MIT", "dependencies": { - "auth0": "3.3.0", + "auth0": "2.42.0", "auth0-deploy-cli": "7.17.0", "axios": "1.3.4", "openid-client": "5.4.0", @@ -18,7 +18,7 @@ "winston": "3.8.2" }, "devDependencies": { - "@types/auth0": "3.3.0", + "@types/auth0": "2.35.3", "@types/chai": "4.3.4", "@types/glob": "8.1.0", "@types/mocha": "10.0.1", @@ -305,9 +305,9 @@ } }, "node_modules/@types/auth0": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@types/auth0/-/auth0-3.3.0.tgz", - "integrity": "sha512-hNh10bdY6N0iJcRVRvdFgCdRrBjAjvWHoomu2gk9/SejoesURGNrIhaTCtyruvqD9Ru8NYyOGvZkdYx+tMIqgA==", + "version": "2.35.3", + "resolved": "https://registry.npmjs.org/@types/auth0/-/auth0-2.35.3.tgz", + "integrity": "sha512-8LmBUPDIe0RKV7odNbFzVsP2m8LN/c9/5i3RmXxgsJAZyDh0ND73YnwtFmsSyliRI0Wn+4WZ5vaTV/jEfv9QGg==", "dev": true }, "node_modules/@types/body-parser": { @@ -414,14 +414,6 @@ "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, - "node_modules/@types/jsonwebtoken": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz", - "integrity": "sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==", - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -1186,21 +1178,20 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "node_modules/auth0": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/auth0/-/auth0-3.3.0.tgz", - "integrity": "sha512-9QZlktuIpYcnp5Y43xtTrPRFi0qUDVLGtJNOeG3W6JkDfUx4Qu80mB8nI4lMuhWUGx21ls7lZMG7DXHJI1C4Ug==", + "version": "2.42.0", + "resolved": "https://registry.npmjs.org/auth0/-/auth0-2.42.0.tgz", + "integrity": "sha512-IiA224CoqjPF9Pnx0R80wQZBGlXMia69s7lQHg328Oe2mngdp6Qi32DaIKkkVtJb8FuMleWMgI+zmbwW0znhYw==", "dependencies": { - "axios": "^0.27.2", + "axios": "^0.26.1", "form-data": "^3.0.1", - "jsonwebtoken": "^9.0.0", - "jwks-rsa": "^3.0.1", + "jsonwebtoken": "^8.5.1", + "jwks-rsa": "^1.12.1", "lru-memoizer": "^2.1.4", "rest-facade": "^1.16.3", - "retry": "^0.13.1", - "uuid": "^9.0.0" + "retry": "^0.13.1" }, "engines": { - "node": ">=14" + "node": ">=8.3.0" } }, "node_modules/auth0-deploy-cli": { @@ -1458,63 +1449,13 @@ } }, "node_modules/auth0/node_modules/axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", - "dependencies": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" - } - }, - "node_modules/auth0/node_modules/axios/node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/auth0/node_modules/jsonwebtoken": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz", - "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==", + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", "dependencies": { - "jws": "^3.2.2", - "lodash": "^4.17.21", - "ms": "^2.1.1", - "semver": "^7.3.8" - }, - "engines": { - "node": ">=12", - "npm": ">=6" + "follow-redirects": "^1.14.8" } }, - "node_modules/auth0/node_modules/jwks-rsa": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.0.1.tgz", - "integrity": "sha512-UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw==", - "dependencies": { - "@types/express": "^4.17.14", - "@types/jsonwebtoken": "^9.0.0", - "debug": "^4.3.4", - "jose": "^4.10.4", - "limiter": "^1.1.5", - "lru-memoizer": "^2.1.4" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/auth0/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, "node_modules/axios": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz", @@ -7562,14 +7503,6 @@ "node": ">= 0.4.0" } }, - "node_modules/uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -8344,9 +8277,9 @@ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==" }, "@types/auth0": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@types/auth0/-/auth0-3.3.0.tgz", - "integrity": "sha512-hNh10bdY6N0iJcRVRvdFgCdRrBjAjvWHoomu2gk9/SejoesURGNrIhaTCtyruvqD9Ru8NYyOGvZkdYx+tMIqgA==", + "version": "2.35.3", + "resolved": "https://registry.npmjs.org/@types/auth0/-/auth0-2.35.3.tgz", + "integrity": "sha512-8LmBUPDIe0RKV7odNbFzVsP2m8LN/c9/5i3RmXxgsJAZyDh0ND73YnwtFmsSyliRI0Wn+4WZ5vaTV/jEfv9QGg==", "dev": true }, "@types/body-parser": { @@ -8452,14 +8385,6 @@ "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, - "@types/jsonwebtoken": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz", - "integrity": "sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==", - "requires": { - "@types/node": "*" - } - }, "@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -9043,69 +8968,26 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "auth0": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/auth0/-/auth0-3.3.0.tgz", - "integrity": "sha512-9QZlktuIpYcnp5Y43xtTrPRFi0qUDVLGtJNOeG3W6JkDfUx4Qu80mB8nI4lMuhWUGx21ls7lZMG7DXHJI1C4Ug==", + "version": "2.42.0", + "resolved": "https://registry.npmjs.org/auth0/-/auth0-2.42.0.tgz", + "integrity": "sha512-IiA224CoqjPF9Pnx0R80wQZBGlXMia69s7lQHg328Oe2mngdp6Qi32DaIKkkVtJb8FuMleWMgI+zmbwW0znhYw==", "requires": { - "axios": "^0.27.2", + "axios": "^0.26.1", "form-data": "^3.0.1", - "jsonwebtoken": "^9.0.0", - "jwks-rsa": "^3.0.1", + "jsonwebtoken": "^8.5.1", + "jwks-rsa": "^1.12.1", "lru-memoizer": "^2.1.4", "rest-facade": "^1.16.3", - "retry": "^0.13.1", - "uuid": "^9.0.0" + "retry": "^0.13.1" }, "dependencies": { "axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", "requires": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" - }, - "dependencies": { - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - } + "follow-redirects": "^1.14.8" } - }, - "jsonwebtoken": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz", - "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==", - "requires": { - "jws": "^3.2.2", - "lodash": "^4.17.21", - "ms": "^2.1.1", - "semver": "^7.3.8" - } - }, - "jwks-rsa": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.0.1.tgz", - "integrity": "sha512-UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw==", - "requires": { - "@types/express": "^4.17.14", - "@types/jsonwebtoken": "^9.0.0", - "debug": "^4.3.4", - "jose": "^4.10.4", - "limiter": "^1.1.5", - "lru-memoizer": "^2.1.4" - } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" } } }, @@ -14000,11 +13882,6 @@ "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", "dev": true }, - "uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==" - }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", diff --git a/package.json b/package.json index 47d4f05..e528e2b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-labs", "preview": true, "displayName": "Auth0 Labs", - "version": "1.4.0", + "version": "1.4.1", "description": "A Visual Studio Code extension for training lab automation and quick access to tenant information.", "main": "./dist/extension.js", "publisher": "auth0", @@ -53,7 +53,7 @@ "Other" ], "devDependencies": { - "@types/auth0": "3.3.0", + "@types/auth0": "2.35.3", "@types/chai": "4.3.4", "@types/glob": "8.1.0", "@types/mocha": "10.0.1", @@ -84,7 +84,7 @@ "webpack-cli": "5.0.1" }, "dependencies": { - "auth0": "3.3.0", + "auth0": "2.42.0", "auth0-deploy-cli": "7.17.0", "axios": "1.3.4", "openid-client": "5.4.0", diff --git a/src/features/deploy/commands.ts b/src/features/deploy/commands.ts index eacde7b..ed68bdc 100644 --- a/src/features/deploy/commands.ts +++ b/src/features/deploy/commands.ts @@ -109,10 +109,9 @@ export class DeployCommands { ): Promise => { console.log('auth0.mergeConfig'); - return defaultConfig; - try { - const uri = getFileUri(`${outputFolder}/config.json`); + const file = path.join(outputFolder, 'config.json'); + const uri = getFileUri(file); const data = await readUriContents(uri); const localConfig = JSON.parse(data); return { ...defaultConfig, ...localConfig };