Bump ads-adal-library (#17108)

* Bump ads-adal-library

* Update package names

package.json

@@ -117,7 +117,7 @@
   },
   "dependencies": {
     "@types/node": "^14.14.16",
-    "ads-adal-library": "1.0.12",
+    "@microsoft/ads-adal-library": "1.0.13",
     "core-js": "^2.4.1",
     "decompress-zip": "^0.2.2",
     "ejs": "^3.1.6",

src/azure/accountService.ts

@@ -10,7 +10,7 @@ import * as Constants from '../constants/constants';
 import { AzureController } from './azureController';
 import { AccountStore } from './accountStore';
 import providerSettings from '../azure/providerSettings';
-import { Tenant } from 'ads-adal-library';
+import { Tenant } from '@microsoft/ads-adal-library';
 
 export class AccountService {
 

src/azure/azureAuthRequest.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as LocalizedConstants from '../constants/localizedConstants';
-import { AuthRequest, AzureAuthError } from 'ads-adal-library';
+import { AuthRequest, AzureAuthError } from '@microsoft/ads-adal-library';
 import { SimpleWebServer } from './simpleWebServer';
 import * as crypto from 'crypto';
 import * as http from 'http';

src/azure/azureController.ts

@@ -14,7 +14,7 @@ import { CredentialStore } from '../credentialstore/credentialstore';
 import { StorageService } from './storageService';
 import * as utils from '../models/utils';
 import { IAccount } from '../models/contracts/azure/accountInterfaces';
-import { AADResource, AzureAuthType, AzureCodeGrant, AzureDeviceCode, Token } from 'ads-adal-library';
+import { AADResource, AzureAuthType, AzureCodeGrant, AzureDeviceCode, Token } from '@microsoft/ads-adal-library';
 import { ConnectionProfile } from '../models/connectionProfile';
 import { AccountStore } from './accountStore';
 import providerSettings from '../azure/providerSettings';

src/azure/azureErrorLookup.ts

@@ -1,5 +1,5 @@
 
-import { ErrorLookup, ErrorCodes, Error1Context } from 'ads-adal-library';
+import { ErrorLookup, ErrorCodes, Error1Context } from '@microsoft/ads-adal-library';
 
 type ErrorMapping = {
     [errorCodes in ErrorCodes]: string;

src/azure/azureLogger.ts

@@ -1,4 +1,4 @@
-import { Logger } from 'ads-adal-library';
+import { Logger } from '@microsoft/ads-adal-library';
 
 export class AzureLogger implements Logger {
     public log(msg: any, ...vals: any[]): void {

src/azure/azureMessageDisplayer.ts

@@ -1,4 +1,4 @@
-import { MessageDisplayer } from 'ads-adal-library';
+import { MessageDisplayer } from '@microsoft/ads-adal-library';
 
 export class AzureMessageDisplayer implements MessageDisplayer {
     async displayInfoMessage(msg: string): Promise<void> {

src/azure/azureStringLookup.ts

@@ -1,4 +1,4 @@
-import { StringLookup, InteractionRequiredContext } from 'ads-adal-library';
+import { StringLookup, InteractionRequiredContext } from '@microsoft/ads-adal-library';
 
 export class AzureStringLookup implements StringLookup {
     getSimpleString: (code: number) => string;

src/azure/azureUserInteraction.ts

@@ -1,4 +1,4 @@
-import { UserInteraction } from 'ads-adal-library';
+import { UserInteraction } from '@microsoft/ads-adal-library';
 import * as vscode from 'vscode';
 
 export class AzureUserInteraction implements UserInteraction {

src/azure/cacheService.ts

@@ -7,7 +7,7 @@ import { join, parse } from 'path';
 import { StorageService } from './storageService';
 import * as crypto from 'crypto';
 import { ICredentialStore } from '../credentialstore/icredentialstore';
-import { CachingProvider } from 'ads-adal-library';
+import { CachingProvider } from '@microsoft/ads-adal-library';
 
 function getSystemKeytar(): Keytar | undefined | null {
     try {

src/azure/providerSettings.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ProviderSettings } from 'ads-adal-library';
+import { ProviderSettings } from '@microsoft/ads-adal-library';
 
 
 const publicAzureSettings: ProviderSettings = {

src/azure/storageService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { promises as fs, constants as fsConstants } from 'fs';
-import { SecureStorageProvider } from 'ads-adal-library';
+import { SecureStorageProvider } from '@microsoft/ads-adal-library';
 
 export type ReadWriteHook = (contents: string) => Promise<string>;
 const noOpHook: ReadWriteHook = async (contents): Promise<string> => {

src/models/connectionProfile.ts

@@ -10,7 +10,7 @@ import { ConnectionCredentials } from './connectionCredentials';
 import { QuestionTypes, IQuestion, IPrompter, INameValueChoice } from '../prompts/question';
 import * as utils from './utils';
 import { ConnectionStore } from './connectionStore';
-import { AzureAuthType } from 'ads-adal-library';
+import { AzureAuthType } from '@microsoft/ads-adal-library';
 import { AzureController } from '../azure/azureController';
 import { AccountStore } from '../azure/accountStore';
 import { IAccount } from './contracts/azure/accountInterfaces';

src/models/interfaces.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AzureAuthType } from 'ads-adal-library';
+import { AzureAuthType } from '@microsoft/ads-adal-library';
 import * as vscode from 'vscode';
 import { AccountStore } from '../azure/accountStore';
 import * as Constants from '../constants/constants';

src/models/utils.ts

@@ -14,7 +14,7 @@ import { IAzureSignInQuickPickItem, IConnectionProfile, AuthenticationTypes } fr
 import { ExtensionContext } from 'vscode';
 import * as LocalizedConstants from '../constants/localizedConstants';
 import * as fs from 'fs';
-import { AzureAuthType } from 'ads-adal-library';
+import { AzureAuthType } from '@microsoft/ads-adal-library';
 import { IConnectionInfo } from 'vscode-mssql';
 
 // CONSTANTS //////////////////////////////////////////////////////////////////////////////////////

test/firewallService.test.ts

@@ -12,7 +12,7 @@ import { HandleFirewallRuleRequest, IHandleFirewallRuleResponse,
 import VscodeWrapper from '../src/controllers/vscodeWrapper';
 import { assert } from 'chai';
 import { IAzureSession, IAzureResourceFilter } from '../src/models/interfaces';
-import { Tenant } from 'ads-adal-library';
+import { Tenant } from '@microsoft/ads-adal-library';
 import { IAccount } from '../src/models/contracts/azure/accountInterfaces';
 
 

yarn.lock

@@ -71,6 +71,14 @@
     normalize-path "^2.0.1"
     through2 "^2.0.3"
 
+"@microsoft/ads-adal-library@1.0.13":
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/@microsoft/ads-adal-library/-/ads-adal-library-1.0.13.tgz#6f10883ad1fb52a00633ef8885fb09af563230fb"
+  integrity sha512-UQtHHrCoo3ENVwrNR0uWeUxO8hw18Ob2D/VJ971LfUP0oqDihAU1/O2GkRQjEazQLK7YmVgIOHxGMglqp5oxZw==
+  dependencies:
+    axios "^0.21.1"
+    qs "^6.9.4"
+
 "@tootallnate/once@1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
@@ -157,14 +165,6 @@ acorn@4.X:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
   integrity sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=
 
-ads-adal-library@1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/ads-adal-library/-/ads-adal-library-1.0.12.tgz#6ff123bb144c68074f16238586802d9703744867"
-  integrity sha512-TymGSzCkTR9ROJ83OgYmSdd0W4tvL9KkO3HRAA7A7IpGtdEBB6TsQItN2D56uStMKDTLEZoadX5vzY4Ula6yaA==
-  dependencies:
-    axios "^0.19.2"
-    qs "^6.9.4"
-
 agent-base@4, agent-base@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
@@ -515,12 +515,12 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
-axios@^0.19.2:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+axios@^0.21.1:
+  version "0.21.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
-    follow-redirects "1.5.10"
+    follow-redirects "^1.14.0"
 
 azure-devops-node-api@^11.0.1:
   version "11.0.1"
@@ -1374,7 +1374,7 @@ debug@2.X, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0, debug@=3.1.0:
+debug@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
@@ -2115,12 +2115,10 @@ fmerge@1.2.0:
   resolved "https://registry.yarnpkg.com/fmerge/-/fmerge-1.2.0.tgz#36e99d2ae255e3ee1af666b4df780553671cf692"
   integrity sha1-NumdKuJV4+4a9ma033gFU2cc9pI=
 
-follow-redirects@1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
+follow-redirects@^1.14.0:
+  version "1.14.5"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381"
+  integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"