Final Changes related to negative tests

microsoft · Jan 4, 2019 · b5e9276 · b5e9276
1 parent 7b101d3
commit b5e9276
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/Microsoft.Health.Fhir.Web/DevelopmentIdentityProviderRegistrationExtensions.cs b/src/Microsoft.Health.Fhir.Web/DevelopmentIdentityProviderRegistrationExtensions.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Health.Fhir.Web
 {
     public static class DevelopmentIdentityProviderRegistrationExtensions
     {
-        private const string WRONGAUDIENCECLIENT = "wrongaudienceclient";
+        private const string WrongAudienceClient = "wrongaudienceclient";
 
         /// <summary>
         /// Adds an in-process identity provider if enabled in configuration.
@@ -56,7 +56,7 @@ public static IServiceCollection AddDevelopmentIdentityProvider(this IServiceCol
                             UserClaims = { authorizationConfiguration.RolesClaim },
                         },
                         new ApiResource(
-                        WRONGAUDIENCECLIENT,
+                        WrongAudienceClient,
                         claimTypes: new List<string>() { authorizationConfiguration.RolesClaim, ClaimTypes.Name, ClaimTypes.NameIdentifier })
                         {
                             UserClaims = { authorizationConfiguration.RolesClaim },
@@ -85,7 +85,7 @@ public static IServiceCollection AddDevelopmentIdentityProvider(this IServiceCol
                                     ClientSecrets = { new Secret(applicationConfiguration.Id.Sha256()) },
 
                                     // scopes that client has access to
-                                    AllowedScopes = { DevelopmentIdentityProviderConfiguration.Audience, "wrongaudienceclient" },
+                                    AllowedScopes = { DevelopmentIdentityProviderConfiguration.Audience, WrongAudienceClient },
 
                                     // app roles that the client app may have
                                     Claims = applicationConfiguration.Roles.Select(r => new Claim(authorizationConfiguration.RolesClaim, r)).Concat(new[] { new Claim("appid", applicationConfiguration.Id) }).ToList(),

diff --git a/test/Microsoft.Health.Fhir.Tests.E2E/Common/FhirClient.cs b/test/Microsoft.Health.Fhir.Tests.E2E/Common/FhirClient.cs
@@ -288,23 +288,20 @@ private async Task SetupAuthenticationAsync(TestApplication clientApplication, T
 
         private async Task<string> GetBearerToken(TestApplication clientApplication, TestUser user)
         {
+            if (clientApplication.Equals(TestApplications.InvalidClient))
+            {
+                return null;
+            }
+
             var formContent = new FormUrlEncodedContent(user == null ? GetAppSecuritySettings(clientApplication) : GetUserSecuritySettings(clientApplication, user));
 
             HttpResponseMessage tokenResponse = await HttpClient.PostAsync(SecuritySettings.TokenUrl, formContent);
 
             var tokenJson = JObject.Parse(await tokenResponse.Content.ReadAsStringAsync());
 
-            if (clientApplication.Equals(TestApplications.InvalidClient))
-            {
-                return null;
-            }
-
-            if (tokenJson["access_token"] != null)
-            {
-                return tokenJson["access_token"].Value<string>();
-            }
+            var bearerToken = tokenJson["access_token"].Value<string>();
 
-            return null;
+            return bearerToken;
         }
 
         private List<KeyValuePair<string, string>> GetAppSecuritySettings(TestApplication clientApplication)