Skip to content

Commit

Permalink
feat: rename classes
Browse files Browse the repository at this point in the history
  • Loading branch information
ksavosteev committed Jan 10, 2024
1 parent 7f6879f commit e8db4d8
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace VirtoCommerce.Platform.Security.Services
{
public class TokenLoginValidator : ITokenLoginValidator
public class BaseUserSignInValidator : IUserSignInValidator
{
public int Priority { get; set; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace VirtoCommerce.Platform.Security.Services
{
public interface ITokenLoginValidator
public interface IUserSignInValidator
{
public int Priority { get; set; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class AuthorizationController : Controller
private readonly UserManager<ApplicationUser> _userManager;
private readonly PasswordLoginOptions _passwordLoginOptions;
private readonly IEventPublisher _eventPublisher;
private readonly IEnumerable<ITokenLoginValidator> _tokenLoginValidators;
private readonly IEnumerable<IUserSignInValidator> _userSignInValidators;

private UserManager<ApplicationUser> UserManager => _signInManager.UserManager;

Expand All @@ -43,15 +43,15 @@ public AuthorizationController(
UserManager<ApplicationUser> userManager,
IOptions<PasswordLoginOptions> passwordLoginOptions,
IEventPublisher eventPublisher,
IEnumerable<ITokenLoginValidator> tokenLoginValidators)
IEnumerable<IUserSignInValidator> userSignInValidators)
{
_applicationManager = applicationManager;
_identityOptions = identityOptions.Value;
_passwordLoginOptions = passwordLoginOptions.Value ?? new PasswordLoginOptions();
_signInManager = signInManager;
_userManager = userManager;
_eventPublisher = eventPublisher;
_tokenLoginValidators = tokenLoginValidators;
_userSignInValidators = userSignInValidators;
}

#region Password, authorization code and refresh token flows
Expand Down Expand Up @@ -106,7 +106,7 @@ public async Task<ActionResult> Exchange()
{ "storeId", openIdConnectRequest.Scope },
};

foreach (var loginValidation in _tokenLoginValidators.OrderByDescending(x => x.Priority))
foreach (var loginValidation in _userSignInValidators.OrderByDescending(x => x.Priority))
{
var validationErrors = await loginValidation.ValidateUserAsync(user, result, context);
var error = validationErrors.FirstOrDefault();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static IServiceCollection AddSecurityServices(this IServiceCollection ser

services.AddTransient<IServerCertificateService, ServerCertificateService>();

services.AddTransient<ITokenLoginValidator, TokenLoginValidator>();
services.AddTransient<IUserSignInValidator, BaseUserSignInValidator>();

return services;
}
Expand Down

0 comments on commit e8db4d8

Please sign in to comment.