Update `OpenIddict` to 7.0.0.

9 months ago · 85392e10c7
10 changed files with 26 additions and 25 deletions
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -128,11 +128,11 @@
    <PackageVersion Include="NUglify" Version="1.21.15" />
    <PackageVersion Include="Nullable" Version="1.3.1" />
    <PackageVersion Include="Octokit" Version="14.0.0" />
-    <PackageVersion Include="OpenIddict.Abstractions" Version="6.4.0" />
-    <PackageVersion Include="OpenIddict.Core" Version="6.4.0" />
-    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="6.4.0" />
-    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="6.4.0" />
-    <PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="6.4.0" />
+    <PackageVersion Include="OpenIddict.Abstractions" Version="7.0.0" />
+    <PackageVersion Include="OpenIddict.Core" Version="7.0.0" />
+    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="7.0.0" />
+    <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.0.0" />
+    <PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="7.0.0" />
    <PackageVersion Include="Oracle.EntityFrameworkCore" Version="9.23.80" />
    <PackageVersion Include="Polly" Version="8.5.2" />
    <PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
--- a/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20250710090114_Initial.Designer.cs
+++ b/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20250710090114_Initial.Designer.cs
@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
 namespace OpenIddict.Demo.Server.Migrations
 {
    [DbContext(typeof(ServerDbContext))]
-    [Migration("20250630055813_Initial")]
+    [Migration("20250710090114_Initial")]
    partial class Initial
    {
        /// <inheritdoc />
@ -1164,8 +1164,8 @@ namespace OpenIddict.Demo.Server.Migrations
                        .HasColumnType("nvarchar(400)");

                    b.Property<string>("Type")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");

                    b.HasKey("Id");

--- a/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20250710090114_Initial.cs
+++ b/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/20250710090114_Initial.cs
@ -645,7 +645,7 @@ namespace OpenIddict.Demo.Server.Migrations
                    ReferenceId = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
                    Status = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
                    Subject = table.Column<string>(type: "nvarchar(400)", maxLength: 400, nullable: true),
-                    Type = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    Type = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: true),
                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: false),
                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: false)
                },
--- a/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/ServerDbContextModelSnapshot.cs
+++ b/modules/openiddict/app/OpenIddict.Demo.Server/Migrations/ServerDbContextModelSnapshot.cs
@ -1161,8 +1161,8 @@ namespace OpenIddict.Demo.Server.Migrations
                        .HasColumnType("nvarchar(400)");

                    b.Property<string>("Type")
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");

                    b.HasKey("Id");

--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenConsts.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo/Abp/OpenIddict/Tokens/OpenIddictTokenConsts.cs
@ -8,5 +8,5 @@ public class OpenIddictTokenConsts

    public static int SubjectMaxLength { get; set; } = 400;

-    public static int TypeMaxLength { get; set; } = 50;
+    public static int TypeMaxLength { get; set; } = 150;
 }
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs
@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 using OpenIddict.Abstractions;
+using OpenIddict.Core;
 using Volo.Abp.BackgroundWorkers;
 using Volo.Abp.Caching;
 using Volo.Abp.DistributedLocking;
@ -65,15 +66,15 @@ public class AbpOpenIddictDomainModule : AbpModule
                    .SetDefaultTokenEntity<OpenIddictTokenModel>();

                builder
