Merge pull request #117 from gapreste/add-analysisservices-environment-extension-case

Add token audience endpoints for analysis services environments.

Author: markcowl

src/Authentication.Abstractions/AzureEnvironment.cs

@@ -54,6 +54,7 @@ static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironments()
             azureCloud.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, AzureEnvironmentConstants.AzureOperationalInsightsEndpoint);
             azureCloud.SetProperty(ExtendedEndpoint.OperationalInsightsEndpointResourceId, AzureEnvironmentConstants.AzureOperationalInsightsEndpointResourceId);
             azureCloud.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointSuffix, AzureEnvironmentConstants.AzureAnalysisServicesEndpointSuffix);
+            azureCloud.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointResourceId, AzureEnvironmentConstants.AzureAnalysisServicesEndpointResourceId);
             var azureChina = new AzureEnvironment
             {
                 Name = EnvironmentName.AzureChinaCloud,
@@ -78,6 +79,7 @@ static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironments()
                 AdTenant = "Common"
             };
             azureChina.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointSuffix, AzureEnvironmentConstants.ChinaAnalysisServicesEndpointSuffix);
+            azureChina.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointResourceId, AzureEnvironmentConstants.ChinaAnalysisServicesEndpointResourceId);
 
             var azureUSGovernment = new AzureEnvironment
             {
@@ -105,6 +107,7 @@ static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironments()
             azureUSGovernment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, AzureEnvironmentConstants.USGovernmentOperationalInsightsEndpoint);
             azureUSGovernment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpointResourceId, AzureEnvironmentConstants.USGovernmentOperationalInsightsEndpointResourceId);
             azureUSGovernment.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointSuffix, AzureEnvironmentConstants.USGovernmentAnalysisServicesEndpointSuffix);
+            azureUSGovernment.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointResourceId, AzureEnvironmentConstants.USGovernmentAnalysisServicesEndpointResourceId);
             var azureGermany = new AzureEnvironment
             {
                 Name = EnvironmentName.AzureGermanCloud,
@@ -129,6 +132,7 @@ static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironments()
                 AdTenant = "Common"
             };
             azureGermany.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointSuffix, AzureEnvironmentConstants.GermanAnalysisServicesEndpointSuffix);
+            azureGermany.SetProperty(ExtendedEndpoint.AnalysisServicesEndpointResourceId, AzureEnvironmentConstants.GermanAnalysisServicesEndpointResourceId);
             var result = new ConcurrentDictionary<string, AzureEnvironment>(StringComparer.InvariantCultureIgnoreCase);
 
             result[EnvironmentName.AzureCloud] = azureCloud;
@@ -302,7 +306,8 @@ public static class ExtendedEndpoint
         {
             public const string OperationalInsightsEndpointResourceId = "OperationalInsightsEndpointResourceId",
                 OperationalInsightsEndpoint = "OperationalInsightsEndpoint",
-                AnalysisServicesEndpointSuffix = "AzureAnalysisServicesEndpointSuffix";
+                AnalysisServicesEndpointSuffix = "AzureAnalysisServicesEndpointSuffix",
+                AnalysisServicesEndpointResourceId = "AnalysisServicesEndpointResourceId";
         }
     }
 }

src/Authentication.Abstractions/AzureEnvironmentConstants.cs

@@ -158,5 +158,18 @@ public static class AzureEnvironmentConstants
         public const string ChinaAnalysisServicesEndpointSuffix = "asazure.chinacloudapi.cn";
         public const string USGovernmentAnalysisServicesEndpointSuffix = "asazure.usgovcloudapi.net";
         public const string GermanAnalysisServicesEndpointSuffix = "asazure.cloudapi.de";
+
+        /// <summary>
+        /// The token audiences for authorizing Analysis Service requests
+        /// </summary>
+        /// <remarks>
+        /// Analysis Service expects a token audience which matches "https://*.asazure.windows.net".
+        /// The wildcard takes place of the region, however the region cannot be calculated here.
+        /// "region" can take place of the region, since "*" is an invalid character for URIs.
+        /// </remarks>
+        public const string AzureAnalysisServicesEndpointResourceId = "https://region.asazure.windows.net";
+        public const string ChinaAnalysisServicesEndpointResourceId = "https://region.asazure.chinacloudapi.cn";
+        public const string USGovernmentAnalysisServicesEndpointResourceId = "https://region.asazure.usgovcloudapi.net";
+        public const string GermanAnalysisServicesEndpointResourceId = "https://region.asazure.cloudapi.de";
     }
 }

src/Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs

@@ -274,7 +274,9 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
                     case AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointSuffix:
                         environment.SetProperty(AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointSuffix, propertyValue);
                         break;
-
+                    case AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId:
+                        environment.SetProperty(AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId, propertyValue);
+                        break;
                 }
             }
         }
@@ -306,6 +308,10 @@ public static string GetTokenAudience(this IAzureEnvironment environment, string
                 case AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId:
                     resource = AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId;
                     break;
+                case AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointSuffix:
+                case AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId:
+                    resource = AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId;
+                    break;
                 default:
                     resource = AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId;
                     break;

src/Authentication.ResourceManager/Models/PSAzureEnvironment.cs

@@ -276,6 +276,21 @@ public string AzureAnalysisServicesEndpointSuffix
             }
         }
 
+        /// <summary>
+        /// Gets or sets the resource Id to use for contacting the analysis services endpoint
+        /// </summary>
+        public string AnalysisServicesEndpointResourceId
+        {
+            get
+            {
+                return this.GetEndpointSuffix(AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId);
+            }
+            set
+            {
+                this.SetEndpoint(AzureEnvironment.ExtendedEndpoint.AnalysisServicesEndpointResourceId, value);
+            }
+        }
+
         public IList<string> VersionProfiles { get; } = new List<string>();
 
         public IDictionary<string, string> ExtendedProperties { get; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);