From 87110e69da47b0454d7221fd9231a3b70521f06e Mon Sep 17 00:00:00 2001
From: Phong Nguyen <nguyendoanphong.it@gmail.com>
Date: Sat, 18 Jan 2025 01:53:33 +0700
Subject: [PATCH] OpenIddict

---
 .../ClassifiedAds.Application.csproj          |  6 +--
 .../ClassifiedAds.CrossCuttingConcerns.csproj |  4 +-
 .../ClassifiedAds.Domain.csproj               |  4 +-
 .../ClassifiedAds.IdentityServer.csproj       | 14 +++---
 .../Controllers/AuthorizationController.cs    |  1 +
 .../ClassifiedAds.IdentityServer/Dockerfile   |  4 +-
 .../HostedServices/SeedDataHostedService.cs   | 32 ++++++-------
 .../ClassifiedAds.IdentityServer/Startup.cs   |  8 ++--
 .../appsettings.json                          |  6 ++-
 .../ClassifiedAds.Infrastructure.csproj       | 48 +++++++++----------
 .../ClassifiedAds.Migrator.csproj             |  8 ++--
 .../ClassifiedAds.Migrator/Dockerfile         |  4 +-
 .../ClassifiedAds.Persistence.csproj          | 12 ++---
 src/Monolith/.env                             |  2 +-
 .../ClassifiedAds.AspireAppHost/Program.cs    |  2 +-
 src/Monolith/README.md                        |  4 +-
 src/Monolith/docker-compose.yml               |  4 +-
 17 files changed, 83 insertions(+), 80 deletions(-)

diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Application/ClassifiedAds.Application.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.Application/ClassifiedAds.Application.csproj
index f7f888237..ee6e4525e 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.Application/ClassifiedAds.Application.csproj
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Application/ClassifiedAds.Application.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AnalysisMode>Recommended</AnalysisMode>
     <AnalysisModeSecurity>All</AnalysisModeSecurity>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj
index 913aedb8d..052d5d6d3 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AnalysisMode>Recommended</AnalysisMode>
     <AnalysisModeSecurity>All</AnalysisModeSecurity>
   </PropertyGroup>
@@ -11,7 +11,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-  <PackageReference Include="System.Text.Json" Version="8.0.0" />
+  <PackageReference Include="System.Text.Json" Version="9.0.1" />
   </ItemGroup>
   
 </Project>
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj
index 9ff29ad8e..4118179c4 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AnalysisMode>Recommended</AnalysisMode>
     <AnalysisModeSecurity>All</AnalysisModeSecurity>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj
index 542dc0e31..06e8ac03c 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AnalysisMode>Recommended</AnalysisMode>
     <AnalysisModeSecurity>All</AnalysisModeSecurity>
     <UserSecretsId>aae914a2-80ef-4814-891a-8ed4e63c8c79</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
-    <PackageReference Include="OpenIddict.AspNetCore" Version="4.10.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
+    <PackageReference Include="OpenIddict.AspNetCore" Version="6.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Controllers/AuthorizationController.cs b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Controllers/AuthorizationController.cs
index 1719f2ca8..5cfe62218 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Controllers/AuthorizationController.cs
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Controllers/AuthorizationController.cs
@@ -99,6 +99,7 @@ public async Task<IActionResult> Exchange()
             claimsPrincipal = new ClaimsPrincipal(identity);
 
             claimsPrincipal.SetScopes(request.GetScopes());
+            claimsPrincipal.SetResources(await _scopeManager.ListResourcesAsync(claimsPrincipal.GetScopes()).ToListAsync());
         }
         else if (request.IsAuthorizationCodeGrantType())
         {
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Dockerfile b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Dockerfile
index 110b2181a..ecd0788b4 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Dockerfile
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env
 WORKDIR /ClassifiedAds.IdentityServer
 
 # Copy csproj and restore as distinct layers
@@ -17,7 +17,7 @@ COPY . ./
 RUN dotnet publish ./ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
 WORKDIR /ClassifiedAds.IdentityServer
 COPY --from=build-env /ClassifiedAds.IdentityServer/out .
 
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/HostedServices/SeedDataHostedService.cs b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/HostedServices/SeedDataHostedService.cs
index c5956c0d0..4078c4935 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/HostedServices/SeedDataHostedService.cs
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/HostedServices/SeedDataHostedService.cs
@@ -43,7 +43,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Permissions.Endpoints.Authorization,
                 OpenIddictConstants.Permissions.Endpoints.Token,
-                OpenIddictConstants.Permissions.Endpoints.Logout,
+                OpenIddictConstants.Permissions.Endpoints.EndSession,
 
                 OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode,
                 OpenIddictConstants.Permissions.GrantTypes.ClientCredentials,
@@ -59,7 +59,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange
             },
