From f8da3cc32a10f4eb9631078121677bd3ab0af396 Mon Sep 17 00:00:00 2001
From: Justin M <63619224+JustinMDotNet@users.noreply.github.com>
Date: Tue, 27 Jul 2021 10:24:15 -0700
Subject: [PATCH] China / Germany Cloud Fix (#15746)

* Added missing resources to chinaAzureSettings and germanyAzureSettings in providerSettings

* Update providerSettings.ts

* Fixed typo in mooncake armResource

* Fixed host for China Cloud in ProviderSettings
---
 .../src/account-provider/providerSettings.ts  | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/extensions/azurecore/src/account-provider/providerSettings.ts b/extensions/azurecore/src/account-provider/providerSettings.ts
index dbec86c0e8..11164cdab7 100644
--- a/extensions/azurecore/src/account-provider/providerSettings.ts
+++ b/extensions/azurecore/src/account-provider/providerSettings.ts
@@ -220,7 +220,12 @@ const germanyAzureSettings: ProviderSettings = {
 				endpoint: 'https://vault.microsoftazure.de',
 				azureResourceId: AzureResource.AzureKeyVault
 			},
-			redirectUri: 'https://vscode-redirect.azurewebsites.net/'
+			redirectUri: 'https://vscode-redirect.azurewebsites.net/',
+			scopes: [
+				'openid', 'email', 'profile', 'offline_access',
+				'https://management.microsoftazure.de/user_impersonation'
+			],
+			portalEndpoint: 'https://portal.microsoftazure.de/'
 		}
 	}
 };
@@ -231,8 +236,13 @@ const chinaAzureSettings: ProviderSettings = {
 		displayName: localize('chinaCloudDisplayName', "Azure (China)"),
 		id: 'azure_chinaCloud',
 		settings: {
-			host: 'https://login.chinacloudapi.cn/',
+			host: 'https://login.partner.microsoftonline.cn/',
 			clientId: 'a69788c6-1d43-44ed-9ca3-b83e194da255',
+			microsoftResource: {
+				id: SettingIds.marm,
+				endpoint: 'https://management.core.chinacloudapi.cn/',
+				azureResourceId: AzureResource.MicrosoftResourceManagement
+			},
 			graphResource: {
 				id: SettingIds.graph,
 				endpoint: 'https://graph.chinacloudapi.cn',
@@ -245,9 +255,14 @@ const chinaAzureSettings: ProviderSettings = {
 			},
 			armResource: {
 				id: SettingIds.arm,
-				endpoint: 'https://managemement.chinacloudapi.net',
+				endpoint: 'https://management.chinacloudapi.cn',
 				azureResourceId: AzureResource.ResourceManagement
 			},
+			sqlResource: {
+				id: SettingIds.sql,
+				endpoint: 'https://database.chinacloudapi.cn/',
+				azureResourceId: AzureResource.Sql
+			},
 			azureKeyVaultResource: {
 				id: SettingIds.vault,
 				endpoint: 'https://vault.azure.cn',
@@ -258,8 +273,12 @@ const chinaAzureSettings: ProviderSettings = {
 				endpoint: 'https://api.loganalytics.azure.cn',
 				azureResourceId: AzureResource.AzureLogAnalytics,
 			},
-			redirectUri: 'https://vscode-redirect.azurewebsites.net/'
-
+			redirectUri: 'https://vscode-redirect.azurewebsites.net/',
+			scopes: [
+				'openid', 'email', 'profile', 'offline_access',
+				'https://management.chinacloudapi.cn/user_impersonation'
+			],
+			portalEndpoint: 'https://portal.azure.cn/'
 		}
 	}
 };