Skip to content

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@mshakirdfe
mshakirdfe committed Dec 19, 2024
1 parent 03d83d4 commit fd30ad0
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion ConcernsCaseWork/ConcernsCaseWork.API.Tests/ConcernsCaseWork.API.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NBuilder" Version="6.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 1 addition & 1 deletion ConcernsCaseWork/ConcernsCaseWork.API/ConcernsCaseWork.API.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<PackageReference Include="FluentValidation" Version="11.11.0" />
<PackageReference Include="MediatR" Version="12.4.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.1.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.8" />
Expand Down
1 change: 1 addition & 0 deletions ConcernsCaseWork/ConcernsCaseWork.API/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IApiVers
}

app.UseMiddleware<ExceptionHandlerMiddleware>();
app.UseMiddleware<ExceptionHandlerMiddleware>();
app.UseMiddleware<UrlDecoderMiddleware>();
app.UseMiddleware<CorrelationIdMiddleware>();
app.UseMiddleware<UserContextReceiverMiddleware>();
Expand Down
4 changes: 2 additions & 2 deletions ConcernsCaseWork/ConcernsCaseWork.Data/ConcernsCaseWork.Data.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ConcernsCaseWork/ConcernsCaseWork.Redis/ConcernsCaseWork.Redis.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackageReference Include="Ardalis.GuardClauses" Version="5.0.0" />
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.11" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ConcernsCaseWork/ConcernsCaseWork.Service.Tests/Trusts/TrustServiceTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ public async Task WhenGetTrustsByPagination_MatchesFakeTrust_ReturnsFakeTrust()
{
var trustInfo = new TrustSearchResponseDto()
{
Trusts = new List<TrustSearchDto>()
{
new TrustSearchDto()
Trusts =
[
new()
{
UkPrn = "123"
}
}
]
};

var fakeTrustService = new Mock<IFakeTrustService>();
Expand Down
1 change: 1 addition & 0 deletions ConcernsCaseWork/ConcernsCaseWork.Service/CaseActions/SRMAProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using ConcernsCaseWork.Logging;
using ConcernsCaseWork.Service.Base;
using ConcernsCaseWork.UserContext;
using DfE.CoreLibs.Security.Interfaces;
using Microsoft.Extensions.Logging;
using DfE.CoreLibs.Security.Interfaces;
using Newtonsoft.Json;
Expand Down
2 changes: 1 addition & 1 deletion ConcernsCaseWork/ConcernsCaseWork.Tests/ConcernsCaseWork.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageReference Include="DfE.CoreLibs.Testing" Version="1.1.12" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="NUnit" Version="4.2.2" />
Expand Down
2 changes: 1 addition & 1 deletion ConcernsCaseWork/ConcernsCaseWork.Tests/ExpectedSecurityConfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
"ExpectedSecurity": "AllowAnonymous"
}
]
}
}
11 changes: 7 additions & 4 deletions ConcernsCaseWork/ConcernsCaseWork.Tests/Security/PageSecurityTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
using DfE.CoreLibs.Testing.Authorization;
using Microsoft.AspNetCore.Routing;
using DfE.CoreLibs.Testing.Authorization.Helpers;
using DfE.CoreLibs.Testing.Authorization;
using DfE.CoreLibs.Testing.Mocks.WebApplicationFactory;
using Microsoft.AspNetCore.Routing;
using NUnit.Framework;
using System;
using NUnit.Framework;
using System.Collections.Generic;
Expand Down Expand Up @@ -44,8 +47,8 @@ private static IEnumerable<RouteEndpoint> InitializeEndpoints()

var endpoints = endpointDataSource.Endpoints
.OfType<RouteEndpoint>()
.DistinctBy(x=> x.DisplayName)
.Where(x => !x.RoutePattern.RawText.Contains("MicrosoftIdentity") &&
.DistinctBy(x => x.DisplayName)
.Where(x => !x.RoutePattern.RawText.Contains("MicrosoftIdentity") &&
!x.DisplayName.Contains("ConcernsCaseWork.API.Features") &&
!x.RoutePattern.RawText.Equals("/") &&
!x.Metadata.Any(m => m is RouteNameMetadata && ((RouteNameMetadata)m).RouteName == "default"));
Expand Down
4 changes: 2 additions & 2 deletions ConcernsCaseWork/ConcernsCaseWork/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.FeatureManagement;
using Microsoft.Identity.Web;
using System;
Expand Down Expand Up @@ -163,7 +164,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IApiVers
app.UseExceptionHandler("/Error");
}

app.UseMiddleware<ExceptionHandlerMiddleware>();
app.UseMiddleware<ExceptionHandlerMiddleware>();

// Security headers
app.UseSecurityHeaders(
Expand Down Expand Up @@ -194,7 +195,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IApiVers

app.UseEndpoints(endpoints =>
{
endpoints.MapRazorPages();
endpoints.MapControllers().RequireAuthorization(new AuthorizeAttribute
{
AuthenticationSchemes = _authenticationScheme,
Expand Down
3 changes: 1 addition & 2 deletions ConcernsCaseWork/ConcernsCaseWork/appsettings.Development.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
{
"Name": "CanDelete",
"Operator": "AND",
"Roles": [ "concerns-casework.case-delete-group" ],
"Scopes": [ "RECAST.API.Delete" ]
"Roles": [ "concerns-casework.case-delete-group" ]
}
]
}
1 change: 0 additions & 1 deletion ConcernsCaseWork/ConcernsCaseWork/appsettings.Staging.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{

"Logging": {
"LogLevel": {
"Default": "Error",
Expand Down

0 comments on commit fd30ad0

Please sign in to comment.