Skip to content

Commit 8e28f2e

Browse files
kevinchaletkevinchalet
committed
Start testing the OpenID module with OpenIddict 7.0
1 parent b625e9a commit 8e28f2e

File tree

11 files changed

+50
-264
lines changed

11 files changed

+50
-264
lines changed

‎Directory.Packages.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@
4949
<PackageVersion Include="NJsonSchema" Version="11.1.0" />
5050
<PackageVersion Include="NLog.Web.AspNetCore" Version="5.4.0" />
5151
<PackageVersion Include="NodaTime" Version="3.2.1" />
52-
<PackageVersion Include="OpenIddict.Core" Version="6.2.0" />
53-
<PackageVersion Include="OpenIddict.Server.AspNetCore" Version="6.2.0" />
54-
<PackageVersion Include="OpenIddict.Server.DataProtection" Version="6.2.0" />
55-
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="6.2.0" />
56-
<PackageVersion Include="OpenIddict.Validation.DataProtection" Version="6.2.0" />
57-
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="6.2.0" />
52+
<PackageVersion Include="OpenIddict.Core" Version="7.0.0-preview.2.25173.64" />
53+
<PackageVersion Include="OpenIddict.Server.AspNetCore" Version="7.0.0-preview.2.25173.64" />
54+
<PackageVersion Include="OpenIddict.Server.DataProtection" Version="7.0.0-preview.2.25173.64" />
55+
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.0.0-preview.2.25173.64" />
56+
<PackageVersion Include="OpenIddict.Validation.DataProtection" Version="7.0.0-preview.2.25173.64" />
57+
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="7.0.0-preview.2.25173.64" />
5858
<PackageVersion Include="OrchardCore.Translations.All" Version="2.1.0" />
5959
<PackageVersion Include="PdfPig" Version="0.1.10" />
6060
<PackageVersion Include="Shortcodes" Version="1.3.5" />

‎NuGet.config‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<packageSources>
44
<clear />
55
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
6+
<add key="openiddict" value="https://www.myget.org/F/openiddict/api/v3/index.json" />
67
<!--
78
This feed is intended for development purposes only and should not be used when publishing to NuGet.
89
It is meant to be utilized exclusively in the dev branch while certain dependencies are unavailable on NuGet.org.
@@ -12,16 +13,17 @@
1213
<!-- add key="OrchardCore" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" /-->
1314
</packageSources>
1415

15-
<!--
16-
<packageSourceMapping>
17-
<packageSource key="OrchardCore">
18-
<package pattern="OrchardCore.*" />
19-
</packageSource>
20-
<packageSource key="NuGet">
21-
<package pattern="*" />
22-
</packageSource>
23-
</packageSourceMapping>
24-
-->
16+
<packageSourceMapping>
17+
<!--<packageSource key="OrchardCore">
18+
<package pattern="OrchardCore.*" />
19+
</packageSource>-->
20+
<packageSource key="openiddict">
21+
<package pattern="OpenIddict.*" />
22+
</packageSource>
23+
<packageSource key="NuGet">
24+
<package pattern="*" />
25+
</packageSource>
26+
</packageSourceMapping>
2527

2628
<disabledPackageSources />
2729
</configuration>

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using OrchardCore.OpenId.YesSql.Indexes;
88
using OrchardCore.OpenId.YesSql.Migrations;
99
using OrchardCore.OpenId.YesSql.Models;
10-
using OrchardCore.OpenId.YesSql.Resolvers;
1110
using OrchardCore.OpenId.YesSql.Stores;
1211

