mirror of
https://github.com/bitwarden/server
synced 2026-01-02 00:23:40 +00:00
fix(auth-validator): [PM-22975] Client Version Validator - Renamed validator to make more sense.
This commit is contained in:
@@ -273,7 +273,7 @@ public abstract class BaseRequestValidator<T> where T : class
|
||||
// validation to perform the recovery as part of scheme validation based on the request.
|
||||
return
|
||||
[
|
||||
() => ValidateUserViaAppropriateValidatorContextAsync(context, validatorContext),
|
||||
() => ValidateGrantSpecificContext(context, validatorContext),
|
||||
() => ValidateClientVersionAsync(context, validatorContext),
|
||||
() => ValidateTwoFactorAsync(context, request, validatorContext),
|
||||
() => ValidateSsoAsync(context, request, validatorContext),
|
||||
@@ -287,7 +287,7 @@ public abstract class BaseRequestValidator<T> where T : class
|
||||
// The typical validation scenario.
|
||||
return
|
||||
[
|
||||
() => ValidateUserViaAppropriateValidatorContextAsync(context, validatorContext),
|
||||
() => ValidateGrantSpecificContext(context, validatorContext),
|
||||
() => ValidateClientVersionAsync(context, validatorContext),
|
||||
() => ValidateSsoAsync(context, request, validatorContext),
|
||||
() => ValidateTwoFactorAsync(context, request, validatorContext),
|
||||
@@ -364,7 +364,7 @@ public abstract class BaseRequestValidator<T> where T : class
|
||||
/// <param name="context">The current request context.</param>
|
||||
/// <param name="validatorContext"><see cref="Bit.Identity.IdentityServer.CustomValidatorRequestContext" /></param>
|
||||
/// <returns>true if the scheme successfully passed validation, otherwise false.</returns>
|
||||
private async Task<bool> ValidateUserViaAppropriateValidatorContextAsync(T context, CustomValidatorRequestContext validatorContext)
|
||||
private async Task<bool> ValidateGrantSpecificContext(T context, CustomValidatorRequestContext validatorContext)
|
||||
{
|
||||
var valid = await ValidateContextAsync(context, validatorContext);
|
||||
var user = validatorContext.User;
|
||||
|
||||
@@ -74,7 +74,6 @@ public class ResourceOwnerPasswordValidator : BaseRequestValidator<ResourceOwner
|
||||
|
||||
public async Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
|
||||
{
|
||||
|
||||
var user = await _userManager.FindByEmailAsync(context.UserName.ToLowerInvariant());
|
||||
// We want to keep this device around incase the device is new for the user
|
||||
var requestDevice = DeviceValidator.GetDeviceFromRequest(context.Request);
|
||||
|
||||
Reference in New Issue
Block a user