minor fixes w/variable names & xml doc updates (#540)

AzureAD · Sep 3, 2020 · 56a8ee3 · 56a8ee3
1 parent 90eeda7
commit 56a8ee3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/tests/IntegrationTests/IntegrationTestService/Controllers/WeatherForecastController.cs b/tests/IntegrationTests/IntegrationTestService/Controllers/WeatherForecastController.cs
@@ -10,6 +10,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Identity.Web;
 using Microsoft.Identity.Web.Resource;
+using Microsoft.Identity.Web.Test.Common;
 
 namespace IntegrationTestService.Controllers
 {
@@ -33,7 +34,7 @@ public async Task<string> GetAsync()
         {
             HttpContext.VerifyUserHasAnyAcceptedScope(scopeRequiredByApi);
             return await _tokenAcquisition.GetAccessTokenForUserAsync(
-                new string[] { "User.Read" }).ConfigureAwait(false);
+                TestConstants.s_userReadScope).ConfigureAwait(false);
         }
     }
 }
diff --git a/tests/Microsoft.Identity.Web.Test.Common/TestConstants.cs b/tests/Microsoft.Identity.Web.Test.Common/TestConstants.cs
@@ -84,7 +84,7 @@ public static class TestConstants
 
         public static readonly string s_scopeForApp = "https://graph.microsoft.com/.default";
 
-        public static readonly IEnumerable<string> s_scopesForUser = new[]
+        public static readonly IEnumerable<string> s_userReadScope = new[]
         {
             "user.read",
         };
@@ -101,6 +101,7 @@ public static class TestConstants
         public const string ConfidentialClientLabTenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
         public const string OBOUser = "[email protected]";
         public const string OBOClientSideClientId = "c0485386-1e9a-4663-bc96-7ab30656de7f";
+        public static string[] OBOApiScope = new string[] { "api://f4aa5217-e87c-42b2-82af-5624dd14ee72/.default" };
 
         // This value is only for testing purposes. It is for a certificate that is not used for anything other than running tests
         public const string CertificateX5c = @"MIIDHzCCAgegAwIBAgIQM6NFYNBJ9rdOiK+C91ZzFDANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDExVBQ1MyQ2xpZW50Q2VydGlmaWNhdGUwHhcNMTIwNTIyMj

diff --git a/tests/Microsoft.Identity.Web.Test.Integration/AcquireTokenForAppIntegrationTests.cs b/tests/Microsoft.Identity.Web.Test.Integration/AcquireTokenForAppIntegrationTests.cs
@@ -96,7 +96,7 @@ public async Task GetAccessTokenForApp_WithUserScope_MsalServiceExceptionThrownA
 
             // Act & Assert
             async Task result() =>
-                await _tokenAcquisition.GetAccessTokenForAppAsync(TestConstants.s_scopesForUser.FirstOrDefault()).ConfigureAwait(false);
+                await _tokenAcquisition.GetAccessTokenForAppAsync(TestConstants.s_userReadScope.FirstOrDefault()).ConfigureAwait(false);
 
             ArgumentException ex = await Assert.ThrowsAsync<ArgumentException>(result).ConfigureAwait(false);
 

diff --git a/tests/Microsoft.Identity.Web.Test.Integration/AcquireTokenForUserIntegrationTests.cs b/tests/Microsoft.Identity.Web.Test.Integration/AcquireTokenForUserIntegrationTests.cs
@@ -19,13 +19,13 @@ namespace Microsoft.Identity.Web.Test.Integration
 #if !FROM_GITHUB_ACTION
     public class AcquireTokenForUserIntegrationTests : IClassFixture<WebApplicationFactory<IntegrationTestService.Startup>>
     {
-        private readonly WebApplicationFactory<IntegrationTestService.Startup> _factory;
-
         public AcquireTokenForUserIntegrationTests(WebApplicationFactory<IntegrationTestService.Startup> factory)
         {
             _factory = factory;
         }
 
+        private readonly WebApplicationFactory<IntegrationTestService.Startup> _factory;
+
         [Fact]
         public async Task GetTokenForUserAsync()
         {
@@ -75,7 +75,7 @@ private static async Task<AuthenticationResult> AcquireTokenForLabUserAsync()
 
             AuthenticationResult authResult = await msalPublicClient
                 .AcquireTokenByUsernamePassword(
-                new string[] { "api://f4aa5217-e87c-42b2-82af-5624dd14ee72/.default" },
+                TestConstants.OBOApiScope,
                 TestConstants.OBOUser,
                 new NetworkCredential(
                     TestConstants.OBOUser,