Merge pull request #14555 from abpframework/auto-merge/rel-6-0/1436

Merge branch dev with rel-6.0

modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/AbpOpenIddictAspNetCoreModule.cs

@@ -5,7 +5,6 @@ using OpenIddict.Server;
 using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.Modularity;
-using Volo.Abp.OpenIddict.Handlers;
 using Volo.Abp.OpenIddict.WildcardDomains;
 using Volo.Abp.Security.Claims;
 
@@ -130,7 +129,6 @@ public class AbpOpenIddictAspNetCoreModule : AbpModule
                     builder.AddEventHandler(AbpValidatePostLogoutRedirectUriParameter.Descriptor);
                 }
 
-                builder.AddEventHandler(AttachAbpCustomChallengeErrors.Descriptor);
                 builder.AddEventHandler(RemoveClaimsFromClientCredentialsGrantType.Descriptor);
 
                 services.ExecutePreConfiguredActions(builder);

modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs

@@ -193,14 +193,18 @@ public partial class TokenController
                 ClientId = request.ClientId
             });
 
-            var properties = new AuthenticationProperties(new Dictionary<string, string>
+            var properties = new AuthenticationProperties(
-            {
+                items: new Dictionary<string, string>
-                [OpenIddictServerAspNetCoreConstants.Properties.Error] = OpenIddictConstants.Errors.InvalidGrant,
+                {
-                [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] = nameof(SignInResult.RequiresTwoFactor),
+                    [OpenIddictServerAspNetCoreConstants.Properties.Error] = OpenIddictConstants.Errors.InvalidGrant,
-
+                    [OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
-                ["userId"] = user.Id.ToString("N"),
+                        nameof(SignInResult.RequiresTwoFactor),
-                ["twoFactorToken"] = twoFactorToken
+                },
-            });
+                parameters: new Dictionary<string, object>
+                {
+                    ["userId"] = user.Id.ToString("N"),
+                    ["twoFactorToken"] = twoFactorToken
+                });
 
             return Forbid(properties, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
         }

modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Handlers/AttachAbpCustomChallengeErrors.cs

@@ -1,34 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using OpenIddict.Server;
-
-namespace Volo.Abp.OpenIddict.Handlers;
-
-public class AttachAbpCustomChallengeErrors : IOpenIddictServerHandler<OpenIddictServerEvents.ProcessChallengeContext>
-{
-    private static readonly List<string> CustomChallengeErrors = new List<string>()
-    {
-        "userId",
-        "twoFactorToken"
-    };
-
-    public static OpenIddictServerHandlerDescriptor Descriptor { get; }
-        = OpenIddictServerHandlerDescriptor.CreateBuilder<OpenIddictServerEvents.ProcessChallengeContext>()
-            .UseSingletonHandler<AttachAbpCustomChallengeErrors>()
-            .SetOrder(OpenIddictServerHandlers.AttachDefaultChallengeError.Descriptor.Order + 1)
-            .SetType(OpenIddictServerHandlerType.Custom)
-            .Build();
-
-    public ValueTask HandleAsync(OpenIddictServerEvents.ProcessChallengeContext context)
-    {
-        Check.NotNull(context, nameof(context));
-
-        foreach (var property in context.Properties.Where(x => CustomChallengeErrors.Contains(x.Key)))
-        {
-            context.Response.SetParameter(property.Key, property.Value);
-        }
-
-        return default;
-    }
-}