From d98394072f0d83314d15184b7dd05b0d09b6cf4f Mon Sep 17 00:00:00 2001 From: Bobby Johnson Date: Tue, 31 Aug 2021 11:04:26 -0700 Subject: [PATCH 1/7] updates to package lock --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f33e49f..8e3a50f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-labs", - "version": "1.0.1", + "version": "1.0.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-labs", - "version": "1.0.1", + "version": "1.0.3", "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", From b11238a5951c0000ec47c2d9956c0a1553cbfe19 Mon Sep 17 00:00:00 2001 From: Bobby Johnson Date: Tue, 31 Aug 2021 11:27:07 -0700 Subject: [PATCH 2/7] update dependencies and correct type errors --- package-lock.json | 333 +++++++++++++++------------------- package.json | 24 +-- src/features/auth/commands.ts | 4 +- src/utils/codeTour.ts | 2 +- 4 files changed, 164 insertions(+), 199 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8e3a50f..349ba9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,20 @@ { "name": "vscode-labs", - "version": "1.0.3", + "version": "1.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vscode-labs", - "version": "1.0.3", + "version": "1.1.0", "license": "MIT", "dependencies": { "abort-controller": "^3.0.0", "auth0": "^2.36.1", - "auth0-deploy-cli": "^7.2.0", + "auth0-deploy-cli": "^7.2.1", "axios": "^0.21.1", "js-yaml": "^4.1.0", - "openid-client": "^4.7.4", + "openid-client": "^4.7.5", "qs": "^6.10.1", "ts-is-present": "^1.2.1" }, @@ -22,13 +22,13 @@ "@types/auth0": "^2.33.4", "@types/chai": "^4.2.21", "@types/glob": "^7.1.4", - "@types/js-yaml": "^4.0.2", + "@types/js-yaml": "^4.0.3", "@types/mocha": "^9.0.0", - "@types/node": "^16.4.13", + "@types/node": "^16.7.9", "@types/sinon": "^10.0.2", "@types/vscode": "^1.56.1", - "@typescript-eslint/eslint-plugin": "^4.29.0", - "@typescript-eslint/parser": "^4.29.0", + "@typescript-eslint/eslint-plugin": "^4.30.0", + "@typescript-eslint/parser": "^4.30.0", "chai": "^4.3.4", "copy-webpack-plugin": "^9.0.1", "eslint": "^7.32.0", @@ -36,18 +36,18 @@ "eslint-plugin-prettier": "^3.4.0", "express": "^4.17.1", "glob": "^7.1.7", - "mocha": "^9.0.3", + "mocha": "^9.1.1", "prettier": "^2.3.2", "sinon": "^11.1.2", "string-replace-loader": "^3.0.3", "superagent": "^6.1.0", "supports-color": "^9.0.2", "ts-loader": "^9.2.5", - "typescript": "^4.3.5", - "vsce": "^1.96.1", + "typescript": "^4.4.2", + "vsce": "^1.96.2", "vscode-test": "^1.6.1", - "webpack": "^5.49.0", - "webpack-cli": "^4.7.2" + "webpack": "^5.51.1", + "webpack-cli": "^4.8.0" }, "engines": { "vscode": "^1.56.1" @@ -428,9 +428,9 @@ "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==" }, "node_modules/@types/js-yaml": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.2.tgz", - "integrity": "sha512-KbeHS/Y4R+k+5sWXEYzAZKuB1yQlZtEghuhRxrVRLaqhtoG5+26JwQsa4HyS3AWX8v1Uwukma5HheduUDskasA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.3.tgz", + "integrity": "sha512-5t9BhoORasuF5uCPr+d5/hdB++zRFUTMIZOzbNkr+jZh3yQht4HYbRDyj9fY8n2TZT30iW9huzav73x4NikqWg==", "dev": true }, "node_modules/@types/json-schema": { @@ -465,9 +465,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "16.4.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.13.tgz", - "integrity": "sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==" + "version": "16.7.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.9.tgz", + "integrity": "sha512-KktxVzS4FPDFVHUUOWyZMvRo//8vqOLITtLMhFSW9IdLsYT/sPyXj3wXtaTcR7A7olCe7R2Xy7R+q5pg2bU46g==" }, "node_modules/@types/qs": { "version": "6.9.6", @@ -512,13 +512,13 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz", - "integrity": "sha512-eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz", + "integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==", "dev": true, "dependencies": { - "@typescript-eslint/experimental-utils": "4.29.0", - "@typescript-eslint/scope-manager": "4.29.0", + "@typescript-eslint/experimental-utils": "4.30.0", + "@typescript-eslint/scope-manager": "4.30.0", "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.1.0", @@ -543,15 +543,15 @@ } }, "node_modules/@typescript-eslint/experimental-utils": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz", - "integrity": "sha512-FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz", + "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.29.0", - "@typescript-eslint/types": "4.29.0", - "@typescript-eslint/typescript-estree": "4.29.0", + "@typescript-eslint/scope-manager": "4.30.0", + "@typescript-eslint/types": "4.30.0", + "@typescript-eslint/typescript-estree": "4.30.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -567,14 +567,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz", - "integrity": "sha512-+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.30.0.tgz", + "integrity": "sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "4.29.0", - "@typescript-eslint/types": "4.29.0", - "@typescript-eslint/typescript-estree": "4.29.0", + "@typescript-eslint/scope-manager": "4.30.0", + "@typescript-eslint/types": "4.30.0", + "@typescript-eslint/typescript-estree": "4.30.0", "debug": "^4.3.1" }, "engines": { @@ -594,13 +594,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz", - "integrity": "sha512-HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz", + "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.29.0", - "@typescript-eslint/visitor-keys": "4.29.0" + "@typescript-eslint/types": "4.30.0", + "@typescript-eslint/visitor-keys": "4.30.0" }, "engines": { "node": "^8.10.0 || ^10.13.0 || >=11.10.1" @@ -611,9 +611,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz", - "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz", + "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==", "dev": true, "engines": { "node": "^8.10.0 || ^10.13.0 || >=11.10.1" @@ -624,13 +624,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz", - "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz", + "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.29.0", - "@typescript-eslint/visitor-keys": "4.29.0", + "@typescript-eslint/types": "4.30.0", + "@typescript-eslint/visitor-keys": "4.30.0", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -651,12 +651,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz", - "integrity": "sha512-LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz", + "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.29.0", + "@typescript-eslint/types": "4.30.0", "eslint-visitor-keys": "^2.0.0" }, "engines": { @@ -842,9 +842,9 @@ } }, "node_modules/@webpack-cli/serve": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz", - "integrity": "sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz", + "integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==", "dev": true, "peerDependencies": { "webpack-cli": "4.x.x" @@ -1059,16 +1059,16 @@ } }, "node_modules/auth0-deploy-cli": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/auth0-deploy-cli/-/auth0-deploy-cli-7.2.0.tgz", - "integrity": "sha512-VTkIr75P1vnBm8mGkCrknY7p7+QwHWIFWqVCeJJFJnhhjW2Kry79qncvajduYCAMmiDIHYfWr/dEio4yGvsbbg==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/auth0-deploy-cli/-/auth0-deploy-cli-7.2.1.tgz", + "integrity": "sha512-UcseHWW78ddjZIXx4RaU871gyqRGyyXuFr5Z3KBbXa7aEpuW10MrXVzUSDR6hDNeYgo0nikTU16Sfj0IhNy9Cg==", "dependencies": { "ajv": "^6.12.6", "auth0": "^2.35.1", "dot-prop": "^5.2.0", "fs-extra": "^7.0.0", "global-agent": "^2.1.12", - "js-yaml": "^3.14.0", + "js-yaml": "^4.1.0", "lodash": "^4.17.20", "mkdirp": "^0.5.1", "nconf": "^0.8.4", @@ -1103,14 +1103,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/auth0-deploy-cli/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, "node_modules/auth0-deploy-cli/node_modules/camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -1205,18 +1197,6 @@ "node": ">=8" } }, - "node_modules/auth0-deploy-cli/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/auth0-deploy-cli/node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -4621,9 +4601,9 @@ } }, "node_modules/mocha": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz", - "integrity": "sha512-hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.1.tgz", + "integrity": "sha512-0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA==", "dev": true, "dependencies": { "@ungap/promise-all-settled": "1.1.2", @@ -5014,9 +4994,9 @@ } }, "node_modules/openid-client": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-4.7.4.tgz", - "integrity": "sha512-n+RURXYuR0bBZo9i0pn+CXZSyg5JYQ1nbwEwPQvLE7EcJt/vMZ2iIMjLehl5DvCN53XUoPVZs9KAE5r6d9fxsw==", + "version": "4.7.5", + "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-4.7.5.tgz", + "integrity": "sha512-9APA9gHikzzRCc9z3lmIsZ1LcRHho9uTXxt567QlVmAmS2qoVpChTOdla7US9RrbiZsIh50xXd9DpLzh68FtgQ==", "dependencies": { "aggregate-error": "^3.1.0", "got": "^11.8.0", @@ -6333,7 +6313,8 @@ "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true }, "node_modules/stack-trace": { "version": "0.0.10", @@ -6937,9 +6918,9 @@ } }, "node_modules/typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz", + "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -7063,9 +7044,9 @@ } }, "node_modules/vsce": { - "version": "1.96.1", - "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.96.1.tgz", - "integrity": "sha512-KnEVqjfc1dXrpZsbJ8J7B9VQ7GAAx8o5RqBNk42Srv1KF9+e2/aXchQHe9QZxeUs/FiliHoMGpGvnHTXwKIT2A==", + "version": "1.96.2", + "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.96.2.tgz", + "integrity": "sha512-QM674Bs9z2mtzCoNYZpVjbU9AGzkY6hPeraCCam6m0GH0T0dv/E9G63JmBucR0vrXllGBK9Jt6sCBG1Z6fnTMg==", "dev": true, "dependencies": { "azure-devops-node-api": "^11.0.1", @@ -7187,9 +7168,9 @@ } }, "node_modules/webpack": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.49.0.tgz", - "integrity": "sha512-XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw==", + "version": "5.51.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.51.1.tgz", + "integrity": "sha512-xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.0", @@ -7234,15 +7215,15 @@ } }, "node_modules/webpack-cli": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz", - "integrity": "sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz", + "integrity": "sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw==", "dev": true, "dependencies": { "@discoveryjs/json-ext": "^0.5.0", "@webpack-cli/configtest": "^1.0.4", "@webpack-cli/info": "^1.3.0", - "@webpack-cli/serve": "^1.5.1", + "@webpack-cli/serve": "^1.5.2", "colorette": "^1.2.1", "commander": "^7.0.0", "execa": "^5.0.0", @@ -7987,9 +7968,9 @@ "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==" }, "@types/js-yaml": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.2.tgz", - "integrity": "sha512-KbeHS/Y4R+k+5sWXEYzAZKuB1yQlZtEghuhRxrVRLaqhtoG5+26JwQsa4HyS3AWX8v1Uwukma5HheduUDskasA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.3.tgz", + "integrity": "sha512-5t9BhoORasuF5uCPr+d5/hdB++zRFUTMIZOzbNkr+jZh3yQht4HYbRDyj9fY8n2TZT30iW9huzav73x4NikqWg==", "dev": true }, "@types/json-schema": { @@ -8024,9 +8005,9 @@ "dev": true }, "@types/node": { - "version": "16.4.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.13.tgz", - "integrity": "sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==" + "version": "16.7.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.9.tgz", + "integrity": "sha512-KktxVzS4FPDFVHUUOWyZMvRo//8vqOLITtLMhFSW9IdLsYT/sPyXj3wXtaTcR7A7olCe7R2Xy7R+q5pg2bU46g==" }, "@types/qs": { "version": "6.9.6", @@ -8071,13 +8052,13 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz", - "integrity": "sha512-eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz", + "integrity": "sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.29.0", - "@typescript-eslint/scope-manager": "4.29.0", + "@typescript-eslint/experimental-utils": "4.30.0", + "@typescript-eslint/scope-manager": "4.30.0", "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.1.0", @@ -8086,55 +8067,55 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz", - "integrity": "sha512-FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz", + "integrity": "sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw==", "dev": true, "requires": { "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.29.0", - "@typescript-eslint/types": "4.29.0", - "@typescript-eslint/typescript-estree": "4.29.0", + "@typescript-eslint/scope-manager": "4.30.0", + "@typescript-eslint/types": "4.30.0", + "@typescript-eslint/typescript-estree": "4.30.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/parser": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz", - "integrity": "sha512-+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.30.0.tgz", + "integrity": "sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.29.0", - "@typescript-eslint/types": "4.29.0", - "@typescript-eslint/typescript-estree": "4.29.0", + "@typescript-eslint/scope-manager": "4.30.0", + "@typescript-eslint/types": "4.30.0", + "@typescript-eslint/typescript-estree": "4.30.0", "debug": "^4.3.1" } }, "@typescript-eslint/scope-manager": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz", - "integrity": "sha512-HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz", + "integrity": "sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A==", "dev": true, "requires": { - "@typescript-eslint/types": "4.29.0", - "@typescript-eslint/visitor-keys": "4.29.0" + "@typescript-eslint/types": "4.30.0", + "@typescript-eslint/visitor-keys": "4.30.0" } }, "@typescript-eslint/types": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz", - "integrity": "sha512-2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.30.0.tgz", + "integrity": "sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz", - "integrity": "sha512-8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz", + "integrity": "sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.29.0", - "@typescript-eslint/visitor-keys": "4.29.0", + "@typescript-eslint/types": "4.30.0", + "@typescript-eslint/visitor-keys": "4.30.0", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -8143,12 +8124,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz", - "integrity": "sha512-LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q==", + "version": "4.30.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz", + "integrity": "sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.29.0", + "@typescript-eslint/types": "4.30.0", "eslint-visitor-keys": "^2.0.0" } }, @@ -8321,9 +8302,9 @@ } }, "@webpack-cli/serve": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz", - "integrity": "sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.2.tgz", + "integrity": "sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw==", "dev": true, "requires": {} }, @@ -8484,16 +8465,16 @@ } }, "auth0-deploy-cli": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/auth0-deploy-cli/-/auth0-deploy-cli-7.2.0.tgz", - "integrity": "sha512-VTkIr75P1vnBm8mGkCrknY7p7+QwHWIFWqVCeJJFJnhhjW2Kry79qncvajduYCAMmiDIHYfWr/dEio4yGvsbbg==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/auth0-deploy-cli/-/auth0-deploy-cli-7.2.1.tgz", + "integrity": "sha512-UcseHWW78ddjZIXx4RaU871gyqRGyyXuFr5Z3KBbXa7aEpuW10MrXVzUSDR6hDNeYgo0nikTU16Sfj0IhNy9Cg==", "requires": { "ajv": "^6.12.6", "auth0": "^2.35.1", "dot-prop": "^5.2.0", "fs-extra": "^7.0.0", "global-agent": "^2.1.12", - "js-yaml": "^3.14.0", + "js-yaml": "^4.1.0", "lodash": "^4.17.20", "mkdirp": "^0.5.1", "nconf": "^0.8.4", @@ -8516,14 +8497,6 @@ "color-convert": "^2.0.1" } }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "requires": { - "sprintf-js": "~1.0.2" - } - }, "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -8594,15 +8567,6 @@ "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -11236,9 +11200,9 @@ } }, "mocha": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz", - "integrity": "sha512-hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.1.tgz", + "integrity": "sha512-0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA==", "dev": true, "requires": { "@ungap/promise-all-settled": "1.1.2", @@ -11540,9 +11504,9 @@ } }, "openid-client": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-4.7.4.tgz", - "integrity": "sha512-n+RURXYuR0bBZo9i0pn+CXZSyg5JYQ1nbwEwPQvLE7EcJt/vMZ2iIMjLehl5DvCN53XUoPVZs9KAE5r6d9fxsw==", + "version": "4.7.5", + "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-4.7.5.tgz", + "integrity": "sha512-9APA9gHikzzRCc9z3lmIsZ1LcRHho9uTXxt567QlVmAmS2qoVpChTOdla7US9RrbiZsIh50xXd9DpLzh68FtgQ==", "requires": { "aggregate-error": "^3.1.0", "got": "^11.8.0", @@ -12566,7 +12530,8 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true }, "stack-trace": { "version": "0.0.10", @@ -13024,9 +12989,9 @@ } }, "typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz", + "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==", "dev": true }, "uc.micro": { @@ -13133,9 +13098,9 @@ "dev": true }, "vsce": { - "version": "1.96.1", - "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.96.1.tgz", - "integrity": "sha512-KnEVqjfc1dXrpZsbJ8J7B9VQ7GAAx8o5RqBNk42Srv1KF9+e2/aXchQHe9QZxeUs/FiliHoMGpGvnHTXwKIT2A==", + "version": "1.96.2", + "resolved": "https://registry.npmjs.org/vsce/-/vsce-1.96.2.tgz", + "integrity": "sha512-QM674Bs9z2mtzCoNYZpVjbU9AGzkY6hPeraCCam6m0GH0T0dv/E9G63JmBucR0vrXllGBK9Jt6sCBG1Z6fnTMg==", "dev": true, "requires": { "azure-devops-node-api": "^11.0.1", @@ -13231,9 +13196,9 @@ } }, "webpack": { - "version": "5.49.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.49.0.tgz", - "integrity": "sha512-XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw==", + "version": "5.51.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.51.1.tgz", + "integrity": "sha512-xsn3lwqEKoFvqn4JQggPSRxE4dhsRcysWTqYABAZlmavcoTmwlOb9b1N36Inbt/eIispSkuHa80/FJkDTPos1A==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.0", @@ -13291,15 +13256,15 @@ } }, "webpack-cli": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz", - "integrity": "sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.8.0.tgz", + "integrity": "sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw==", "dev": true, "requires": { "@discoveryjs/json-ext": "^0.5.0", "@webpack-cli/configtest": "^1.0.4", "@webpack-cli/info": "^1.3.0", - "@webpack-cli/serve": "^1.5.1", + "@webpack-cli/serve": "^1.5.2", "colorette": "^1.2.1", "commander": "^7.0.0", "execa": "^5.0.0", diff --git a/package.json b/package.json index 37a2d24..00c565b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-labs", "preview": true, "displayName": "Auth0 Labs", - "version": "1.0.3", + "version": "1.1.0", "description": "A Visual Studio Code extension for training lab automation and quick access to tenant information.", "main": "./dist/extension.js", "publisher": "auth0", @@ -60,13 +60,13 @@ "@types/auth0": "^2.33.4", "@types/chai": "^4.2.21", "@types/glob": "^7.1.4", - "@types/js-yaml": "^4.0.2", + "@types/js-yaml": "^4.0.3", "@types/mocha": "^9.0.0", - "@types/node": "^16.4.13", + "@types/node": "^16.7.9", "@types/sinon": "^10.0.2", "@types/vscode": "^1.56.1", - "@typescript-eslint/eslint-plugin": "^4.29.0", - "@typescript-eslint/parser": "^4.29.0", + "@typescript-eslint/eslint-plugin": "^4.30.0", + "@typescript-eslint/parser": "^4.30.0", "chai": "^4.3.4", "copy-webpack-plugin": "^9.0.1", "eslint": "^7.32.0", @@ -74,26 +74,26 @@ "eslint-plugin-prettier": "^3.4.0", "express": "^4.17.1", "glob": "^7.1.7", - "mocha": "^9.0.3", + "mocha": "^9.1.1", "prettier": "^2.3.2", "sinon": "^11.1.2", "string-replace-loader": "^3.0.3", "superagent": "^6.1.0", "supports-color": "^9.0.2", "ts-loader": "^9.2.5", - "typescript": "^4.3.5", - "vsce": "^1.96.1", + "typescript": "^4.4.2", + "vsce": "^1.96.2", "vscode-test": "^1.6.1", - "webpack": "^5.49.0", - "webpack-cli": "^4.7.2" + "webpack": "^5.51.1", + "webpack-cli": "^4.8.0" }, "dependencies": { "abort-controller": "^3.0.0", "auth0": "^2.36.1", - "auth0-deploy-cli": "^7.2.0", + "auth0-deploy-cli": "^7.2.1", "axios": "^0.21.1", "js-yaml": "^4.1.0", - "openid-client": "^4.7.4", + "openid-client": "^4.7.5", "qs": "^6.10.1", "ts-is-present": "^1.2.1" }, diff --git a/src/features/auth/commands.ts b/src/features/auth/commands.ts index e9cedcb..7c8fcf9 100644 --- a/src/features/auth/commands.ts +++ b/src/features/auth/commands.ts @@ -20,7 +20,7 @@ export class AuthCommands { console.log('auth0:authCommands:silentSignIn'); try { await Auth.silentSignIn(); - } catch (e) { + } catch (e: any) { console.log(e.message); } }; @@ -29,7 +29,7 @@ export class AuthCommands { console.log('auth0:authCommands:signIn'); try { await Auth.signIn(); - } catch (e) { + } catch (e: any) { vscode.window.showErrorMessage(e.message); } }; diff --git a/src/utils/codeTour.ts b/src/utils/codeTour.ts index 5249275..3feea5b 100644 --- a/src/utils/codeTour.ts +++ b/src/utils/codeTour.ts @@ -18,7 +18,7 @@ export async function startTour(uri: vscode.Uri) { const api = ext.exports; try { api.startTourByUri(uri); - } catch (e) { + } catch (e: any) { const confirm = await vscode.window.showErrorMessage( `Unable to start lab due to error: ${e.message}` ); From a65a842dd10d2f1699957d44d8db2853b9425a9b Mon Sep 17 00:00:00 2001 From: Bobby Johnson Date: Tue, 31 Aug 2021 12:27:11 -0700 Subject: [PATCH 3/7] implemented auth0.lab.openEndpointByName command --- package.json | 7 +++++++ src/features/labs/commands.ts | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 00c565b..c8ea7bb 100644 --- a/package.json +++ b/package.json @@ -212,6 +212,13 @@ "icon": "$(beaker)", "enablement": "auth0:authenticated && auth0:isLabWorkspace && inDebugMode" }, + { + "category": "Auth0", + "command": "auth0.lab.openEndpointByName", + "title": "Open Url", + "icon": "$(beaker)", + "enablement": "auth0:authenticated && auth0:isLabWorkspace && inDebugMode" + }, { "category": "Auth0", "command": "auth0.app.refresh", diff --git a/src/features/labs/commands.ts b/src/features/labs/commands.ts index ce8ee7d..f517d94 100644 --- a/src/features/labs/commands.ts +++ b/src/features/labs/commands.ts @@ -4,7 +4,7 @@ import { getLabEnvironment, getLabWorkspace } from './workspace'; import { LabResourceResolverBuilder } from './resolver'; import { LabEnvWriter } from './writer'; import { LocalEnvironment } from './models'; -import { getFileUri, startTour } from '../../utils'; +import { getUrlForPort, getFileUri, startTour } from '../../utils'; const registerCommand = commands.registerCommand; const executeCommand = commands.executeCommand; @@ -19,10 +19,37 @@ export class LabCommands { registerCommand('auth0.lab.configure', this.configureLab), registerCommand('auth0.lab.localConfigure', this.localConfigure), registerCommand('auth0.lab.openLocalEndpoint', this.openLocalEndpoint), + registerCommand( + 'auth0.lab.openEndpointByName', + this.openEndpointByName + ), ] ); } + openEndpointByName = async (endpointNames: string): Promise => { + console.log('auth0:labs:openEndpointByName'); + const lab = await getLabEnvironment(); + const results = endpointNames.split(',').map(async (endpointName) => { + const port = + lab?.clients.find((c) => c.name === endpointName.trim())?.env['PORT'] || + lab?.resourceServers.find((c) => c.name === endpointName.trim())?.env[ + 'PORT' + ]; + if (port) { + const url = Uri.parse(getUrlForPort(port as number)); + if (url) { + return await env.openExternal(url); + } + } + return false; + }); + + return Promise.all(results).then((results) => { + return results.every((result) => result === true); + }); + }; + openLocalEndpoint = async (e: Uri): Promise => { console.log('auth0:labs:openLocalEndpoint'); if (e) { From 821c219841c53e30b37fd340a33c462d86ae2be9 Mon Sep 17 00:00:00 2001 From: Bobby Johnson Date: Wed, 1 Sep 2021 08:38:43 -0700 Subject: [PATCH 4/7] removing direct dependency on codetour and restclient --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index c8ea7bb..4654d1a 100644 --- a/package.json +++ b/package.json @@ -52,10 +52,6 @@ "Education", "Other" ], - "extensionDependencies": [ - "vsls-contrib.codetour", - "humao.rest-client" - ], "devDependencies": { "@types/auth0": "^2.33.4", "@types/chai": "^4.2.21", From 3b71f6f28b86292f653748f02287e078d8507c15 Mon Sep 17 00:00:00 2001 From: Bobby Johnson Date: Wed, 1 Sep 2021 09:12:13 -0700 Subject: [PATCH 5/7] added localConfigure and tenantCofigure commands --- package.json | 14 ++++++++++++++ src/features/labs/commands.ts | 23 +++++++++++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4654d1a..e382725 100644 --- a/package.json +++ b/package.json @@ -201,6 +201,20 @@ "icon": "$(beaker)", "enablement": "auth0:authenticated && auth0:isLabWorkspace" }, + { + "category": "Auth0", + "command": "auth0.lab.localConfigure", + "title": "Configure Local Environment", + "icon": "$(beaker)", + "enablement": "auth0:authenticated && auth0:isLabWorkspace" + }, + { + "category": "Auth0", + "command": "auth0.lab.tenantConfigure", + "title": "Configure Tenant Resources", + "icon": "$(beaker)", + "enablement": "auth0:authenticated && auth0:isLabWorkspace" + }, { "category": "Auth0", "command": "auth0.lab.openLocalEndpoint", diff --git a/src/features/labs/commands.ts b/src/features/labs/commands.ts index f517d94..7345587 100644 --- a/src/features/labs/commands.ts +++ b/src/features/labs/commands.ts @@ -18,6 +18,7 @@ export class LabCommands { registerCommand('auth0.lab.notification', this.checkLab), registerCommand('auth0.lab.configure', this.configureLab), registerCommand('auth0.lab.localConfigure', this.localConfigure), + registerCommand('auth0.lab.tenantConfigure', this.tenantConfigure), registerCommand('auth0.lab.openLocalEndpoint', this.openLocalEndpoint), registerCommand( 'auth0.lab.openEndpointByName', @@ -122,7 +123,7 @@ export class LabCommands { message: 'writing local environment files', increment: 60, }); - await executeCommand('auth0.lab.localConfigure', labEnv); + await executeCommand('auth0.lab.localConfigure'); } //issue post command to kick off next process @@ -149,11 +150,25 @@ export class LabCommands { ); }; - localConfigure = async (labEnv: LocalEnvironment): Promise => { + tenantConfigure = async (): Promise => { + console.log('auth0:labs:tenantConfigure'); + const workspace = getLabWorkspace(); + const labEnv = await getLabEnvironment(); + + if (workspace && labEnv && labEnv.resources) { + const uri = getFileUri(`/.auth0/lab/${labEnv.resources}`, workspace.uri); + + await executeCommand('auth0.deploy', uri); + } + }; + + localConfigure = async (): Promise => { console.log('auth0:labs:localConfigure'); const workspace = getLabWorkspace(); - const resolvers = await this.labDataResolver.build(labEnv); - if (workspace) { + const labEnv = await getLabEnvironment(); + + if (workspace && labEnv) { + const resolvers = await this.labDataResolver.build(labEnv); new LabEnvWriter(workspace.uri).writeAll(resolvers); } }; From 638b29e5df81e3a5379bf1095272456a825211a0 Mon Sep 17 00:00:00 2001 From: Bobby Johnson Date: Wed, 1 Sep 2021 09:25:34 -0700 Subject: [PATCH 6/7] adding new commands to the readme --- README.md | 15 +++++++++------ package.json | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4ddced7..76381d7 100644 --- a/README.md +++ b/README.md @@ -53,12 +53,15 @@ Under the Debug Tab in Visual Studio Code, select `Run Extension`. ### Contributed Commands In addition to the visual features listed below, the Labs extension also contributes the following commands to the command palette: -- **Auth0: Sign In** - Starts the authentication process. -- **Auth0: Sign Out** - Clears all authentication tokens. -- **Auth0: Switch Tenant** - Clears all authentication tokens and starts the authentication process allowing the selection of a new tenant. -- **Auth0: Add Application** - Starts a wizard to create a new client registration in the current Auth0 tenant. -- **Auth0: Add API** - Starts a wizard to create a new resource server registration in the current Auth0 tenant. -- **Auth0: Configure Lab** - Configures tenant and local environment for the current lab materials. Only available when lab materials are present in workspace. +- **Auth0: Sign In** - `auth0.auth.signIn` Starts the authentication process. +- **Auth0: Sign Out** - `auth0.auth.signOut` Clears all authentication tokens. +- **Auth0: Switch Tenant** - `auth0.auth.switchTenant` Clears all authentication tokens and starts the authentication process allowing the selection of a new tenant. +- **Auth0: Add Application** - `auth0.app.add` Starts a wizard to create a new client registration in the current Auth0 tenant. +- **Auth0: Add API** - `auth0.api.add` Starts a wizard to create a new resource server registration in the current Auth0 tenant. +- **Auth0: Configure Lab** - `auth0.lab.configure` Configures tenant and local environment for the current lab materials. Only available when lab materials are present in workspace. +- **Auth0: Configure Local Environment** - `auth0.lab.localConfigure` Configures local environment for the current lab materials. Only available when lab materials are present in workspace. +- **Auth0: Configure Tenant Resources** - `auth0.lab.tenantConfigure` Configures tenant for the current lab materials. Only available when lab materials are present in workspace. +- **Auth0: Open Endpoint Url** - `auth0.lab.openEndpointByName?["Endpoint 1, Endpoint 2"]` Opens the URL associated with a specific named endpoint in the default browser. Multiple endpoints can be opened by supplying a comma seperated list. Only available when lab materials are present in workspace. ### Authenticating diff --git a/package.json b/package.json index e382725..a1e2412 100644 --- a/package.json +++ b/package.json @@ -225,7 +225,7 @@ { "category": "Auth0", "command": "auth0.lab.openEndpointByName", - "title": "Open Url", + "title": "Open Endpoint Url", "icon": "$(beaker)", "enablement": "auth0:authenticated && auth0:isLabWorkspace && inDebugMode" }, From 9f98efeab9d62f4f6fae8dbb697619f19364f345 Mon Sep 17 00:00:00 2001 From: Bobby Johnson Date: Wed, 1 Sep 2021 09:36:39 -0700 Subject: [PATCH 7/7] update change log --- CHANGELOG.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49be28e..fceea6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,4 +6,16 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how ## [Unreleased] -- Initial release \ No newline at end of file +- Initial release + +## [1.1.0] - 2021-09-01 +### Added +- Implemented `auth0.lab.openEndpointByName` command +- Implemented `auth0.lab.localConfigure` command +- Implemented `auth0.lab.tenantCofigure` command + +### Changed +- Updated dependencies +### Removed +- - Removed direct dependency on CodeTour and RestClient + - These dependecies should now be defined in the devcontainer.json file