Minor tweaks/fixups

- Added line to CHANGELOG describing update
- Removed audience/scope values from AuthConstants as they are no longer
  used. Modified tests accordingly.

Author: wired010

BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Authentication/ReflectionCredentialEnvelopeTests.cs

@@ -29,6 +29,8 @@ namespace Microsoft.ApplicationInsights.TestFramework.Extensibility.Implementati
     [TestCategory("AAD")]
     public class ReflectionCredentialEnvelopeTests
     {
+        private readonly string[] defaultScope = new string[] { "https://monitor.azure.com/.default" };
+
         [TestMethod]
         public void VerifyCanIdentifyValidClass()
         {
@@ -130,7 +132,7 @@ public async Task VerifyGetTokenAsync_UsingDynamicTypes()
         [TestMethod]
         public void VerifyGetToken_ReturnsValidToken()
         {
-            var requestContext = new TokenRequestContext(scopes: AuthConstants.GetScopes());
+            var requestContext = new TokenRequestContext(scopes: defaultScope);
             var mockCredential = new MockCredential();
             var tokenFromCredential = mockCredential.GetToken(requestContext, CancellationToken.None);
 
@@ -147,7 +149,7 @@ public void VerifyGetToken_ReturnsValidToken()
         [TestMethod]
         public async Task VerifyGetTokenAsync_ReturnsValidToken()
         {
-            var requestContext = new TokenRequestContext(scopes: AuthConstants.GetScopes());
+            var requestContext = new TokenRequestContext(scopes: defaultScope);
             var mockCredential = new MockCredential();
             var tokenFromCredential = await mockCredential.GetTokenAsync(requestContext, CancellationToken.None);
 

BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Authentication/AuthConstants.cs

@@ -5,18 +5,5 @@ internal static class AuthConstants
         public const string AuthorizationHeaderName = "Authorization";
 
         public const string AuthorizationTokenPrefix = "Bearer ";
-
-        /// <summary>
-        /// Source: 
-        /// (https://docs.microsoft.com/azure/active-directory/develop/msal-acquire-cache-tokens#scopes-when-acquiring-tokens).
-        /// (https://docs.microsoft.com/azure/active-directory/develop/v2-permissions-and-consent#the-default-scope).
-        /// </summary>
-        private const string AzureMonitorScope = "https://monitor.azure.com//.default";
-
-        /// <summary>
-        /// Get scopes for Azure Monitor as an array.
-        /// </summary>
-        /// <returns>An array of scopes.</returns>
-        public static string[] GetScopes() => new string[] { AzureMonitorScope };
     }
 }

BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Authentication/ReflectionCredentialEnvelope.cs

@@ -82,20 +82,13 @@ internal string[] Scopes
         {
             get
             {
-                if (string.IsNullOrEmpty(this.Audience))
+                var normalizedScope = this.Audience;
+                if (!normalizedScope.EndsWith(".default"))
                 {
-                    return new string[] { "https://monitor.azure.com/.default" };
+                    normalizedScope += ".default";
                 }
-                else
-                {
-                    var normalizedScope = this.Audience;
-                    if (!normalizedScope.EndsWith("/.default"))
-                    {
-                        normalizedScope += ".default";
-                    }
 
-                    return new string[] { normalizedScope };
-                }
+                return new string[] { normalizedScope };
             }
         }
 

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## VNext
+- Parse AADAudience from ConnectionString to build scope for token requests
 
 ## Version 2.23.0
 - no changes since beta.