Migrate the OpenID module to OpenIddict 7.0

Author: kevinchalet

Directory.Packages.props

@@ -47,12 +47,12 @@
     <PackageVersion Include="NJsonSchema" Version="11.3.2" />
     <PackageVersion Include="NLog.Web.AspNetCore" Version="5.5.0" />
     <PackageVersion Include="NodaTime" Version="3.2.2" />
-    <PackageVersion Include="OpenIddict.Core" Version="6.4.0" />
-    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="6.4.0" />
-    <PackageVersion Include="OpenIddict.Server.DataProtection" Version="6.4.0" />
-    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="6.4.0" />
-    <PackageVersion Include="OpenIddict.Validation.DataProtection" Version="6.4.0" />
-    <PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="6.4.0" />
+    <PackageVersion Include="OpenIddict.Core" Version="7.0.0" />
+    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="7.0.0" />
+    <PackageVersion Include="OpenIddict.Server.DataProtection" Version="7.0.0" />
+    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.0.0" />
+    <PackageVersion Include="OpenIddict.Validation.DataProtection" Version="7.0.0" />
+    <PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="7.0.0" />
     <PackageVersion Include="OrchardCore.Translations.All" Version="2.1.0" />
     <PackageVersion Include="PdfPig" Version="0.1.10" />
     <PackageVersion Include="Shortcodes" Version="1.3.5" />

src/OrchardCore/OrchardCore.OpenId.Core/Extensions/OpenIdExtensions.cs

@@ -7,7 +7,6 @@
 using OrchardCore.OpenId.YesSql.Indexes;
 using OrchardCore.OpenId.YesSql.Migrations;
 using OrchardCore.OpenId.YesSql.Models;
-using OrchardCore.OpenId.YesSql.Resolvers;
 using OrchardCore.OpenId.YesSql.Stores;
 
 namespace Microsoft.Extensions.DependencyInjection;
@@ -35,12 +34,23 @@ public static OpenIddictCoreBuilder UseOrchardManagers(this OpenIddictCoreBuilde
                .ReplaceScopeManager(typeof(OpenIdScopeManager<>))
                .ReplaceTokenManager(typeof(OpenIdTokenManager<>));
 
+        // Note: OpenIddict 7.0+ no longer registers the managers under their own type.
+        // To avoid a breaking change, the typed managers are manually registered here.
+        builder.Services.TryAddScoped(typeof(OpenIdApplicationManager<>));
+        builder.Services.TryAddScoped(typeof(OpenIdAuthorizationManager<>));
+        builder.Services.TryAddScoped(typeof(OpenIdScopeManager<>));
+        builder.Services.TryAddScoped(typeof(OpenIdTokenManager<>));
+
         // Register proxy delegates so that the Orchard managers can be directly
         // resolved from the DI using the non-generic, Orchard-specific interfaces.
-        builder.Services.TryAddScoped(provider => (IOpenIdApplicationManager)provider.GetRequiredService<IOpenIddictApplicationManager>());
-        builder.Services.TryAddScoped(provider => (IOpenIdAuthorizationManager)provider.GetRequiredService<IOpenIddictAuthorizationManager>());
-        builder.Services.TryAddScoped(provider => (IOpenIdScopeManager)provider.GetRequiredService<IOpenIddictScopeManager>());
-        builder.Services.TryAddScoped(provider => (IOpenIdTokenManager)provider.GetRequiredService<IOpenIddictTokenManager>());
+        builder.Services.TryAddScoped(static provider => (IOpenIdApplicationManager)
+            provider.GetRequiredService<IOpenIddictApplicationManager>());
+        builder.Services.TryAddScoped(static provider => (IOpenIdAuthorizationManager)
+            provider.GetRequiredService<IOpenIddictAuthorizationManager>());
+        builder.Services.TryAddScoped(static provider => (IOpenIdScopeManager)
+            provider.GetRequiredService<IOpenIddictScopeManager>());
+        builder.Services.TryAddScoped(static provider => (IOpenIdTokenManager)
+            provider.GetRequiredService<IOpenIddictTokenManager>());
 
         return builder;
     }
