From 731dc6318fa2c8a2e1d0bc302fd7262f0a03112d Mon Sep 17 00:00:00 2001 From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com> Date: Thu, 28 Sep 2023 15:53:49 -0700 Subject: [PATCH] Update Azure core packages and additional error handling (#24500) --- build/package.json | 6 +- build/yarn.lock | 82 +++++++++-------- extensions/azurecore/package.json | 9 +- .../src/account-provider/auths/azureAuth.ts | 12 ++- .../account-provider/utils/msalCachePlugin.ts | 32 ++++--- .../services/subscriptionService.ts | 2 +- extensions/azurecore/yarn.lock | 88 ++++++++++--------- extensions/integration-tests/yarn.lock | 33 ++++--- 8 files changed, 149 insertions(+), 115 deletions(-) diff --git a/build/package.json b/build/package.json index 0e212f3629..14ac13c633 100644 --- a/build/package.json +++ b/build/package.json @@ -6,11 +6,11 @@ "@actions/core": "1.9.1", "@actions/github": "2.1.1", "@azure/cosmos": "^3.17.3", - "@azure/identity": "^2.1.0", - "@azure/storage-blob": "^12.13.0", + "@azure/identity": "^3.3.0", + "@azure/storage-blob": "^12.16.0", "@electron/get": "^1.12.4", "@types/ansi-colors": "^3.2.0", - "@types/azure": "0.9.19", + "@types/azure": "0.9.20", "@types/byline": "^4.2.32", "@types/cssnano": "^4.0.0", "@types/debounce": "^1.0.0", diff --git a/build/yarn.lock b/build/yarn.lock index 2b838f6ba1..1a649c6b64 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -53,6 +53,15 @@ "@azure/abort-controller" "^1.0.0" tslib "^2.2.0" +"@azure/core-auth@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.5.0.tgz#a41848c5c31cb3b7c84c409885267d55a2c92e44" + integrity sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw== + dependencies: + "@azure/abort-controller" "^1.0.0" + "@azure/core-util" "^1.1.0" + tslib "^2.2.0" + "@azure/core-client@^1.4.0": version "1.6.1" resolved "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.1.tgz" @@ -140,6 +149,14 @@ dependencies: tslib "^2.2.0" +"@azure/core-util@^1.1.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.5.0.tgz#ffe49c3e867044da67daeb8122143fa065e1eb0e" + integrity sha512-GZBpVFDtQ/15hW1OgBcRdT4Bl7AEpcEZqLfbAvOtm1CQUncKWiYapFHVD588hmlV27NbOOtSm3cnLF3lvoHi4g== + dependencies: + "@azure/abort-controller" "^1.0.0" + tslib "^2.2.0" + "@azure/core-util@^1.1.1": version "1.3.0" resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.3.0.tgz#ea736a0cb0437ac0d049d57ff627c240b41479ec" @@ -167,21 +184,21 @@ universal-user-agent "^6.0.0" uuid "^8.3.0" -"@azure/identity@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-2.1.0.tgz#89f0bfc1d1264dfd3d0cb19837c33a9c6706d548" - integrity sha512-BPDz1sK7Ul9t0l9YKLEa8PHqWU4iCfhGJ+ELJl6c8CP3TpJt2urNCbm0ZHsthmxRsYoMPbz2Dvzj30zXZVmAFw== +"@azure/identity@^3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-3.3.0.tgz#0166cfdfa892d73eeb69c390dac91796c6f85f79" + integrity sha512-gISa/dAAxrWt6F2WiDXZY0y2xY4MLlN2wkNW4cPuq5OgPQKLSkxLc4I2WR04puTfZyQZnpXbAapAMEj1b96fgg== dependencies: "@azure/abort-controller" "^1.0.0" - "@azure/core-auth" "^1.3.0" + "@azure/core-auth" "^1.5.0" "@azure/core-client" "^1.4.0" "@azure/core-rest-pipeline" "^1.1.0" "@azure/core-tracing" "^1.0.0" "@azure/core-util" "^1.0.0" "@azure/logger" "^1.0.0" - "@azure/msal-browser" "^2.26.0" - "@azure/msal-common" "^7.0.0" - "@azure/msal-node" "^1.10.0" + "@azure/msal-browser" "^2.37.1" + "@azure/msal-common" "^13.1.0" + "@azure/msal-node" "^1.17.3" events "^3.0.0" jws "^4.0.0" open "^8.0.0" @@ -196,36 +213,31 @@ dependencies: tslib "^2.0.0" -"@azure/msal-browser@^2.26.0": - version "2.37.0" - resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-2.37.0.tgz#32d7af74eef53f2692f8a9d6bd6818c78faf4c1b" - integrity sha512-YNGD/W/tw/5wDWlXOfmrVILaxVsorVLxYU2ovmL1PDvxkdudbQRyGk/76l4emqgDAl/kPQeqyivxjOU6w1YfvQ== +"@azure/msal-browser@^2.37.1": + version "2.38.2" + resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-2.38.2.tgz#707725c892258fe6b3af4dd410e1daff608521b5" + integrity sha512-71BeIn2we6LIgMplwCSaMq5zAwmalyJR3jFcVOZxNVfQ1saBRwOD+P77nLs5vrRCedVKTq8RMFhIOdpMLNno0A== dependencies: - "@azure/msal-common" "13.0.0" + "@azure/msal-common" "13.3.0" -"@azure/msal-common@13.0.0": - version "13.0.0" - resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-13.0.0.tgz#9c39184903b5d0fd6e643ccc12193fae220e912b" - integrity sha512-GqCOg5H5bouvLij9NFXFkh+asRRxsPBRwnTDsfK7o0KcxYHJbuidKw8/VXpycahGXNxgtuhqtK/n5he+5NhyEA== +"@azure/msal-common@13.3.0", "@azure/msal-common@^13.1.0": + version "13.3.0" + resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-13.3.0.tgz#dfa39810e0fbce6e07ca85a2cf305da58d30b7c9" + integrity sha512-/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg== -"@azure/msal-common@^7.0.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-7.6.0.tgz#b52e97ef540275f72611cff57937dfa0b34cdcca" - integrity sha512-XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q== - -"@azure/msal-node@^1.10.0": - version "1.17.2" - resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.17.2.tgz#42566443e0cdf476bcb43854c9fe47a2def40baf" - integrity sha512-l8edYnA2LQj4ue3pjxVz1Qy4HuU5xbcoebfe2bGTRvBL9Q6n2Df47aGftkLIyimD1HxHuA4ZZOe23a/HshoYXw== +"@azure/msal-node@^1.17.3": + version "1.18.3" + resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.18.3.tgz#e265556d4db0340590eeab5341469fb6740251d0" + integrity sha512-lI1OsxNbS/gxRD4548Wyj22Dk8kS7eGMwD9GlBZvQmFV8FJUXoXySL1BiNzDsHUE96/DS/DHmA+F73p1Dkcktg== dependencies: - "@azure/msal-common" "13.0.0" + "@azure/msal-common" "13.3.0" jsonwebtoken "^9.0.0" uuid "^8.3.0" -"@azure/storage-blob@^12.13.0": - version "12.14.0" - resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.14.0.tgz#32d3e5fa3bb2a12d5d44b186aed11c8e78f00178" - integrity sha512-g8GNUDpMisGXzBeD+sKphhH5yLwesB4JkHr1U6be/X3F+cAMcyGLPD1P89g2M7wbEtUJWoikry1rlr83nNRBzg== +"@azure/storage-blob@^12.16.0": + version "12.16.0" + resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.16.0.tgz#c41fb1e538d6f6e2a6756bfcc69382eededf4fa1" + integrity sha512-jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -540,10 +552,10 @@ resolved "https://registry.npmjs.org/@types/ansi-colors/-/ansi-colors-3.2.0.tgz" integrity sha512-0caWAhXht9N2lOdMzJLXybsSkYCx1QOdxx6pae48tswI9QV3DFX26AoOpy0JxwhCb+zISTqmd6H8t9Zby9BoZg== -"@types/azure@0.9.19": - version "0.9.19" - resolved "https://registry.npmjs.org/@types/azure/-/azure-0.9.19.tgz" - integrity sha1-Gmqb2Fa0N93s8/n8hAemg8hpugI= +"@types/azure@0.9.20": + version "0.9.20" + resolved "https://registry.yarnpkg.com/@types/azure/-/azure-0.9.20.tgz#ce00ed2546c5dc5c63489162c804a2f773b95cfa" + integrity sha512-5+YeTSAruOEjCtmRJlqnhUTJtA4+kjPhOwUUT6Eo4O3MDQIlGzGwJw70umHgaSw0hZoWIB2g/iCRXtmesn9F2w== dependencies: "@types/node" "*" diff --git a/extensions/azurecore/package.json b/extensions/azurecore/package.json index 11a67de96b..b75a8f6d02 100644 --- a/extensions/azurecore/package.json +++ b/extensions/azurecore/package.json @@ -520,12 +520,13 @@ "hasAzureResourceProviders": true }, "dependencies": { - "@azure/arm-resourcegraph": "^4.0.0", + "@azure/arm-resourcegraph": "^4.2.1", "@azure/arm-subscriptions": "^3.0.0", - "@azure/msal-common": "^11.0.0", - "@azure/msal-node": "^1.16.0", + "@azure/msal-common": "^13.3.0", + "@azure/msal-node": "^1.18.3", + "@azure/ms-rest-js": "^2.2.0", "@azure/storage-blob": "^12.13.0", - "axios": "^0.27.2", + "axios": "^1.5.0", "lockfile": "1.0.4", "@microsoft/ads-extension-telemetry": "^3.0.1", "node-fetch": "^2.6.7", diff --git a/extensions/azurecore/src/account-provider/auths/azureAuth.ts b/extensions/azurecore/src/account-provider/auths/azureAuth.ts index 6d40c49699..ecab2962e5 100644 --- a/extensions/azurecore/src/account-provider/auths/azureAuth.ts +++ b/extensions/azurecore/src/account-provider/auths/azureAuth.ts @@ -32,6 +32,7 @@ const localize = nls.loadMessageBundle(); export type GetTenantsResponseData = { value: TenantResponse[]; + error?: string; } export abstract class AzureAuth implements vscode.Disposable { @@ -45,6 +46,7 @@ export abstract class AzureAuth implements vscode.Disposable { protected readonly clientId: string; protected readonly resources: Resource[]; protected readonly httpClient: HttpClient; + private readonly _disposableStore: vscode.Disposable[]; constructor( protected readonly metadata: AzureAccountProviderMetadata, @@ -55,7 +57,7 @@ export abstract class AzureAuth implements vscode.Disposable { protected readonly authType: AzureAuthType, public readonly userFriendlyName: string ) { - + this._disposableStore = []; this.loginEndpointUrl = this.metadata.settings.host; this.commonTenant = { id: 'common', @@ -99,6 +101,7 @@ export abstract class AzureAuth implements vscode.Disposable { this.scopes = [...this.metadata.settings.scopes]; this.scopesString = this.scopes.join(' '); this.httpClient = getProxyEnabledHttpClient(); + this._disposableStore.push(this.uriEventEmitter); } public async startLogin(): Promise { @@ -510,8 +513,7 @@ export abstract class AzureAuth implements vscode.Disposable { this.clientApplication.clearCache(); // unlink both cache files - await this.msalCacheProvider.unlinkMsalCache(); - await this.msalCacheProvider.unlinkLocalCache(); + await this.msalCacheProvider.unlinkCacheFiles(); // Delete Encryption Keys await this.msalCacheProvider.clearCacheEncryptionKeys(); @@ -541,7 +543,9 @@ export abstract class AzureAuth implements vscode.Disposable { await this.msalCacheProvider.clearAccountFromLocalCache(accountKey.accountId); } - public async dispose() { } + public async dispose() { + this._disposableStore.forEach(d => d.dispose()); + } public async autoOAuthCancelled(): Promise { } diff --git a/extensions/azurecore/src/account-provider/utils/msalCachePlugin.ts b/extensions/azurecore/src/account-provider/utils/msalCachePlugin.ts index a68dd44638..8252ac7823 100644 --- a/extensions/azurecore/src/account-provider/utils/msalCachePlugin.ts +++ b/extensions/azurecore/src/account-provider/utils/msalCachePlugin.ts @@ -75,7 +75,7 @@ export class MsalCachePluginProvider { // Handle deserialization error in cache file in case file gets corrupted. // Clearing cache here will ensure account is marked stale so re-authentication can be triggered. Logger.verbose(`MsalCachePlugin: Error occurred when trying to read cache file, file will be deleted: ${e.message}`); - await fsPromises.unlink(this._msalCacheConfiguration.cacheFilePath); + await this.unlinkCache(this._msalCacheConfiguration); } } @@ -177,17 +177,11 @@ export class MsalCachePluginProvider { } /** - * Deletes Msal access token cache file + * Deletes both cache files. */ - public async unlinkMsalCache(): Promise { - await fsPromises.unlink(this._msalCacheConfiguration.cacheFilePath); - } - - /** - * Deletes local access token cache file. - */ - public async unlinkLocalCache(): Promise { - await fsPromises.unlink(this._localCacheConfiguration.cacheFilePath); + public async unlinkCacheFiles(): Promise { + await this.unlinkCache(this._msalCacheConfiguration); + await this.unlinkCache(this._localCacheConfiguration); } //#region Private helper methods @@ -225,13 +219,12 @@ export class MsalCachePluginProvider { else { Logger.error(`MsalCachePlugin: Failed to read from cache file: ${e}`); Logger.verbose(`MsalCachePlugin: Error occurred when trying to read cache file ${currentConfig.name}, file will be deleted: ${e.message}`); - await fsPromises.unlink(currentConfig.cacheFilePath); - + await this.unlinkCache(currentConfig); // Ensure both configurations are not same. if (currentConfig.name !== alternateConfig.name) { // Delete alternate cache file as well. alternateConfig.lockTaken = await this.waitAndLock(alternateConfig.lockFilePath, alternateConfig.lockTaken); - await fsPromises.unlink(alternateConfig.cacheFilePath); + await this.unlinkCache(alternateConfig); lockFile.unlockSync(alternateConfig.lockFilePath); alternateConfig.lockTaken = false; Logger.verbose(`MsalCachePlugin: Cache file for ${alternateConfig.name} cache also deleted.`); @@ -276,5 +269,16 @@ export class MsalCachePluginProvider { } return lockTaken; } + + /** + * Deletes access token cache file for specified config + */ + private async unlinkCache(config: CacheConfiguration): Promise { + try { + await fsPromises.unlink(config.cacheFilePath); + } catch (e) { + Logger.info(`An error occurred when clearing ${config.name} Cache, safely ignored: ${e}`); + } + } //#endregion } diff --git a/extensions/azurecore/src/azureResource/services/subscriptionService.ts b/extensions/azurecore/src/azureResource/services/subscriptionService.ts index 97dc26c326..4e91c3aa92 100644 --- a/extensions/azurecore/src/azureResource/services/subscriptionService.ts +++ b/extensions/azurecore/src/azureResource/services/subscriptionService.ts @@ -8,7 +8,6 @@ import * as vscode from 'vscode'; import { SubscriptionClient } from '@azure/arm-subscriptions'; import { AzureAccount, azureResource } from 'azurecore'; import { IAzureResourceSubscriptionService } from '../interfaces'; -import { TokenCredentials } from '@azure/ms-rest-js'; import { AzureSubscriptionError } from '../errors'; import { AzureResourceErrorMessageUtil } from '../utils'; import { Logger } from '../../utils/Logger'; @@ -16,6 +15,7 @@ import { Logger } from '../../utils/Logger'; import * as nls from 'vscode-nls'; import { TenantIgnoredError } from '../../utils/TenantIgnoredError'; import { multiple_matching_tokens_error } from '../../constants'; +import { TokenCredentials } from '@azure/ms-rest-js'; const localize = nls.loadMessageBundle(); export class AzureResourceSubscriptionService implements IAzureResourceSubscriptionService { diff --git a/extensions/azurecore/yarn.lock b/extensions/azurecore/yarn.lock index 29790ca2ac..8b37bb7f9a 100644 --- a/extensions/azurecore/yarn.lock +++ b/extensions/azurecore/yarn.lock @@ -9,22 +9,24 @@ dependencies: tslib "^2.0.0" -"@azure/arm-resourcegraph@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@azure/arm-resourcegraph/-/arm-resourcegraph-4.0.0.tgz#9f8b1e521124eaec20ac8224935af718ce2d5e7d" - integrity sha512-2iCedUV2WACNKeivlt1YLpHDTFaMLvaWMizdkocaHp+e4K8QiV/ToB0FxBWHtT0l9SH9RK4hoHEcgtW5bEEnAg== +"@azure/arm-resourcegraph@^4.2.1": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@azure/arm-resourcegraph/-/arm-resourcegraph-4.2.1.tgz#d529d5da40356393a22eb51a2af4ba91ef1ae1ec" + integrity sha512-PDuRJ6I7wpy/bu2dqX3OVvX6fpM3YzXkFLGnmYpevYFBQBgueNhHruBAk5r1xh2VRTv1M0lAdaYy6LmVHiCRTw== dependencies: - "@azure/ms-rest-azure-js" "^2.0.1" - "@azure/ms-rest-js" "^2.0.4" + "@azure/core-auth" "^1.1.4" + "@azure/ms-rest-azure-js" "^2.1.0" + "@azure/ms-rest-js" "^2.2.0" tslib "^1.10.0" "@azure/arm-subscriptions@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@azure/arm-subscriptions/-/arm-subscriptions-3.0.0.tgz#e47b57ee35452c289d820ccd5fcb59ac107616ec" - integrity sha512-EIPbFJsjLtp6sEDyCJqqt9UIwYm4sAcMEA5pDVXQmEwKPtUckxmqalmFUN9754crv63QRR+Vy01gccJZDR5m1Q== + version "3.1.2" + resolved "https://registry.yarnpkg.com/@azure/arm-subscriptions/-/arm-subscriptions-3.1.2.tgz#6afb0754789942f190c2d8e244a521c9e2cdb886" + integrity sha512-fO1Sxjn27At53Zkgs0tKW9l6iYavfbVgkK4rCFYa2d3M5yofGctHafYDTHQLnp7dYwUzGzTHrBMlyrKo92QpAQ== dependencies: - "@azure/ms-rest-azure-js" "^2.0.1" - "@azure/ms-rest-js" "^2.0.4" + "@azure/core-auth" "^1.1.4" + "@azure/ms-rest-azure-js" "^2.1.0" + "@azure/ms-rest-js" "^2.2.0" tslib "^1.10.0" "@azure/core-auth@^1.1.4": @@ -102,7 +104,7 @@ dependencies: tslib "^2.2.0" -"@azure/ms-rest-azure-js@^2.0.1": +"@azure/ms-rest-azure-js@^2.1.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@azure/ms-rest-azure-js/-/ms-rest-azure-js-2.1.0.tgz#8c90b31468aeca3146b06c7144b386fd4827f64c" integrity sha512-CjZjB8apvXl5h97Ck6SbeeCmU0sk56YPozPtTyGudPp1RGoHXNjFNtoOvwOG76EdpmMpxbK10DqcygI16Lu60Q== @@ -111,7 +113,7 @@ "@azure/ms-rest-js" "^2.2.0" tslib "^1.10.0" -"@azure/ms-rest-js@^2.0.4", "@azure/ms-rest-js@^2.2.0": +"@azure/ms-rest-js@^2.2.0": version "2.6.6" resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-2.6.6.tgz#a2ae4a515565ae1b73729b52b25875853bb3240a" integrity sha512-WYIda8VvrkZE68xHgOxUXvjThxNf1nnGPPe0rAljqK5HJHIZ12Pi3YhEDOn3Ge7UnwaaM3eFO0VtAy4nGVI27Q== @@ -126,24 +128,24 @@ uuid "^8.3.2" xml2js "^0.5.0" -"@azure/msal-common@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-11.0.0.tgz#d35bfa6cdd2a5b8c036ce427aa3fd36f8f985239" - integrity sha512-SZH8ObQ3Hq5v3ogVGBYJp1nNW7p+MtM4PH4wfNadBP9wf7K0beQHF9iOtRcjPOkwZf+ZD49oXqw91LndIkdk8g== +"@azure/msal-common@13.3.0", "@azure/msal-common@^13.3.0": + version "13.3.0" + resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-13.3.0.tgz#dfa39810e0fbce6e07ca85a2cf305da58d30b7c9" + integrity sha512-/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg== -"@azure/msal-node@^1.16.0": - version "1.16.0" - resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.16.0.tgz#0bd469916f5a9da22d844edc879ac7e8225c0ccb" - integrity sha512-eGXPp65i++mAIvziafbCH970TCeECB6iaQP7aRzZEjtU238cW4zKm40U8YxkiCn9rR1G2VeMHENB5h6WRk7ZCQ== +"@azure/msal-node@^1.18.3": + version "1.18.3" + resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.18.3.tgz#e265556d4db0340590eeab5341469fb6740251d0" + integrity sha512-lI1OsxNbS/gxRD4548Wyj22Dk8kS7eGMwD9GlBZvQmFV8FJUXoXySL1BiNzDsHUE96/DS/DHmA+F73p1Dkcktg== dependencies: - "@azure/msal-common" "^11.0.0" + "@azure/msal-common" "13.3.0" jsonwebtoken "^9.0.0" uuid "^8.3.0" "@azure/storage-blob@^12.13.0": - version "12.13.0" - resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.13.0.tgz#9209cbb5c2cd463fb967a0f2ae144ace20879160" - integrity sha512-t3Q2lvBMJucgTjQcP5+hvEJMAsJSk0qmAnjDLie2td017IiduZbbC9BOcFfmwzR6y6cJdZOuewLCNFmEx9IrXA== + version "12.16.0" + resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.16.0.tgz#c41fb1e538d6f6e2a6756bfcc69382eededf4fa1" + integrity sha512-jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q== dependencies: "@azure/abort-controller" "^1.0.0" "@azure/core-http" "^3.0.0" @@ -596,13 +598,14 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -axios@^0.27.2: - version "0.27.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" - integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== +axios@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.5.0.tgz#f02e4af823e2e46a9768cfc74691fdd0517ea267" + integrity sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ== dependencies: - follow-redirects "^1.14.9" + follow-redirects "^1.15.0" form-data "^4.0.0" + proxy-from-env "^1.1.0" balanced-match@^1.0.0: version "1.0.0" @@ -991,10 +994,10 @@ flat@^5.0.2: resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== -follow-redirects@^1.14.9: - version "1.15.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4" - integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ== +follow-redirects@^1.15.0: + version "1.15.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" + integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== form-data@^2.5.0: version "2.5.1" @@ -1873,6 +1876,11 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + psl@^1.1.28: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" @@ -1884,9 +1892,9 @@ punycode@^2.1.1: integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== qs@^6.9.1: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + version "6.11.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" + integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== dependencies: side-channel "^1.0.4" @@ -2339,9 +2347,9 @@ wrappy@1: integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= ws@^7.4.6: - version "7.4.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" - integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== + version "7.5.9" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" + integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== xml2js@^0.5.0: version "0.5.0" diff --git a/extensions/integration-tests/yarn.lock b/extensions/integration-tests/yarn.lock index 2da5657796..87690be801 100644 --- a/extensions/integration-tests/yarn.lock +++ b/extensions/integration-tests/yarn.lock @@ -154,24 +154,29 @@ tslib "^2.2.0" "@azure/msal-browser@^2.26.0": - version "2.27.0" - resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-2.27.0.tgz#3db38db6bc2bae44485025ba9bb99c43ed7f4302" - integrity sha512-PyATq2WvK+x32waRqqikym8wvn939iO9UhpFqhLwitNrfLa3PHUgJuuI9oLSQOS3/UzjYb8aqN+XzchU3n/ZuQ== + version "2.38.2" + resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-2.38.2.tgz#707725c892258fe6b3af4dd410e1daff608521b5" + integrity sha512-71BeIn2we6LIgMplwCSaMq5zAwmalyJR3jFcVOZxNVfQ1saBRwOD+P77nLs5vrRCedVKTq8RMFhIOdpMLNno0A== dependencies: - "@azure/msal-common" "^7.1.0" + "@azure/msal-common" "13.3.0" -"@azure/msal-common@^7.0.0", "@azure/msal-common@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-7.1.0.tgz#b77dbf9ae581f1ed254f81d56422e3cdd6664b32" - integrity sha512-WyfqE5mY/rggjqvq0Q5DxLnA33KSb0vfsUjxa95rycFknI03L5GPYI4HTU9D+g0PL5TtsQGnV3xzAGq9BFCVJQ== +"@azure/msal-common@13.3.0": + version "13.3.0" + resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-13.3.0.tgz#dfa39810e0fbce6e07ca85a2cf305da58d30b7c9" + integrity sha512-/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg== + +"@azure/msal-common@^7.0.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-7.6.0.tgz#b52e97ef540275f72611cff57937dfa0b34cdcca" + integrity sha512-XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q== "@azure/msal-node@^1.10.0": - version "1.11.0" - resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.11.0.tgz#d8bd3f15c1f05bf806ba6f9479c48c2eddd6a98d" - integrity sha512-KW/XEexfCrPzdYbjY7NVmhq9okZT3Jvck55CGXpz9W5asxeq3EtrP45p+ZXtQVEfko0YJdolpCNqWUyXvanWZg== + version "1.18.3" + resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-1.18.3.tgz#e265556d4db0340590eeab5341469fb6740251d0" + integrity sha512-lI1OsxNbS/gxRD4548Wyj22Dk8kS7eGMwD9GlBZvQmFV8FJUXoXySL1BiNzDsHUE96/DS/DHmA+F73p1Dkcktg== dependencies: - "@azure/msal-common" "^7.1.0" - jsonwebtoken "^8.5.1" + "@azure/msal-common" "13.3.0" + jsonwebtoken "^9.0.0" uuid "^8.3.0" "@babel/code-frame@^7.10.1": @@ -1402,7 +1407,7 @@ json5@^2.1.2: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -jsonwebtoken@9.0.0, jsonwebtoken@^8.5.1: +jsonwebtoken@9.0.0, jsonwebtoken@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d" integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==