1312
namespace Microsoft.Extensions.DependencyInjection;
@@ -35,12 +34,23 @@ public static OpenIddictCoreBuilder UseOrchardManagers(this OpenIddictCoreBuilde
3534
.ReplaceScopeManager(typeof(OpenIdScopeManager<>))
3635
.ReplaceTokenManager(typeof(OpenIdTokenManager<>));
3736

37+
// Note: OpenIddict 7.0+ no longer registers the managers under their own type.
38+
// To avoid a breaking change, the typed managers are manually registered here.
39+
builder.Services.TryAddScoped(typeof(OpenIdApplicationManager<>));
40+
builder.Services.TryAddScoped(typeof(OpenIdAuthorizationManager<>));
41+
builder.Services.TryAddScoped(typeof(OpenIdScopeManager<>));
42+
builder.Services.TryAddScoped(typeof(OpenIdTokenManager<>));
43+
3844
// Register proxy delegates so that the Orchard managers can be directly
3945
// resolved from the DI using the non-generic, Orchard-specific interfaces.
40-
builder.Services.TryAddScoped(provider => (IOpenIdApplicationManager)provider.GetRequiredService<IOpenIddictApplicationManager>());
41-
builder.Services.TryAddScoped(provider => (IOpenIdAuthorizationManager)provider.GetRequiredService<IOpenIddictAuthorizationManager>());
42-
builder.Services.TryAddScoped(provider => (IOpenIdScopeManager)provider.GetRequiredService<IOpenIddictScopeManager>());
43-
builder.Services.TryAddScoped(provider => (IOpenIdTokenManager)provider.GetRequiredService<IOpenIddictTokenManager>());
46+
builder.Services.TryAddScoped(static provider => (IOpenIdApplicationManager)
47+
provider.GetRequiredService<IOpenIddictApplicationManager>());
48+
builder.Services.TryAddScoped(static provider => (IOpenIdAuthorizationManager)
49+
provider.GetRequiredService<IOpenIddictAuthorizationManager>());
50+
builder.Services.TryAddScoped(static provider => (IOpenIdScopeManager)
51+
provider.GetRequiredService<IOpenIddictScopeManager>());
52+
builder.Services.TryAddScoped(static provider => (IOpenIdTokenManager)
53+
provider.GetRequiredService<IOpenIddictTokenManager>());
4454

4555
return builder;
4656
}
@@ -59,25 +69,15 @@ public static OpenIddictCoreBuilder UseYesSql(this OpenIddictCoreBuilder builder
5969
.SetDefaultScopeEntity<OpenIdScope>()
6070
.SetDefaultTokenEntity<OpenIdToken>();
6171

62-
builder.ReplaceApplicationStoreResolver<OpenIdApplicationStoreResolver>()
63-
.ReplaceAuthorizationStoreResolver<OpenIdAuthorizationStoreResolver>()
64-
.ReplaceScopeStoreResolver<OpenIdScopeStoreResolver>()
65-
.ReplaceTokenStoreResolver<OpenIdTokenStoreResolver>();
66-
67-
builder.Services.TryAddSingleton<OpenIdApplicationStoreResolver.TypeResolutionCache>();
68-
builder.Services.TryAddSingleton<OpenIdAuthorizationStoreResolver.TypeResolutionCache>();
69-
builder.Services.TryAddSingleton<OpenIdScopeStoreResolver.TypeResolutionCache>();
70-
builder.Services.TryAddSingleton<OpenIdTokenStoreResolver.TypeResolutionCache>();
71-
72-
builder.Services.TryAddScoped(typeof(OpenIdApplicationStore<>));
73-
builder.Services.TryAddScoped(typeof(OpenIdAuthorizationStore<>));
74-
builder.Services.TryAddScoped(typeof(OpenIdScopeStore<>));
75-
builder.Services.TryAddScoped(typeof(OpenIdTokenStore<>));
76-
77-
builder.Services.AddIndexProvider<OpenIdApplicationIndexProvider>();
78-
builder.Services.AddIndexProvider<OpenIdAuthorizationIndexProvider>();
79-
builder.Services.AddIndexProvider<OpenIdScopeIndexProvider>();
80-
builder.Services.AddIndexProvider<OpenIdTokenIndexProvider>();
72+
builder.ReplaceApplicationStore(typeof(OpenIdApplicationStore<>))
73+
.ReplaceAuthorizationStore(typeof(OpenIdAuthorizationStore<>))
74+
.ReplaceScopeStore(typeof(OpenIdScopeStore<>))
75+
.ReplaceTokenStore(typeof(OpenIdTokenStore<>));
76+
77+
builder.Services.AddIndexProvider<OpenIdApplicationIndexProvider>()
78+
.AddIndexProvider<OpenIdAuthorizationIndexProvider>()
79+
.AddIndexProvider<OpenIdScopeIndexProvider>()
80+
.AddIndexProvider<OpenIdTokenIndexProvider>();
8181

8282
return builder;
8383
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ public OpenIdApplicationManager(
1818
IOpenIddictApplicationCache<TApplication> cache,
1919
ILogger<OpenIdApplicationManager<TApplication>> logger,
2020
IOptionsMonitor<OpenIddictCoreOptions> options,
21-
IOpenIddictApplicationStoreResolver resolver)
22-
: base(cache, logger, options, resolver)
21+
IOpenIddictApplicationStore<TApplication> store)
22+
: base(cache, logger, options, store)
2323
{
2424
}
2525

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public OpenIdAuthorizationManager(
1414
IOpenIddictAuthorizationCache<TAuthorization> cache,
1515
ILogger<OpenIddictAuthorizationManager<TAuthorization>> logger,
1616
IOptionsMonitor<OpenIddictCoreOptions> options,
17-
IOpenIddictAuthorizationStoreResolver resolver)
18-
: base(cache, logger, options, resolver)
17+
IOpenIddictAuthorizationStore<TAuthorization> store)
18+
: base(cache, logger, options, store)
1919
{
2020
}
2121

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public OpenIdScopeManager(
1313
IOpenIddictScopeCache<TScope> cache,
1414
ILogger<OpenIddictScopeManager<TScope>> logger,
1515
IOptionsMonitor<OpenIddictCoreOptions> options,
16-
IOpenIddictScopeStoreResolver resolver)
17-
: base(cache, logger, options, resolver)
16+
IOpenIddictScopeStore<TScope> store)
17+
: base(cache, logger, options, store)
1818
{
1919
}
2020

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public OpenIdTokenManager(
1313
IOpenIddictTokenCache<TToken> cache,
1414
ILogger<OpenIddictTokenManager<TToken>> logger,
1515
IOptionsMonitor<OpenIddictCoreOptions> options,
16-
IOpenIddictTokenStoreResolver resolver)
17-
: base(cache, logger, options, resolver)
16+
IOpenIddictTokenStore<TToken> store)
17+
: base(cache, logger, options, store)
1818
{
1919
}
2020

‎src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdApplicationStoreResolver.cs‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdAuthorizationStoreResolver.cs‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Resolvers/OpenIdScopeStoreResolver.cs‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)