-            Type = OpenIddictConstants.ClientTypes.Confidential,
+            ClientType = OpenIddictConstants.ClientTypes.Confidential,
         }, cancellationToken);
 
         await UpsertClientApplication(manager, new OpenIddictApplicationDescriptor
@@ -79,7 +79,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Permissions.Endpoints.Authorization,
                 OpenIddictConstants.Permissions.Endpoints.Token,
-                OpenIddictConstants.Permissions.Endpoints.Logout,
+                OpenIddictConstants.Permissions.Endpoints.EndSession,
 
                 OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode,
                 OpenIddictConstants.Permissions.GrantTypes.ClientCredentials,
@@ -96,7 +96,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange
             },
-            Type = OpenIddictConstants.ClientTypes.Confidential,
+            ClientType = OpenIddictConstants.ClientTypes.Confidential,
         }, cancellationToken);
 
         await UpsertClientApplication(manager, new OpenIddictApplicationDescriptor
@@ -116,7 +116,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Permissions.Endpoints.Authorization,
                 OpenIddictConstants.Permissions.Endpoints.Token,
-                OpenIddictConstants.Permissions.Endpoints.Logout,
+                OpenIddictConstants.Permissions.Endpoints.EndSession,
 
                 OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode,
                 OpenIddictConstants.Permissions.GrantTypes.ClientCredentials,
@@ -133,7 +133,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange
             },
-            Type = OpenIddictConstants.ClientTypes.Confidential,
+            ClientType = OpenIddictConstants.ClientTypes.Confidential,
         }, cancellationToken);
 
         await UpsertClientApplication(manager, new OpenIddictApplicationDescriptor
@@ -153,7 +153,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Permissions.Endpoints.Authorization,
                 OpenIddictConstants.Permissions.Endpoints.Token,
-                OpenIddictConstants.Permissions.Endpoints.Logout,
+                OpenIddictConstants.Permissions.Endpoints.EndSession,
 
                 OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode,
                 OpenIddictConstants.Permissions.GrantTypes.ClientCredentials,
@@ -169,7 +169,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange
             },
-            Type = OpenIddictConstants.ClientTypes.Confidential,
+            ClientType = OpenIddictConstants.ClientTypes.Confidential,
         }, cancellationToken);
 
         await UpsertClientApplication(manager, new OpenIddictApplicationDescriptor
@@ -188,7 +188,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Permissions.Endpoints.Authorization,
                 OpenIddictConstants.Permissions.Endpoints.Token,
-                OpenIddictConstants.Permissions.Endpoints.Logout,
+                OpenIddictConstants.Permissions.Endpoints.EndSession,
 
                 OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode,
                 OpenIddictConstants.Permissions.GrantTypes.ClientCredentials,
@@ -204,7 +204,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange
             },
-            Type = OpenIddictConstants.ClientTypes.Public,
+            ClientType = OpenIddictConstants.ClientTypes.Public,
         }, cancellationToken);
 
         await UpsertClientApplication(manager, new OpenIddictApplicationDescriptor
@@ -223,7 +223,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Permissions.Endpoints.Authorization,
                 OpenIddictConstants.Permissions.Endpoints.Token,
-                OpenIddictConstants.Permissions.Endpoints.Logout,
+                OpenIddictConstants.Permissions.Endpoints.EndSession,
 
                 OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode,
                 OpenIddictConstants.Permissions.GrantTypes.ClientCredentials,
@@ -239,7 +239,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange
             },
