From f39082e98d0ce73e2ad3f06f4cc9c24c253cfeee Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Tue, 1 Nov 2022 09:59:50 +0800
Subject: [PATCH] Upgrade to OpenIddict 4.0 preview.

Resolve #14483
---
 .../Volo.Abp.OpenIddict.AspNetCore.csproj                 | 6 +++---
 .../Controllers/TokenController.ClientCredentials.cs      | 8 ++------
 .../OpenIddict/OpenIddictClaimsPrincipalContributor.cs    | 2 +-
 .../Volo.Abp.OpenIddict.Domain.Shared.csproj              | 2 +-
 .../Volo.Abp.OpenIddict.Domain.csproj                     | 2 +-
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj
index ac3eef6a01..2145f0b08b 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj
@@ -20,8 +20,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenIddict.Server.AspNetCore" Version="3.1.1" />
-    <PackageReference Include="OpenIddict.Validation.AspNetCore" Version="3.1.1" />
-    <PackageReference Include="OpenIddict.Validation.ServerIntegration" Version="3.1.1" />
+    <PackageReference Include="OpenIddict.Server.AspNetCore" Version="4.0.0-preview4.22517.68" />
+    <PackageReference Include="OpenIddict.Validation.AspNetCore" Version="4.0.0-preview4.22517.68" />
+    <PackageReference Include="OpenIddict.Validation.ServerIntegration" Version="4.0.0-preview4.22517.68" />
   </ItemGroup>
 </Project>
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.ClientCredentials.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.ClientCredentials.cs
index 4a853b2d9c..09f685ac83 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.ClientCredentials.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.ClientCredentials.cs
@@ -29,13 +29,9 @@ public partial class TokenController
             OpenIddictConstants.Claims.PreferredUsername, OpenIddictConstants.Claims.Role);
 
         // The Subject and PreferredUsername will be removed by <see cref="RemoveClaimsFromClientCredentialsGrantType"/>.
-
         // Use the client_id as the subject identifier.
-        identity.AddClaim(OpenIddictConstants.Claims.Subject, await ApplicationManager.GetClientIdAsync(application),
-            OpenIddictConstants.Destinations.AccessToken, OpenIddictConstants.Destinations.IdentityToken);
-
-        identity.AddClaim(OpenIddictConstants.Claims.PreferredUsername, await ApplicationManager.GetDisplayNameAsync(application),
-            OpenIddictConstants.Destinations.AccessToken, OpenIddictConstants.Destinations.IdentityToken);
+        identity.AddClaim(OpenIddictConstants.Claims.Subject, await ApplicationManager.GetClientIdAsync(application));
+        identity.AddClaim(OpenIddictConstants.Claims.PreferredUsername, await ApplicationManager.GetDisplayNameAsync(application));
 
         // Note: In the original OAuth 2.0 specification, the client credentials grant
         // doesn't return an identity token, which is an OpenID Connect concept.
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/OpenIddictClaimsPrincipalContributor.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/OpenIddictClaimsPrincipalContributor.cs
index e951e1ffdd..96a9ad1520 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/OpenIddictClaimsPrincipalContributor.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/OpenIddictClaimsPrincipalContributor.cs
@@ -36,7 +36,7 @@ public class OpenIddictClaimsPrincipalContributor : IAbpClaimsPrincipalContribut
                 var clientId = httpContext.GetOpenIddictServerRequest()?.ClientId;
                 if (clientId != null)
                 {
-                    identity.AddClaim(OpenIddictConstants.Claims.ClientId, clientId, OpenIddictConstants.Destinations.AccessToken);
+                    identity.AddClaim(OpenIddictConstants.Claims.ClientId, clientId);
                 }
             }
         }
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj
index 2644d555f4..cc6d461740 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenIddict.Abstractions" Version="3.1.1" />
+    <PackageReference Include="OpenIddict.Abstractions" Version="4.0.0-preview4.22517.68" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftPackageVersion)" />
   </ItemGroup>
 
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj
index c5e73ae294..d9edb84fcc 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenIddict.Core" Version="3.1.1" />
+    <PackageReference Include="OpenIddict.Core" Version="4.0.0-preview4.22517.68" />
   </ItemGroup>
 
 </Project>