Skip to content

Commit f6d6549

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #158 from StuartFerguson/bug/#157_tokenvalidationissue
Bug fix completed for token issues
2 parents ae3839c + cd15473 commit f6d6549

11 files changed

Lines changed: 299 additions & 1178 deletions

File tree

‎EstateManagement.IntegrationTests/Contract/Contract.feature‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Background:
66
| RoleName |
77
| Estate |
88

9+
Given I create the following api scopes
10+
| Name | DisplayName | Description |
11+
| estateManagement | Estate Managememt REST Scope | A scope for Estate Managememt REST |
12+
913
Given the following api resources exist
1014
| ResourceName | DisplayName | Secret | Scopes | UserClaims |
1115
| estateManagement | Estate Managememt REST | Secret1 | estateManagement | MerchantId, EstateId, role |

‎EstateManagement.IntegrationTests/Contract/Contract.feature.cs‎

Lines changed: 3 additions & 927 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EstateManagement.IntegrationTests/Estate/Estate.feature‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Background:
66
| RoleName |
77
| Estate |
88

9+
Given I create the following api scopes
10+
| Name | DisplayName | Description |
11+
| estateManagement | Estate Managememt REST Scope | A scope for Estate Managememt REST |
12+
913
Given the following api resources exist
1014
| ResourceName | DisplayName | Secret | Scopes | UserClaims |
1115
| estateManagement | Estate Managememt REST | Secret1 | estateManagement | MerchantId, EstateId, role |

‎EstateManagement.IntegrationTests/Estate/Estate.feature.cs‎

Lines changed: 123 additions & 112 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EstateManagement.IntegrationTests/EstateManagement.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
1616
<PackageReference Include="NLog" Version="4.7.6" />
1717
<PackageReference Include="NLog.Extensions.Logging" Version="1.7.0" />
18-
<PackageReference Include="SecurityService.Client" Version="1.0.4" />
18+
<PackageReference Include="SecurityService.Client" Version="1.0.4.1" />
1919
<PackageReference Include="Shared" Version="1.0.3" />
2020
<PackageReference Include="Shared.IntegrationTesting" Version="1.0.3" />
2121
<PackageReference Include="Shouldly" Version="4.0.3" />

‎EstateManagement.IntegrationTests/Merchant/Merchant.feature‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Background:
88
| Estate |
99
| Merchant |
1010

11+
Given I create the following api scopes
12+
| Name | DisplayName | Description |
13+
| estateManagement | Estate Managememt REST Scope | A scope for Estate Managememt REST |
14+
1115
Given the following api resources exist
1216
| ResourceName | DisplayName | Secret | Scopes | UserClaims |
1317
| estateManagement | Estate Managememt REST | Secret1 | estateManagement | MerchantId, EstateId, role |

‎EstateManagement.IntegrationTests/Merchant/Merchant.feature.cs‎

Lines changed: 134 additions & 134 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EstateManagement.IntegrationTests/Shared/SharedSteps.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,31 @@ public async Task ThenTheMerchantBalancesAreAsFollows(Table table)
362362
}
363363
}
364364

365+
[Given(@"I create the following api scopes")]
366+
public async Task GivenICreateTheFollowingApiScopes(Table table)
367+
{
368+
foreach (TableRow tableRow in table.Rows)
369+
{
370+
CreateApiScopeRequest createApiScopeRequest = new CreateApiScopeRequest
371+
{
372+
Name = SpecflowTableHelper.GetStringRowValue(tableRow, "Name"),
373+
Description = SpecflowTableHelper.GetStringRowValue(tableRow, "Description"),
374+
DisplayName = SpecflowTableHelper.GetStringRowValue(tableRow, "DisplayName")
375+
};
376+
var createApiScopeResponse =
377+
await this.CreateApiScope(createApiScopeRequest, CancellationToken.None).ConfigureAwait(false);
365378

379+
createApiScopeResponse.ShouldNotBeNull();
380+
createApiScopeResponse.ApiScopeName.ShouldNotBeNullOrEmpty();
381+
}
382+
}
383+
384+
private async Task<CreateApiScopeResponse> CreateApiScope(CreateApiScopeRequest createApiScopeRequest,
385+
CancellationToken cancellationToken)
386+
{
387+
CreateApiScopeResponse createApiScopeResponse = await this.TestingContext.DockerHelper.SecurityServiceClient.CreateApiScope(createApiScopeRequest, cancellationToken).ConfigureAwait(false);
388+
return createApiScopeResponse;
389+
}
366390

367391
[Given(@"the following api resources exist")]
368392
public async Task GivenTheFollowingApiResourcesExist(Table table)

‎EstateManagement/Common/ClaimsHelper.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Diagnostics.CodeAnalysis;
55
using System.Linq;
66
using System.Security.Claims;
7-
using IdentityModel;
87
using Microsoft.CodeAnalysis.CSharp.Syntax;
98
using Shared.Exceptions;
109

‎EstateManagement/EstateManagement.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
1212
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="5.0.1" />
1313
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="5.0.1" />
14-
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
14+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.2" />
1515
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
1616
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
1717
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.2.0" />

0 commit comments

Comments
 (0)