Merge pull request #41 from StuartFerguson/bug/#40_tokenvalidationissue

StuartFerguson · web-flow · commit 4cee70cbf997 · 2021-01-22T12:31:03.000Z
Bug fix for token validation completed
diff --git a/MessagingService.IntegrationTests/Email/SendEmail.feature b/MessagingService.IntegrationTests/Email/SendEmail.feature
@@ -2,6 +2,11 @@
 Feature: SendEmail
 
 Background: 
+	
+	Given I create the following api scopes
+	| Name             | DisplayName          | Description                |
+	| messagingService | Messaging REST Scope | A scope for Messaging REST |
+
 	Given the following api resources exist
 	| ResourceName     | DisplayName    | Secret  | Scopes           | UserClaims |
 	| messagingService | Messaging REST | Secret1 | messagingService |            |
diff --git a/MessagingService.IntegrationTests/Email/SendEmail.feature.cs b/MessagingService.IntegrationTests/Email/SendEmail.feature.cs
diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="ClientProxyBase" Version="1.0.3" />
     <PackageReference Include="Ductus.FluentDocker" Version="2.7.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="SecurityService.Client" Version="1.0.4" />
+    <PackageReference Include="SecurityService.Client" Version="1.0.4.1" />
     <PackageReference Include="Shared.IntegrationTesting" Version="1.0.3" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.14" />
diff --git a/MessagingService.IntegrationTests/SMS/SendSMS.feature b/MessagingService.IntegrationTests/SMS/SendSMS.feature
@@ -2,6 +2,11 @@
 Feature: SendSMS
 
 Background: 
+
+	Given I create the following api scopes
+	| Name             | DisplayName          | Description                |
+	| messagingService | Messaging REST Scope | A scope for Messaging REST |
+
 	Given the following api resources exist
 	| ResourceName     | DisplayName    | Secret  | Scopes           | UserClaims |
 	| messagingService | Messaging REST | Secret1 | messagingService |            |
diff --git a/MessagingService.IntegrationTests/SMS/SendSMS.feature.cs b/MessagingService.IntegrationTests/SMS/SendSMS.feature.cs
diff --git a/MessagingService.IntegrationTests/Shared/SharedSteps.cs b/MessagingService.IntegrationTests/Shared/SharedSteps.cs
@@ -30,6 +30,32 @@ public SharedSteps(ScenarioContext scenarioContext,
             this.TestingContext = testingContext;
         }
 
+        [Given(@"I create the following api scopes")]
+        public async Task GivenICreateTheFollowingApiScopes(Table table)
+        {
+            foreach (TableRow tableRow in table.Rows)
+            {
+                CreateApiScopeRequest createApiScopeRequest = new CreateApiScopeRequest
+                                                              {
+                                                                  Name = SpecflowTableHelper.GetStringRowValue(tableRow, "Name"),
+                                                                  Description = SpecflowTableHelper.GetStringRowValue(tableRow, "Description"),
+                                                                  DisplayName = SpecflowTableHelper.GetStringRowValue(tableRow, "DisplayName")
+                                                              };
+                var createApiScopeResponse =
+                    await this.CreateApiScope(createApiScopeRequest, CancellationToken.None).ConfigureAwait(false);
+
+                createApiScopeResponse.ShouldNotBeNull();
+                createApiScopeResponse.ApiScopeName.ShouldNotBeNullOrEmpty();
+            }
+        }
+
+        private async Task<CreateApiScopeResponse> CreateApiScope(CreateApiScopeRequest createApiScopeRequest,
+                                                                  CancellationToken cancellationToken)
+        {
+            CreateApiScopeResponse createApiScopeResponse = await this.TestingContext.DockerHelper.SecurityServiceClient.CreateApiScope(createApiScopeRequest, cancellationToken).ConfigureAwait(false);
+            return createApiScopeResponse;
+        }
+
         [Given(@"the following api resources exist")]
         public async Task GivenTheFollowingApiResourcesExist(Table table)
         {
diff --git a/MessagingService/MessagingService.csproj b/MessagingService/MessagingService.csproj
@@ -8,11 +8,11 @@
   <ItemGroup>
 	  <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
     <PackageReference Include="AspNetCore.HealthChecks.Uris" Version="5.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
     <PackageReference Include="Shared" Version="1.0.3" />
     <PackageReference Include="Shared.EventStore" Version="1.0.3" />
-    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="4.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
diff --git a/MessagingService/Startup.cs b/MessagingService/Startup.cs
@@ -269,7 +269,7 @@ private void ConfigureMiddlewareServices(IServiceCollection services)
                     options.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters()
                     {
                         ValidateIssuer = true,
-                        ValidateAudience = true,
+                        ValidateAudience = false,
                         ValidAudience = ConfigurationReader.GetValue("SecurityConfiguration", "ApiName"),
                         ValidIssuer = ConfigurationReader.GetValue("SecurityConfiguration", "Authority"),
                     };

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ private void ConfigureMiddlewareServices(IServiceCollection services)`
`269`	`269`	`options.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters()`
`270`	`270`	`{`
`271`	`271`	`ValidateIssuer = true,`
`272`		`- ValidateAudience = true,`
	`272`	`+ ValidateAudience = false,`
`273`	`273`	`ValidAudience = ConfigurationReader.GetValue("SecurityConfiguration", "ApiName"),`
`274`	`274`	`ValidIssuer = ConfigurationReader.GetValue("SecurityConfiguration", "Authority"),`
`275`	`275`	`};`