-            Type = OpenIddictConstants.ClientTypes.Public,
+            ClientType = OpenIddictConstants.ClientTypes.Public,
         }, cancellationToken);
 
         await UpsertClientApplication(manager, new OpenIddictApplicationDescriptor
@@ -258,7 +258,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Permissions.Endpoints.Authorization,
                 OpenIddictConstants.Permissions.Endpoints.Token,
-                OpenIddictConstants.Permissions.Endpoints.Logout,
+                OpenIddictConstants.Permissions.Endpoints.EndSession,
 
                 OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode,
                 OpenIddictConstants.Permissions.GrantTypes.ClientCredentials,
@@ -274,7 +274,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange
             },
-            Type = OpenIddictConstants.ClientTypes.Public,
+            ClientType = OpenIddictConstants.ClientTypes.Public,
         }, cancellationToken);
 
         await UpsertClientApplication(manager, new OpenIddictApplicationDescriptor
@@ -293,7 +293,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Permissions.Endpoints.Authorization,
                 OpenIddictConstants.Permissions.Endpoints.Token,
-                OpenIddictConstants.Permissions.Endpoints.Logout,
+                OpenIddictConstants.Permissions.Endpoints.EndSession,
 
                 OpenIddictConstants.Permissions.GrantTypes.AuthorizationCode,
                 OpenIddictConstants.Permissions.GrantTypes.ClientCredentials,
@@ -309,7 +309,7 @@ private static async Task RegisterApplicationsAsync(IServiceScope scope, Cancell
             {
                 OpenIddictConstants.Requirements.Features.ProofKeyForCodeExchange
             },
-            Type = OpenIddictConstants.ClientTypes.Public,
+            ClientType = OpenIddictConstants.ClientTypes.Public,
         }, cancellationToken);
     }
 
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Startup.cs b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Startup.cs
index 41395a4f3..79bfa274f 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Startup.cs
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/Startup.cs
@@ -97,8 +97,8 @@ public void ConfigureServices(IServiceCollection services)
             options
                 .SetTokenEndpointUris("connect/token")
                 .SetAuthorizationEndpointUris("connect/authorize")
-                .SetLogoutEndpointUris("connect/logout")
-                .SetUserinfoEndpointUris("connect/userinfo");
+                .SetEndSessionEndpointUris("connect/logout")
+                .SetUserInfoEndpointUris("connect/userinfo");
 
             options.AllowAuthorizationCodeFlow()
                    .AllowHybridFlow()
@@ -115,8 +115,8 @@ public void ConfigureServices(IServiceCollection services)
                 .UseAspNetCore()
                 .EnableTokenEndpointPassthrough()
                 .EnableAuthorizationEndpointPassthrough()
