Updated AzureCloud endpoint; Added support for AzureUSGov & AzureGerm…

…any (Azure#3182)
szimmer-dev · May 12, 2017 · 9985e65 · 9985e65
1 parent 8935f31
commit 9985e65
Showing 1 changed file with 25 additions and 1 deletion.
diff --git a/src/SdkCommon/ClientRuntime.Azure.Authentication/ActiveDirectoryServiceSettings.cs b/src/SdkCommon/ClientRuntime.Azure.Authentication/ActiveDirectoryServiceSettings.cs
@@ -16,7 +16,7 @@ public sealed class ActiveDirectoryServiceSettings
 
         private static readonly ActiveDirectoryServiceSettings AzureSettings = new ActiveDirectoryServiceSettings
         {
-            AuthenticationEndpoint= new Uri("https://login.windows.net/"), 
+            AuthenticationEndpoint= new Uri("https://login.microsoftonline.com/"), 
             TokenAudience = new Uri("https://management.core.windows.net/"),
             ValidateAuthority = true
         };
@@ -28,6 +28,20 @@ public sealed class ActiveDirectoryServiceSettings
             ValidateAuthority = true
         };
 
+        private static readonly ActiveDirectoryServiceSettings AzureUSGovernmentSettings = new ActiveDirectoryServiceSettings
+        {
+            AuthenticationEndpoint = new Uri("https://login.microsoftonline.com/"),
+            TokenAudience = new Uri("https://management.core.usgovcloudapi.net/"),
+            ValidateAuthority = true
+        };
+
+        private static readonly ActiveDirectoryServiceSettings AzureGermanCloudSettings = new ActiveDirectoryServiceSettings
+        {
+            AuthenticationEndpoint = new Uri("https://login.microsoftonline.de/"),
+            TokenAudience = new Uri("https://management.core.cloudapi.de/"),
+            ValidateAuthority = true
+        };
+
         /// <summary>
         /// Gets the serviceSettings for authentication with Azure
         /// </summary>
@@ -38,6 +52,16 @@ public sealed class ActiveDirectoryServiceSettings
         /// </summary>
         public static ActiveDirectoryServiceSettings AzureChina { get { return AzureChinaSettings; } }
 
+        /// <summary>
+        /// Gets the serviceSettings for authentication with Azure US Government
+        /// </summary>
+        public static ActiveDirectoryServiceSettings AzureUSGovernment { get { return AzureUSGovernmentSettings; } }
+
+        /// <summary>
+        /// Gets the serviceSettings for authentication with Azure Germany
+        /// </summary>
+        public static ActiveDirectoryServiceSettings AzureGermany { get { return AzureGermanCloudSettings; } }
+
         /// <summary>
         /// Gets or sets the ActiveDirectory Endpoint for the Azure Environment
         /// </summary>