feat(): update adminUI

buitanlan · Feb 8, 2024 · 5207a7a · 5207a7a
1 parent 081c586
commit 5207a7a
Show file tree

Hide file tree

Showing 31 changed files with 1,803 additions and 156 deletions.
diff --git a/src/Services/Examination/Examination.API/Examination.API.csproj b/src/Services/Examination/Examination.API/Examination.API.csproj
@@ -11,18 +11,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="7.0.0" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI" Version="7.0.2" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="7.1.0" />
-        <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="7.0.0" />
-        <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+        <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="8.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.0" />
+        <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.0" />
+        <PackageReference Include="AutoMapper" Version="13.0.1" />
         <PackageReference Include="MediatR" Version="12.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
-        <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
-        <PackageReference Include="MongoDB.Driver" Version="2.22.0" />
-        <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+        <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+        <PackageReference Include="MongoDB.Driver" Version="2.23.1" />
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
         <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
         <PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />

diff --git a/src/Services/Examination/Examination.API/Program.cs b/src/Services/Examination/Examination.API/Program.cs
@@ -37,7 +37,7 @@
 
 builder.Services.AddSingleton<IMongoClient>(_ => new MongoClient(mongodbConnectionString));
 builder.Services.AddScoped(c => c.GetService<IMongoClient>()?.StartSession());
-builder.Services.AddAutoMapper(cfg => { cfg.AddProfile(new MappingProfile()); });
+builder.Services.AddAutoMapper(typeof(MappingProfile));
 builder.Services.AddMediatR(cfg=> cfg.RegisterServicesFromAssemblies(typeof(StartExamCommandHandler).Assembly));
 builder.Services.AddHttpContextAccessor();
 builder.Services.AddSwaggerGen(c =>

diff --git a/src/Services/Examination/Examination.Application/Examination.Application.csproj b/src/Services/Examination/Examination.Application/Examination.Application.csproj
@@ -12,9 +12,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AutoMapper" Version="12.0.1" />
-        <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-        <PackageReference Include="MongoDB.Driver" Version="2.22.0" />
+        <PackageReference Include="AutoMapper" Version="13.0.1" />
+        <PackageReference Include="MongoDB.Driver" Version="2.23.1" />
         <PackageReference Include="Serilog" Version="3.1.1" />
     </ItemGroup>
 

diff --git a/src/Services/Examination/Examination.Domain/Examination.Domain.csproj b/src/Services/Examination/Examination.Domain/Examination.Domain.csproj
@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MediatR" Version="12.1.1" />
-        <PackageReference Include="MongoDB.Bson" Version="2.22.0" />
+        <PackageReference Include="MediatR" Version="12.2.0" />
+        <PackageReference Include="MongoDB.Bson" Version="2.23.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Services/Examination/Examination.Infrastructure/Examination.Infrastructure.csproj b/src/Services/Examination/Examination.Infrastructure/Examination.Infrastructure.csproj
@@ -8,9 +8,9 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
-        <PackageReference Include="MongoDB.Driver" Version="2.22.0" />
-        <PackageReference Include="Polly" Version="8.2.0" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
+        <PackageReference Include="MongoDB.Driver" Version="2.23.1" />
+        <PackageReference Include="Polly" Version="8.3.0" />
         <PackageReference Include="Serilog" Version="3.1.1" />
     </ItemGroup>
 

diff --git a/src/Services/Identity/IdentityServer.API/IdentityServer.API.csproj b/src/Services/Identity/IdentityServer.API/IdentityServer.API.csproj
@@ -8,24 +8,24 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="7.1.0" />
-      <PackageReference Include="AspNetCore.HealthChecks.UI" Version="7.0.2" />
-      <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="7.1.0" />
-      <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="7.0.0" />
-      <PackageReference Include="Duende.IdentityServer" Version="7.0.0-preview.2" />
-      <PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.0.0-preview.2" />
-      <PackageReference Include="Duende.IdentityServer.EntityFramework" Version="7.0.0-preview.2" />
-      <PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="7.0.0-preview.2" />
-      <PackageReference Include="Duende.IdentityServer.Storage" Version="7.0.0-preview.2" />
-      <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
+      <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.0" />
+      <PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.0" />
+      <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.0" />
+      <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="8.0.0" />
+      <PackageReference Include="Duende.IdentityServer" Version="7.0.0" />
+      <PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.0.0" />
+      <PackageReference Include="Duende.IdentityServer.EntityFramework" Version="7.0.0" />
+      <PackageReference Include="Duende.IdentityServer.EntityFramework.Storage" Version="7.0.0" />
+      <PackageReference Include="Duende.IdentityServer.Storage" Version="7.0.0" />
+      <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
       <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
-      <PackageReference Include="Polly" Version="8.2.0" />
-      <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+      <PackageReference Include="Polly" Version="8.3.0" />
+      <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
       <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
       <PackageReference Include="Serilog.Sinks.Postgresql.Alternative" Version="4.0.2" />
       <PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />

diff --git a/src/Services/Identity/IdentityServer.API/Pages/SecurityHeadersAttribute.cs b/src/Services/Identity/IdentityServer.API/Pages/SecurityHeadersAttribute.cs
@@ -17,13 +17,13 @@ public override void OnResultExecuting(ResultExecutingContext context)
             // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options
             if (!context.HttpContext.Response.Headers.ContainsKey("X-Content-Type-Options"))
             {
-                context.HttpContext.Response.Headers.Add("X-Content-Type-Options", "nosniff");
+                context.HttpContext.Response.Headers.Append("X-Content-Type-Options", "nosniff");
             }
 
             // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
             if (!context.HttpContext.Response.Headers.ContainsKey("X-Frame-Options"))
             {
-                context.HttpContext.Response.Headers.Add("X-Frame-Options", "SAMEORIGIN");
+                context.HttpContext.Response.Headers.Append("X-Frame-Options", "SAMEORIGIN");
             }
 
             // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
@@ -36,20 +36,20 @@ public override void OnResultExecuting(ResultExecutingContext context)
             // once for standards compliant browsers
             if (!context.HttpContext.Response.Headers.ContainsKey("Content-Security-Policy"))
             {
-                context.HttpContext.Response.Headers.Add("Content-Security-Policy", csp);
+                context.HttpContext.Response.Headers.Append("Content-Security-Policy", csp);
             }
             // and once again for IE
             if (!context.HttpContext.Response.Headers.ContainsKey("X-Content-Security-Policy"))
             {
-                context.HttpContext.Response.Headers.Add("X-Content-Security-Policy", csp);
+                context.HttpContext.Response.Headers.Append("X-Content-Security-Policy", csp);
             }
 
             // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy
             var referrer_policy = "no-referrer";
             if (!context.HttpContext.Response.Headers.ContainsKey("Referrer-Policy"))
             {
-                context.HttpContext.Response.Headers.Add("Referrer-Policy", referrer_policy);
+                context.HttpContext.Response.Headers.Append("Referrer-Policy", referrer_policy);
             }
         }
     }
