From c7bdd8e02b7fa00583df36a9096d8c9fd85db8a8 Mon Sep 17 00:00:00 2001 From: Danish Dua Date: Thu, 11 Apr 2019 10:50:33 -0700 Subject: [PATCH] fixed azure location bug (#388) * fixed azure location bug * removed gulpfile changes from this PR --- .gitignore | 5 ++++- src/extension/src/azure/azure-auth/azureAuth.ts | 7 +++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 15732c5f8..9af30c4d5 100644 --- a/.gitignore +++ b/.gitignore @@ -349,4 +349,7 @@ src/extension/package.nls.*.json .Trashes ehthumbs.db Thumbs.db -.github \ No newline at end of file +.github + +# Temporarily ignoring engine generated link +src/extension/src/api/darwin/CoreTemplateStudio/ \ No newline at end of file diff --git a/src/extension/src/azure/azure-auth/azureAuth.ts b/src/extension/src/azure/azure-auth/azureAuth.ts index 94caab10c..553905a3b 100644 --- a/src/extension/src/azure/azure-auth/azureAuth.ts +++ b/src/extension/src/azure/azure-auth/azureAuth.ts @@ -36,7 +36,6 @@ interface PartialList extends Array { } export abstract class AzureAuth { - private static api: AzureAccount; private static locationsCache: LocationItem[] | undefined; @@ -74,7 +73,7 @@ export abstract class AzureAuth { if (this.api.status === CONSTANTS.AZURE_LOGIN_STATUS.LOGGED_IN) { throw new AuthorizationError(CONSTANTS.ERRORS.LOGOUT_FAILED); } - } + } return true; } public static getEmail(): string { @@ -185,7 +184,7 @@ export abstract class AzureAuth { return Promise.reject(CONSTANTS.ERRORS.SUBSCRIPTION_NOT_DEFINED); } - this.initializeLocations(subscriptionItem); + await this.initializeLocations(subscriptionItem); let azureResourceClient: RMC.ResourceManagementClient = new RMC.ResourceManagementClient( subscriptionItem.session.credentials, subscriptionItem.subscription.subscriptionId! @@ -218,7 +217,7 @@ export abstract class AzureAuth { return Promise.reject(CONSTANTS.ERRORS.SUBSCRIPTION_NOT_DEFINED); } - this.initializeLocations(subscriptionItem); + await this.initializeLocations(subscriptionItem); let azureResourceClient: RMC.ResourceManagementClient = new RMC.ResourceManagementClient( subscriptionItem.session.credentials, subscriptionItem.subscription.subscriptionId!