@@ -59,25 +69,15 @@ public static OpenIddictCoreBuilder UseYesSql(this OpenIddictCoreBuilder builder
                .SetDefaultScopeEntity<OpenIdScope>()
                .SetDefaultTokenEntity<OpenIdToken>();
 
-        builder.ReplaceApplicationStoreResolver<OpenIdApplicationStoreResolver>()
-               .ReplaceAuthorizationStoreResolver<OpenIdAuthorizationStoreResolver>()
-               .ReplaceScopeStoreResolver<OpenIdScopeStoreResolver>()
-               .ReplaceTokenStoreResolver<OpenIdTokenStoreResolver>();
-
-        builder.Services.TryAddSingleton<OpenIdApplicationStoreResolver.TypeResolutionCache>();
-        builder.Services.TryAddSingleton<OpenIdAuthorizationStoreResolver.TypeResolutionCache>();
-        builder.Services.TryAddSingleton<OpenIdScopeStoreResolver.TypeResolutionCache>();
-        builder.Services.TryAddSingleton<OpenIdTokenStoreResolver.TypeResolutionCache>();
-
-        builder.Services.TryAddScoped(typeof(OpenIdApplicationStore<>));
-        builder.Services.TryAddScoped(typeof(OpenIdAuthorizationStore<>));
-        builder.Services.TryAddScoped(typeof(OpenIdScopeStore<>));
-        builder.Services.TryAddScoped(typeof(OpenIdTokenStore<>));
-
-        builder.Services.AddIndexProvider<OpenIdApplicationIndexProvider>();
-        builder.Services.AddIndexProvider<OpenIdAuthorizationIndexProvider>();
-        builder.Services.AddIndexProvider<OpenIdScopeIndexProvider>();
-        builder.Services.AddIndexProvider<OpenIdTokenIndexProvider>();
+        builder.ReplaceApplicationStore(typeof(OpenIdApplicationStore<>))
+               .ReplaceAuthorizationStore(typeof(OpenIdAuthorizationStore<>))
+               .ReplaceScopeStore(typeof(OpenIdScopeStore<>))
+               .ReplaceTokenStore(typeof(OpenIdTokenStore<>));
+
+        builder.Services.AddIndexProvider<OpenIdApplicationIndexProvider>()
+                        .AddIndexProvider<OpenIdAuthorizationIndexProvider>()
+                        .AddIndexProvider<OpenIdScopeIndexProvider>()
+                        .AddIndexProvider<OpenIdTokenIndexProvider>();
 
         return builder;
     }

src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdApplicationManager.cs

@@ -18,8 +18,8 @@ public OpenIdApplicationManager(
         IOpenIddictApplicationCache<TApplication> cache,
         ILogger<OpenIdApplicationManager<TApplication>> logger,
         IOptionsMonitor<OpenIddictCoreOptions> options,
-        IOpenIddictApplicationStoreResolver resolver)
-        : base(cache, logger, options, resolver)
+        IOpenIddictApplicationStore<TApplication> store)
+        : base(cache, logger, options, store)
     {
     }
 

src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdAuthorizationManager.cs

@@ -14,8 +14,8 @@ public OpenIdAuthorizationManager(
         IOpenIddictAuthorizationCache<TAuthorization> cache,
         ILogger<OpenIddictAuthorizationManager<TAuthorization>> logger,
         IOptionsMonitor<OpenIddictCoreOptions> options,
-        IOpenIddictAuthorizationStoreResolver resolver)
-        : base(cache, logger, options, resolver)
+        IOpenIddictAuthorizationStore<TAuthorization> store)
+        : base(cache, logger, options, store)
     {
     }
 

src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdScopeManager.cs

@@ -13,8 +13,8 @@ public OpenIdScopeManager(
         IOpenIddictScopeCache<TScope> cache,
         ILogger<OpenIddictScopeManager<TScope>> logger,
         IOptionsMonitor<OpenIddictCoreOptions> options,
-        IOpenIddictScopeStoreResolver resolver)
-        : base(cache, logger, options, resolver)
+        IOpenIddictScopeStore<TScope> store)
+        : base(cache, logger, options, store)
     {
     }
 

src/OrchardCore/OrchardCore.OpenId.Core/Services/Managers/OpenIdTokenManager.cs

@@ -13,8 +13,8 @@ public OpenIdTokenManager(
         IOpenIddictTokenCache<TToken> cache,
         ILogger<OpenIddictTokenManager<TToken>> logger,
         IOptionsMonitor<OpenIddictCoreOptions> options,
-        IOpenIddictTokenStoreResolver resolver)
-        : base(cache, logger, options, resolver)
+        IOpenIddictTokenStore<TToken> store)
+        : base(cache, logger, options, store)
     {
     }