-}
+}
diff --git a/src/Services/Identity/IdentityServer.Admin.Api/Dockerfile b/src/Services/Identity/IdentityServer.Admin.Api/Dockerfile
@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY ["src/IdentityServer.Admin.Api/IdentityServer.Admin.Api.csproj", "src/IdentityServer.Admin.Api/"]
 COPY ["src/IdentityServer.Admin.EntityFramework.Shared/IdentityServer.Admin.EntityFramework.Shared.csproj", "src/IdentityServer.Admin.EntityFramework.Shared/"]
@@ -21,4 +21,4 @@ FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
 ENV ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
-ENTRYPOINT ["dotnet", "IdentityServer.Admin.Api.dll"]
+ENTRYPOINT ["dotnet", "IdentityServer.Admin.Api.dll"]
diff --git a/src/Services/Identity/IdentityServer.Admin.Api/Dtos/Clients/ClientApiDto.cs b/src/Services/Identity/IdentityServer.Admin.Api/Dtos/Clients/ClientApiDto.cs
@@ -104,9 +104,15 @@ public ClientApiDto()
     public int? PollingInterval { get; set; }
 
     public bool CoordinateLifetimeWithUserSession { get; set; }
+    public bool RequireDPoP { get; set; }
+    public int DPoPValidationMode { get; set; }
+    public TimeSpan DPoPClockSkew { get; set; } = TimeSpan.FromMinutes(5);
 
