Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove AttachAbpCustomChallengeErrors. #14554

Merged
merged 1 commit into from
Nov 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
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;

Expand Down Expand Up @@ -130,7 +129,6 @@ private void AddOpenIddictServer(IServiceCollection services)
builder.AddEventHandler(AbpValidatePostLogoutRedirectUriParameter.Descriptor);
}

builder.AddEventHandler(AttachAbpCustomChallengeErrors.Descriptor);
builder.AddEventHandler(RemoveClaimsFromClientCredentialsGrantType.Descriptor);

services.ExecutePreConfiguredActions(builder);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,18 @@ await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext
ClientId = request.ClientId
});

var properties = new AuthenticationProperties(new Dictionary<string, string>
{
[OpenIddictServerAspNetCoreConstants.Properties.Error] = OpenIddictConstants.Errors.InvalidGrant,
[OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] = nameof(SignInResult.RequiresTwoFactor),

["userId"] = user.Id.ToString("N"),
["twoFactorToken"] = twoFactorToken
});
var properties = new AuthenticationProperties(
items: new Dictionary<string, string>
{
[OpenIddictServerAspNetCoreConstants.Properties.Error] = OpenIddictConstants.Errors.InvalidGrant,
[OpenIddictServerAspNetCoreConstants.Properties.ErrorDescription] =
nameof(SignInResult.RequiresTwoFactor),
},
parameters: new Dictionary<string, object>
{
["userId"] = user.Id.ToString("N"),
["twoFactorToken"] = twoFactorToken
});

return Forbid(properties, OpenIddictServerAspNetCoreDefaults.AuthenticationScheme);
}
Expand Down

This file was deleted.