From 8b9b7764315693552274b6274d7918ac97431d89 Mon Sep 17 00:00:00 2001
From: Brett Hazen <2651260+bhazen@users.noreply.github.com>
Date: Mon, 27 Jan 2025 11:50:26 -0600
Subject: [PATCH] Updated background services to use AsyncServiceScope to
 support services using IAsyncDispose

---
 identity-server/src/EntityFramework/TokenCleanupHost.cs         | 2 +-
 .../src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/identity-server/src/EntityFramework/TokenCleanupHost.cs b/identity-server/src/EntityFramework/TokenCleanupHost.cs
index a83b24579..732b64bb0 100644
--- a/identity-server/src/EntityFramework/TokenCleanupHost.cs
+++ b/identity-server/src/EntityFramework/TokenCleanupHost.cs
@@ -122,7 +122,7 @@ async Task RemoveExpiredGrantsAsync(CancellationToken cancellationToken = defaul
     {
         try
         {
-            using (var serviceScope = _serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+            await using (var serviceScope = _serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateAsyncScope())
             {
                 var tokenCleanupService = serviceScope.ServiceProvider.GetRequiredService<ITokenCleanupService>();
                 await tokenCleanupService.CleanupGrantsAsync(cancellationToken);
diff --git a/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs b/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs
index 72705b48b..d335e2aa9 100644
--- a/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs
+++ b/identity-server/src/IdentityServer/Hosting/ServerSideSessionCleanupHost.cs
@@ -125,7 +125,7 @@ async Task RunAsync(CancellationToken cancellationToken = default)
 
         try
         {
-            using (var serviceScope = _serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+            await using (var serviceScope = _serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateAsyncScope())
             {
                 var logger = serviceScope.ServiceProvider.GetRequiredService<ILogger<ServerSideSessionCleanupHost>>();
                 var options = serviceScope.ServiceProvider.GetRequiredService<IdentityServerOptions>();