AzCli authentication via @azure/identity (#144)

Azure · Aug 8, 2021 · a4b6805 · a4b6805
1 parent 5034886
commit a4b6805
Show file tree

Hide file tree

Showing 5 changed files with 2,577 additions and 604 deletions.
diff --git a/azure-kusto-data/package-lock.json b/azure-kusto-data/package-lock.json
diff --git a/azure-kusto-data/package.json b/azure-kusto-data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-kusto-data",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Azure Data Explorer Query SDK",
   "main": "index.js",
   "types": "index.d.ts",
@@ -34,7 +34,6 @@
   "homepage": "https://github.com/Azure/azure-kusto-node/blob/master/azure-kusto-data/README.md",
   "dependencies": {
     "@azure/identity": "^1.3.0",
-    "@azure/ms-rest-nodeauth": "^3.0.10",
     "@azure/msal-node": "^1.1.0",
     "@types/mocha": "^8.2.0",
     "@types/node": "^14.14.13",

diff --git a/azure-kusto-data/source/tokenProvider.ts b/azure-kusto-data/source/tokenProvider.ts
@@ -2,8 +2,7 @@
 // Licensed under the MIT License.
 import { AuthenticationResult, PublicClientApplication, ConfidentialClientApplication } from "@azure/msal-node";
 import { DeviceCodeResponse } from "@azure/msal-common";
-import { AzureCliCredentials } from "@azure/ms-rest-nodeauth";
-import { ManagedIdentityCredential } from "@azure/identity";
+import { ManagedIdentityCredential, AzureCliCredential} from "@azure/identity";
 import { CloudSettings, CloudInfo } from "./cloudSettings"
 
 export declare type TokenResponse = {
@@ -93,17 +92,22 @@ export class MsiTokenProvider extends TokenProviderBase {
  * AzCli Token Provider obtains a refresh token from the AzCli cache and uses it to authenticate with MSAL
  */
 export class AzCliTokenProvider extends TokenProviderBase {
-    azureCliCredentials!: AzureCliCredentials;
+    azureCliCredentials!: AzureCliCredential;
 
     constructor(kustoUri: string) {
         super(kustoUri);
     }
 
     async acquireToken(): Promise<TokenResponse> {
         if (this.azureCliCredentials == null) {
-            this.azureCliCredentials = await AzureCliCredentials.create({ resource: this.kustoUri });
+            this.azureCliCredentials = new AzureCliCredential();
         }
-        return this.azureCliCredentials.getToken();
+        const response = await this.azureCliCredentials.getToken(this.scopes);
+
+        if(response){
+            return { tokenType: BEARER_TYPE, accessToken: response.token };
+        }
+        throw new Error(`"Failed to obtain AzCli token for '${this.kustoUri}'`)
     }
 }