+    public int? PushedAuthorizationLifetime { get; set; }
+    public bool RequirePushedAuthorization { get; set; }
+    public string InitiateLoginUri { get; set; }
 
     public List<string> AllowedIdentityTokenSigningAlgorithms { get; set; }
 
     public bool NonEditable { get; set; }
-}
+}
diff --git a/src/Services/Identity/IdentityServer.Admin.Api/Dtos/PersistedGrants/PersistedGrantApiDto.cs b/src/Services/Identity/IdentityServer.Admin.Api/Dtos/PersistedGrants/PersistedGrantApiDto.cs
@@ -7,6 +7,7 @@ namespace IdentityServer.Admin.Api.Dtos.PersistedGrants;
 
 public class PersistedGrantApiDto
 {
+    public long Id { get; set; }
     public string Key { get; set; }
     public string Type { get; set; }
     public string SubjectId { get; set; }
@@ -18,4 +19,4 @@ public class PersistedGrantApiDto
     public DateTime? ConsumedTime { get; set; }
     public string SessionId { get; set; }
     public string Description { get; set; }
-}
+}
diff --git a/...ces/Identity/IdentityServer.Admin.Api/Dtos/PersistedGrants/PersistedGrantSubjectApiDto.cs b/...ces/Identity/IdentityServer.Admin.Api/Dtos/PersistedGrants/PersistedGrantSubjectApiDto.cs
@@ -7,6 +7,7 @@ namespace IdentityServer.Admin.Api.Dtos.PersistedGrants;
 
 public class PersistedGrantSubjectApiDto
 {
+    public long Id { get; set; }
     public string Key { get; set; }
     public string Type { get; set; }
     public string SubjectId { get; set; }
@@ -18,4 +19,4 @@ public class PersistedGrantSubjectApiDto
     public DateTime? ConsumedTime { get; set; }
     public string SessionId { get; set; }
     public string Description { get; set; }
-}
+}
diff --git a/src/Services/Identity/IdentityServer.Admin.Api/IdentityServer.Admin.Api.csproj b/src/Services/Identity/IdentityServer.Admin.Api/IdentityServer.Admin.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-	    <TargetFramework>net6.0</TargetFramework>
+	    <TargetFramework>net8.0</TargetFramework>
 		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
         <UserSecretsId>1cc472a2-4e4b-48ce-846b-5219f71fc643</UserSecretsId>
         <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
@@ -10,35 +10,35 @@
     </PropertyGroup>
 
     <ItemGroup>
-		<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="6.0.2" />
-		<PackageReference Include="AspNetCore.HealthChecks.OpenIdConnectServer" Version="6.0.2" />
-		<PackageReference Include="AspNetCore.HealthChecks.UI" Version="6.0.5" />
-		<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="6.0.5" />
-		<PackageReference Include="AutoMapper" Version="12.0.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
-		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.21" />
-		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.21" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.21" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.21">
+		<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.0" />
+		<PackageReference Include="AspNetCore.HealthChecks.OpenIdConnectServer" Version="8.0.0" />
+		<PackageReference Include="AspNetCore.HealthChecks.UI" Version="8.0.0" />
+		<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.0" />
+		<PackageReference Include="AutoMapper" Version="13.0.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.21" />
-		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.21" />
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.16.1" />
-		<PackageReference Include="Serilog" Version="2.11.0" />
-		<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
+		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.1" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+		<PackageReference Include="Serilog" Version="3.1.1" />
+		<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
 		<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-		<PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
-		<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
-		<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+		<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
+		<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+		<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-		<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic" Version="1.2.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="1.2.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Shared.Configuration" Version="1.2.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.4.0" />
+		<PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic" Version="2.0.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="2.0.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Shared.Configuration" Version="2.0.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.5.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...r.Admin.EntityFramework.PostgreSQL/IdentityServer.Admin.EntityFramework.PostgreSQL.csproj b/...r.Admin.EntityFramework.PostgreSQL/IdentityServer.Admin.EntityFramework.PostgreSQL.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-	    <TargetFramework>net6.0</TargetFramework>
+	    <TargetFramework>net8.0</TargetFramework>
 		<Description>Entity Framework layer for the administration of the Duende IdentityServer and Asp.Net Core Identity with PostrgreSQL support</Description>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.5" />
+        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>