From a89efa74e85b640b5b2ec8c302d18d33860d38d5 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 13 Aug 2025 09:15:48 +0800 Subject: [PATCH] Use `IdentityModel` in `IdentityServer` module. --- .../Volo/Abp/IdentityServer/AbpClaimsService.cs | 2 +- .../Abp/IdentityServer/AbpIdentityServerBuilderExtensions.cs | 2 +- .../AspNetIdentity/AbpResourceOwnerPasswordValidator.cs | 2 +- .../Abp/IdentityServer/AspNetIdentity/AbpUserClaimsFactory.cs | 2 +- .../Volo/Abp/IdentityServer/Devices/DeviceFlowStore.cs | 2 +- .../Volo/Abp/IdentityServer/Devices/DeviceFlowStore_Tests.cs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsService.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsService.cs index 9440445e37..c3caa48971 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsService.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpClaimsService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Security.Claims; -using Duende.IdentityModel; +using IdentityModel; using IdentityServer4.Services; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerBuilderExtensions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerBuilderExtensions.cs index e00b687b6f..10d1b2972d 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerBuilderExtensions.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerBuilderExtensions.cs @@ -3,7 +3,7 @@ using System.IdentityModel.Tokens.Jwt; using System.IO; using System.Linq; using System.Security.Cryptography; -using Duende.IdentityModel; +using IdentityModel; using IdentityServer4; using IdentityServer4.Configuration; using IdentityServer4.Services; diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs index d399888257..d4e0fb5490 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Resources; using System.Security.Claims; using System.Threading.Tasks; -using Duende.IdentityModel; +using IdentityModel; using IdentityServer4.AspNetIdentity; using IdentityServer4.Events; using IdentityServer4.Models; diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpUserClaimsFactory.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpUserClaimsFactory.cs index 1182c00ad3..f626576dd3 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpUserClaimsFactory.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpUserClaimsFactory.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Security.Claims; using System.Security.Principal; using System.Threading.Tasks; -using Duende.IdentityModel; +using IdentityModel; using Microsoft.AspNetCore.Identity; using Microsoft.IdentityModel.JsonWebTokens; using Volo.Abp.DependencyInjection; diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowStore.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowStore.cs index 1bdc58026f..e86bdad16b 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowStore.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowStore.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using Duende.IdentityModel; +using IdentityModel; using IdentityServer4.Models; using IdentityServer4.Stores; using IdentityServer4.Stores.Serialization; diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/Devices/DeviceFlowStore_Tests.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/Devices/DeviceFlowStore_Tests.cs index 5311ac0a48..eaaebd3e23 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/Devices/DeviceFlowStore_Tests.cs +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/Devices/DeviceFlowStore_Tests.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Duende.IdentityModel; +using IdentityModel; using IdentityServer4.Models; using IdentityServer4.Stores; using Shouldly;