Skip to content

Commit

Permalink
HOTFIX: Auth0 Dependency Error (#34)
Browse files Browse the repository at this point in the history
* reverting auth0 dependeency

* adding external config.json support

* incrementing version and updating changelog

* correct config pathing issue
  • Loading branch information
Bobby Johnson authored Mar 29, 2023
1 parent 07762d5 commit 47685d1
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 161 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
- 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
185 changes: 31 additions & 154 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions src/features/deploy/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,9 @@ export class DeployCommands {
): Promise<any> => {
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 };
Expand Down

0 comments on commit 47685d1

Please sign in to comment.