-                    .AddApplicationStore<AbpOpenIddictApplicationStore>()
-                    .AddAuthorizationStore<AbpOpenIddictAuthorizationStore>()
-                    .AddScopeStore<AbpOpenIddictScopeStore>()
-                    .AddTokenStore<AbpOpenIddictTokenStore>();
-
-                builder.ReplaceApplicationManager(typeof(AbpApplicationManager));
-                builder.ReplaceAuthorizationManager(typeof(AbpAuthorizationManager));
-                builder.ReplaceScopeManager(typeof(AbpScopeManager));
-                builder.ReplaceTokenManager(typeof(AbpTokenManager));
+                    .ReplaceApplicationStore<OpenIddictApplicationModel, AbpOpenIddictApplicationStore>()
+                    .ReplaceAuthorizationStore<OpenIddictAuthorizationModel, AbpOpenIddictAuthorizationStore>()
+                    .ReplaceScopeStore<OpenIddictScopeModel, AbpOpenIddictScopeStore>()
+                    .ReplaceTokenStore<OpenIddictTokenModel, AbpOpenIddictTokenStore>();
+
+                builder.ReplaceApplicationManager<OpenIddictApplicationModel, AbpApplicationManager>();
+                builder.ReplaceAuthorizationManager<OpenIddictAuthorizationModel, AbpAuthorizationManager>();
+                builder.ReplaceScopeManager<OpenIddictScopeModel, AbpScopeManager>();
+                builder.ReplaceTokenManager<OpenIddictTokenModel, AbpTokenManager>();

                builder.Services.TryAddScoped(provider => (IAbpApplicationManager)provider.GetRequiredService<IOpenIddictApplicationManager>());

--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationManager.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationManager.cs
@ -17,7 +17,7 @@ public class AbpApplicationManager : OpenIddictApplicationManager<OpenIddictAppl
        [NotNull] IOpenIddictApplicationCache<OpenIddictApplicationModel> cache,
        [NotNull] ILogger<AbpApplicationManager> logger,
        [NotNull] IOptionsMonitor<OpenIddictCoreOptions> options,
-        [NotNull] IOpenIddictApplicationStoreResolver resolver,
+        [NotNull] IOpenIddictApplicationStore<OpenIddictApplicationModel> resolver,
        AbpOpenIddictIdentifierConverter identifierConverter)
        : base(cache, logger, options, resolver)
    {
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/AbpAuthorizationManager.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Authorizations/AbpAuthorizationManager.cs
@ -16,7 +16,7 @@ public class AbpAuthorizationManager : OpenIddictAuthorizationManager<OpenIddict
        [NotNull] [ItemNotNull] IOpenIddictAuthorizationCache<OpenIddictAuthorizationModel> cache,
        [NotNull] [ItemNotNull] ILogger<OpenIddictAuthorizationManager<OpenIddictAuthorizationModel>> logger,
        [NotNull] [ItemNotNull] IOptionsMonitor<OpenIddictCoreOptions> options,
-        [NotNull] IOpenIddictAuthorizationStoreResolver resolver,
+        [NotNull] IOpenIddictAuthorizationStore<OpenIddictAuthorizationModel> resolver,
        AbpOpenIddictIdentifierConverter identifierConverter)
        : base(cache, logger, options, resolver)
    {
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/AbpScopeManager.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/AbpScopeManager.cs
@ -16,7 +16,7 @@ public class AbpScopeManager : OpenIddictScopeManager<OpenIddictScopeModel>
        [NotNull] [ItemNotNull] IOpenIddictScopeCache<OpenIddictScopeModel> cache,
        [NotNull] [ItemNotNull] ILogger<OpenIddictScopeManager<OpenIddictScopeModel>> logger,
        [NotNull] [ItemNotNull] IOptionsMonitor<OpenIddictCoreOptions> options,
-        [NotNull] IOpenIddictScopeStoreResolver resolver,
+        [NotNull] IOpenIddictScopeStore<OpenIddictScopeModel> resolver,
        AbpOpenIddictIdentifierConverter identifierConverter)
        : base(cache, logger, options, resolver)
    {
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/AbpTokenManager.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Tokens/AbpTokenManager.cs
@ -16,7 +16,7 @@ public class AbpTokenManager : OpenIddictTokenManager<OpenIddictTokenModel>
        [NotNull] [ItemNotNull] IOpenIddictTokenCache<OpenIddictTokenModel> cache,
        [NotNull] [ItemNotNull] ILogger<OpenIddictTokenManager<OpenIddictTokenModel>> logger,
        [NotNull] [ItemNotNull] IOptionsMonitor<OpenIddictCoreOptions> options,
-        [NotNull] IOpenIddictTokenStoreResolver resolver,
+        [NotNull] IOpenIddictTokenStore<OpenIddictTokenModel> resolver,
        AbpOpenIddictIdentifierConverter identifierConverter)
        : base(cache, logger, options, resolver)
    {