-                .EnableLogoutEndpointPassthrough()
-                .EnableUserinfoEndpointPassthrough();
+                .EnableEndSessionEndpointPassthrough()
+                .EnableUserInfoEndpointPassthrough();
 
             options.DisableAccessTokenEncryption();
         })
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/appsettings.json b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/appsettings.json
index 054ffe030..14786153b 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/appsettings.json
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/appsettings.json
@@ -8,12 +8,14 @@
     "EncryptionCertificate": {
       "Thumbprint": null,
       "Path": "Certs/classifiedads.identityserver.pfx",
-      "Password": "password1234"
+      "Password": "password1234",
+      "X509KeyStorageFlags": "EphemeralKeySet"
     },
     "SigningCertificate": {
       "Thumbprint": null,
       "Path": "Certs/classifiedads.identityserver.pfx",
-      "Password": "password1234"
+      "Password": "password1234",
+      "X509KeyStorageFlags": "EphemeralKeySet"
     }
   },
   "Logging": {
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj
index d7ad931e0..ee2e482d5 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj
@@ -1,43 +1,43 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AnalysisMode>Recommended</AnalysisMode>
     <AnalysisModeSecurity>All</AnalysisModeSecurity>
   </PropertyGroup>
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Azure.Data.AppConfiguration" Version="1.3.0" />
-    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.0" />
-    <PackageReference Include="Azure.Identity" Version="1.10.4" />
+    <PackageReference Include="Azure.Data.AppConfiguration" Version="1.5.0" />
+    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" />
+    <PackageReference Include="Azure.Identity" Version="1.13.2" />
     <PackageReference Include="Castle.Core" Version="5.1.1" />
-    <PackageReference Include="CryptographyHelper" Version="3.0.0" />
-    <PackageReference Include="Dapper.StrongName" Version="2.1.24" />
+    <PackageReference Include="CryptographyHelper" Version="3.1.0" />
+    <PackageReference Include="Dapper.StrongName" Version="2.1.35" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.0" />
-    <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
-    <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.3.8" />
-    <PackageReference Include="MiniProfiler.Providers.SqlServer" Version="4.3.8" />
-    <PackageReference Include="Quartz" Version="3.8.0" />
-    <PackageReference Include="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
-    <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="9.0.1" />
+    <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.5.4" />
+    <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.5.4" />
+    <PackageReference Include="MiniProfiler.Providers.SqlServer" Version="4.5.4" />
+    <PackageReference Include="Quartz" Version="3.13.1" />
+    <PackageReference Include="Serilog" Version="4.2.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
+    <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
     <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VaultSharp" Version="1.13.0.1" />
+    <PackageReference Include="VaultSharp" Version="1.17.5.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj
index 34282ff7a..44191e756 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AnalysisMode>Recommended</AnalysisMode>
     <AnalysisModeSecurity>All</AnalysisModeSecurity>
     <UserSecretsId>b8df572d-5be2-4f41-b55a-8f4e2ef2b569</UserSecretsId>
@@ -21,13 +21,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="dbup" Version="5.0.37" />
-    <PackageReference Include="Polly" Version="8.2.0" />
+    <PackageReference Include="dbup" Version="5.0.41" />
+    <PackageReference Include="Polly" Version="8.5.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/Dockerfile b/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/Dockerfile
index 9adae3410..7339db4c6 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/Dockerfile
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Migrator/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env
 WORKDIR /ClassifiedAds.Monolith
 
 # Copy csproj and restore as distinct layers
@@ -29,7 +29,7 @@ COPY . ./
 RUN dotnet publish ./ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
 WORKDIR /ClassifiedAds.Monolith
 COPY --from=build-env /ClassifiedAds.Monolith/out .
 
diff --git a/src/IdentityServer/OpenIddict/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj b/src/IdentityServer/OpenIddict/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj
index b37f90ce8..1496e4c28 100644
--- a/src/IdentityServer/OpenIddict/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj
+++ b/src/IdentityServer/OpenIddict/ClassifiedAds.Persistence/ClassifiedAds.Persistence.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AnalysisMode>Recommended</AnalysisMode>
     <AnalysisModeSecurity>All</AnalysisModeSecurity>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="EntityFrameworkCore.SqlServer.SimpleBulks" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
-    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.10.1" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.1" />
+    <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Monolith/.env b/src/Monolith/.env
index 95c666639..eda7b8140 100644
--- a/src/Monolith/.env
+++ b/src/Monolith/.env
@@ -1,7 +1,7 @@
 ASPNETCORE_ENVIRONMENT="Development"
 DOTNET_ENVIRONMENT="Development"
 ConnectionStrings__ClassifiedAds="Server=db;Database=ClassifiedAds;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
-ConnectionStrings__IdentityServer_IdentityServer4="Server=db;Database=ClassifiedAds.IdentityServer.IdentityServer4;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
+ConnectionStrings__IdentityServer_OpenIddict="Server=db;Database=ClassifiedAds.IdentityServer.OpenIddict;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
 MessageBroker__Provider="RabbitMQ"
 MessageBroker__RabbitMQ__HostName="rabbitmq"
 MessageBroker__Kafka__BootstrapServers="kafka:9092"
diff --git a/src/Monolith/ClassifiedAds.AspireAppHost/Program.cs b/src/Monolith/ClassifiedAds.AspireAppHost/Program.cs
index 15552ec1f..d8ca34de1 100644
--- a/src/Monolith/ClassifiedAds.AspireAppHost/Program.cs
+++ b/src/Monolith/ClassifiedAds.AspireAppHost/Program.cs
@@ -8,6 +8,6 @@
 var blazorWebAssembly = builder.AddProject<Projects.ClassifiedAds_BlazorWebAssembly>("ClassifiedAds-BlazorWebAssembly");
 
 var identityServer = builder
-    .AddExecutable("ClassifiedAds-IdentityServer", "dotnet", "../../IdentityServer/IdentityServer4/ClassifiedAds.IdentityServer", "run", $"--urls=https://localhost:44367");
+    .AddExecutable("ClassifiedAds-IdentityServer", "dotnet", "../../IdentityServer/OpenIddict/ClassifiedAds.IdentityServer", "run", $"--urls=https://localhost:44367");
 
 builder.Build().Run();
\ No newline at end of file
diff --git a/src/Monolith/README.md b/src/Monolith/README.md
index 12a261fa5..d24293367 100644
--- a/src/Monolith/README.md
+++ b/src/Monolith/README.md
@@ -9,7 +9,7 @@
   | -------- | ------------------ | ----------------- |
   | ClassifiedAds.Migrator | [appsettings.json](ClassifiedAds.Migrator/appsettings.json) | ConnectionStrings:ClassifiedAds |
   | ClassifiedAds.Background | [appsettings.json](ClassifiedAds.Background/appsettings.json) | ConnectionStrings:ClassifiedAds |
-  | ClassifiedAds.IdentityServer | [appsettings.json](../IdentityServer/IdentityServer4/ClassifiedAds.IdentityServer/appsettings.json) | ConnectionStrings:ClassifiedAds |
+  | ClassifiedAds.IdentityServer | [appsettings.json](../IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/appsettings.json) | ConnectionStrings:ClassifiedAds |
   | ClassifiedAds.WebAPI | [appsettings.json](ClassifiedAds.WebAPI/appsettings.json) | ConnectionStrings:ClassifiedAds |
   | ClassifiedAds.WebMVC | [appsettings.json](ClassifiedAds.WebMVC/appsettings.json) | ConnectionStrings:ClassifiedAds |
 
@@ -113,7 +113,7 @@
 
   dotnet build -p:Version=1.0.0.1 -c Release
 
-  dotnet publish -p:Version=1.0.0.1 -c Release ../IdentityServer/IdentityServer4/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj -o ./publish/ClassifiedAds.IdentityServer
+  dotnet publish -p:Version=1.0.0.1 -c Release ../IdentityServer/OpenIddict/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj -o ./publish/ClassifiedAds.IdentityServer
   dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.Background/ClassifiedAds.Background.csproj -o ./publish/ClassifiedAds.Background
   dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj -o ./publish/ClassifiedAds.Migrator
   dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.csproj -o ./publish/ClassifiedAds.WebAPI
diff --git a/src/Monolith/docker-compose.yml b/src/Monolith/docker-compose.yml
index c5fa345f0..25a5fd4f0 100644
--- a/src/Monolith/docker-compose.yml
+++ b/src/Monolith/docker-compose.yml
@@ -53,7 +53,7 @@ services:
     identityserver:
         image: classifiedads.identityserver
         build:
-          context: ../IdentityServer/IdentityServer4
+          context: ../IdentityServer/OpenIddict
           dockerfile: ./ClassifiedAds.IdentityServer/Dockerfile
         ports:
             - "9000:80"
@@ -63,7 +63,7 @@ services:
         environment:
           ASPNETCORE_ENVIRONMENT: ${ASPNETCORE_ENVIRONMENT}
           ConnectionStrings__ClassifiedAds: ${ConnectionStrings__ClassifiedAds}
-          ConnectionStrings__IdentityServer: ${ConnectionStrings__IdentityServer_IdentityServer4}
+          ConnectionStrings__IdentityServer: ${ConnectionStrings__IdentityServer_OpenIddict}
           CookiePolicyOptions__IsEnabled: "true"
           CookiePolicyOptions__MinimumSameSitePolicy: "Lax"
           CookiePolicyOptions__Secure: "None"