Resource urlfix (#10) (#11)

* getAzureAccessToken issue

* change in message

* revert

* gitignore

* name change

.gitignore

@@ -9,6 +9,9 @@
 *.userosscache
 *.sln.docstates
 
+# dependencies
+/node_modules/@types
+
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 

lib/client.js

@@ -1,9 +1,10 @@
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };

lib/login.js

@@ -1,9 +1,10 @@
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -14,7 +15,7 @@ const path = require("path");
 const fs = require("fs");
 const client_1 = require("./client");
 const querystring = require("querystring");
-function getAzureAccessToken(servicePrincipalId, servicePrincipalKey, tenantId, authorityUrl) {
+function getAzureAccessToken(servicePrincipalId, servicePrincipalKey, tenantId, authorityUrl, managementEndpointUrl) {
     if (!servicePrincipalId || !servicePrincipalKey || !tenantId || !authorityUrl) {
         throw new Error("Not all values are present in the creds object. Ensure appId, password and tenant are supplied");
     }
@@ -23,7 +24,7 @@ function getAzureAccessToken(servicePrincipalId, servicePrincipalKey, tenantId,
         webRequest.method = "POST";
         webRequest.uri = `${authorityUrl}/${tenantId}/oauth2/token/`;
         webRequest.body = querystring.stringify({
-            resource: 'https://management.azure.com',
+            resource: managementEndpointUrl,
             client_id: servicePrincipalId,
             grant_type: "client_credentials",
             client_secret: servicePrincipalKey
@@ -88,7 +89,7 @@ function getKubeconfig() {
         let authorityUrl = credsObject["activeDirectoryEndpointUrl"] || "https://login.microsoftonline.com";
         let managementEndpointUrl = credsObject["resourceManagerEndpointUrl"] || "https://management.azure.com/";
         let subscriptionId = credsObject["subscriptionId"];
-        let azureSessionToken = yield getAzureAccessToken(servicePrincipalId, servicePrincipalKey, tenantId, authorityUrl);
+        let azureSessionToken = yield getAzureAccessToken(servicePrincipalId, servicePrincipalKey, tenantId, authorityUrl, managementEndpointUrl);
         let kubeconfig = yield getAKSKubeconfig(azureSessionToken, subscriptionId, managementEndpointUrl);
         return kubeconfig;
     });

src/login.ts

@@ -5,7 +5,7 @@ import * as fs from 'fs';
 import { WebRequest, WebRequestOptions, WebResponse, sendRequest } from "./client";
 import * as querystring from 'querystring';
 
-function getAzureAccessToken(servicePrincipalId, servicePrincipalKey, tenantId, authorityUrl): Promise<string> {
+function getAzureAccessToken(servicePrincipalId, servicePrincipalKey, tenantId, authorityUrl, managementEndpointUrl : string): Promise<string> {
 
     if (!servicePrincipalId || !servicePrincipalKey || !tenantId || !authorityUrl) {
         throw new Error("Not all values are present in the creds object. Ensure appId, password and tenant are supplied");
@@ -15,7 +15,7 @@ function getAzureAccessToken(servicePrincipalId, servicePrincipalKey, tenantId,
         webRequest.method = "POST";
         webRequest.uri = `${authorityUrl}/${tenantId}/oauth2/token/`;
         webRequest.body = querystring.stringify({
-            resource: 'https://management.azure.com',
+            resource: managementEndpointUrl,
             client_id: servicePrincipalId,
             grant_type: "client_credentials",
             client_secret: servicePrincipalKey
@@ -85,7 +85,7 @@ async function getKubeconfig(): Promise<string> {
     let authorityUrl = credsObject["activeDirectoryEndpointUrl"] || "https://login.microsoftonline.com";
     let managementEndpointUrl = credsObject["resourceManagerEndpointUrl"] || "https://management.azure.com/";
     let subscriptionId = credsObject["subscriptionId"];
-    let azureSessionToken = await getAzureAccessToken(servicePrincipalId, servicePrincipalKey, tenantId, authorityUrl);
+    let azureSessionToken = await getAzureAccessToken(servicePrincipalId, servicePrincipalKey, tenantId, authorityUrl, managementEndpointUrl);
     let kubeconfig = await getAKSKubeconfig(azureSessionToken, subscriptionId, managementEndpointUrl);
     return kubeconfig;
 }