From 9167ed835b846dc5a214e9c701b2a98b389d45c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Mon, 24 Aug 2026 14:49:51 +0200
Subject: [PATCH] Update the ReplaceDefault*Entity() methods to register the
 MongoDB stores as singletons

---
 src/OpenIddict.MongoDb/OpenIddictMongoDbBuilder.cs        | 8 ++++----
 .../OpenIddictMongoDbBuilderTests.cs                      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/OpenIddict.MongoDb/OpenIddictMongoDbBuilder.cs b/src/OpenIddict.MongoDb/OpenIddictMongoDbBuilder.cs
index 9896be74..b9d98624 100644
--- a/src/OpenIddict.MongoDb/OpenIddictMongoDbBuilder.cs
+++ b/src/OpenIddict.MongoDb/OpenIddictMongoDbBuilder.cs
@@ -57,7 +57,7 @@ public sealed class OpenIddictMongoDbBuilder
         Services.Replace(ServiceDescriptor.Scoped<IOpenIddictApplicationManager>(static provider =>
             provider.GetRequiredService<OpenIddictApplicationManager<TApplication>>()));
 
-        Services.Replace(ServiceDescriptor.Scoped<
+        Services.Replace(ServiceDescriptor.Singleton<
             IOpenIddictApplicationStore<TApplication>, OpenIddictMongoDbApplicationStore<TApplication>>());
 
         return this;
@@ -74,7 +74,7 @@ public sealed class OpenIddictMongoDbBuilder
         Services.Replace(ServiceDescriptor.Scoped<IOpenIddictAuthorizationManager>(static provider =>
             provider.GetRequiredService<OpenIddictAuthorizationManager<TAuthorization>>()));
 
-        Services.Replace(ServiceDescriptor.Scoped<
+        Services.Replace(ServiceDescriptor.Singleton<
             IOpenIddictAuthorizationStore<TAuthorization>, OpenIddictMongoDbAuthorizationStore<TAuthorization>>());
 
         return this;
@@ -91,7 +91,7 @@ public sealed class OpenIddictMongoDbBuilder
         Services.Replace(ServiceDescriptor.Scoped<IOpenIddictScopeManager>(static provider =>
             provider.GetRequiredService<OpenIddictScopeManager<TScope>>()));
 
-        Services.Replace(ServiceDescriptor.Scoped<
+        Services.Replace(ServiceDescriptor.Singleton<
             IOpenIddictScopeStore<TScope>, OpenIddictMongoDbScopeStore<TScope>>());
 
         return this;
@@ -108,7 +108,7 @@ public sealed class OpenIddictMongoDbBuilder
         Services.Replace(ServiceDescriptor.Scoped<IOpenIddictTokenManager>(static provider =>
             provider.GetRequiredService<OpenIddictTokenManager<TToken>>()));
 
-        Services.Replace(ServiceDescriptor.Scoped<
+        Services.Replace(ServiceDescriptor.Singleton<
             IOpenIddictTokenStore<TToken>, OpenIddictMongoDbTokenStore<TToken>>());
 
         return this;
diff --git a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs
index 66a9b8f6..bc22ecf2 100644
--- a/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs
+++ b/test/OpenIddict.MongoDb.Tests/OpenIddictMongoDbBuilderTests.cs
@@ -39,7 +39,7 @@ public class OpenIddictMongoDbBuilderTests
 
         // Assert
         Assert.Contains(services, service =>
-            service.Lifetime == ServiceLifetime.Scoped &&
+            service.Lifetime is ServiceLifetime.Singleton &&
             service.ServiceType == typeof(IOpenIddictApplicationStore<CustomApplication>) &&
             service.ImplementationType == typeof(OpenIddictMongoDbApplicationStore<CustomApplication>));
     }
@@ -56,7 +56,7 @@ public class OpenIddictMongoDbBuilderTests
 
         // Assert
         Assert.Contains(services, service =>
-            service.Lifetime == ServiceLifetime.Scoped &&
+            service.Lifetime is ServiceLifetime.Singleton &&
             service.ServiceType == typeof(IOpenIddictAuthorizationStore<CustomAuthorization>) &&
             service.ImplementationType == typeof(OpenIddictMongoDbAuthorizationStore<CustomAuthorization>));
     }
@@ -73,7 +73,7 @@ public class OpenIddictMongoDbBuilderTests
 
         // Assert
         Assert.Contains(services, service =>
-            service.Lifetime == ServiceLifetime.Scoped &&
+            service.Lifetime is ServiceLifetime.Singleton &&
             service.ServiceType == typeof(IOpenIddictScopeStore<CustomScope>) &&
             service.ImplementationType == typeof(OpenIddictMongoDbScopeStore<CustomScope>));
     }
@@ -90,7 +90,7 @@ public class OpenIddictMongoDbBuilderTests
 
         // Assert
         Assert.Contains(services, service =>
-            service.Lifetime == ServiceLifetime.Scoped &&
+            service.Lifetime is ServiceLifetime.Singleton &&
             service.ServiceType == typeof(IOpenIddictTokenStore<CustomToken>) &&
             service.ImplementationType == typeof(OpenIddictMongoDbTokenStore<CustomToken>));
     }