diff --git a/localization/xliff/enu/constants/localizedConstants.enu.xlf b/localization/xliff/enu/constants/localizedConstants.enu.xlf index b8afeb97f..8a811da63 100644 --- a/localization/xliff/enu/constants/localizedConstants.enu.xlf +++ b/localization/xliff/enu/constants/localizedConstants.enu.xlf @@ -236,9 +236,6 @@ Your client IP address does not have access to the server. Sign in to an Azure account and create a new firewall rule to enable access. - - Your client IP address does not have access to the server. Activate the Azure Account extension and sign in to an Azure account and create a new firewall rule to enable access. - Account signed In. Create new firewall rule? @@ -266,9 +263,6 @@ Download and Install - - Activate - Create Firewall Rule diff --git a/src/views/connectionUI.ts b/src/views/connectionUI.ts index 803b6a1a6..1854abfd2 100644 --- a/src/views/connectionUI.ts +++ b/src/views/connectionUI.ts @@ -507,17 +507,8 @@ export class ConnectionUI { } else { // If the extension exists but not active if (this._vscodeWrapper.azureAccountExtension) { - // Prompt user to activate the extension - let selection = await this._vscodeWrapper.showInformationMessage(LocalizedConstants.msgPromptRetryFirewallRuleNotActivated, - LocalizedConstants.activateLabel); - if (selection === LocalizedConstants.activateLabel) { - let activated = await this._vscodeWrapper.azureAccountExtension.activate(); - if (activated) { - this.showAzureExtensionActivated(); - return this.handleFirewallError(uri, profile, ipAddress); - } - } - return false; + await this._vscodeWrapper.azureAccountExtension.activate(); + return this.handleExtensionActivation(); } else { // Show recommendation to download the azure account extension const selection = await this._vscodeWrapper.showInformationMessage(LocalizedConstants.msgPromptRetryFirewallRuleExtNotInstalled, @@ -528,7 +519,7 @@ export class ConnectionUI { // Activate the Azure Account extension and call the function again if (this._vscodeWrapper.azureAccountExtension) { await this._vscodeWrapper.azureAccountExtension.activate(); - await this.showAzureExtensionActivated(); + await this.handleExtensionActivation(); } }); } @@ -538,7 +529,7 @@ export class ConnectionUI { } /** - * Save a connection profile using the connection store. + * Save a connection profile using the connection store */ private saveProfile(profile: IConnectionProfile): Promise { return this._connectionStore.saveProfile(profile); @@ -582,7 +573,7 @@ export class ConnectionUI { }); } - private async showAzureExtensionActivated(): Promise { + private async handleExtensionActivation(): Promise { if (!this._vscodeWrapper.isAccountSignedIn) { const result = await this._vscodeWrapper.showInformationMessage(LocalizedConstants.msgPromptAzureExtensionActivatedNotSignedIn, LocalizedConstants.signInLabel); @@ -591,7 +582,6 @@ export class ConnectionUI { } return false; } else { - await this._vscodeWrapper.showInformationMessage(LocalizedConstants.msgPromptAzureExtensionActivatedSignedIn); return true; } }