Skip to content

Commit fc507a4

Browse files
comment(register): [PM-27084] Account Register Uses New Data Types - Fixed error in register finish model validation.
1 parent 67ff0da commit fc507a4

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

src/Core/Auth/Models/Api/Request/Accounts/RegisterFinishRequestModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
199199
IEnumerable<ValidationResult> kdfValidationResults;
200200
if (MasterPasswordUnlock != null && MasterPasswordAuthentication != null)
201201
{
202-
kdfValidationResults = KdfSettingsValidator.Validate(MasterPasswordUnlock?.ToData() ?? throw new InvalidOperationException("Error Here"));
202+
kdfValidationResults = KdfSettingsValidator.Validate(MasterPasswordUnlock.ToData().Kdf);
203203
}
204204
else
205205
{

src/Core/Utilities/KdfSettingsValidator.cs

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,33 +37,6 @@ public static IEnumerable<ValidationResult> Validate(KdfType kdfType, int kdfIte
3737
}
3838
}
3939

40-
public static IEnumerable<ValidationResult> Validate(MasterPasswordUnlockData masterPasswordUnlockData)
41-
{
42-
switch (masterPasswordUnlockData.Kdf.KdfType)
43-
{
44-
case KdfType.PBKDF2_SHA256:
45-
if (!AuthConstants.PBKDF2_ITERATIONS.InsideRange(masterPasswordUnlockData.Kdf.Iterations))
46-
{
47-
yield return new ValidationResult($"KDF iterations must be between {AuthConstants.PBKDF2_ITERATIONS.Min} and {AuthConstants.PBKDF2_ITERATIONS.Max}.");
48-
}
49-
break;
50-
case KdfType.Argon2id:
51-
if (!AuthConstants.ARGON2_ITERATIONS.InsideRange(masterPasswordUnlockData.Kdf.Iterations))
52-
{
53-
yield return new ValidationResult($"Argon2 iterations must be between {AuthConstants.ARGON2_ITERATIONS.Min} and {AuthConstants.ARGON2_ITERATIONS.Max}.");
54-
}
55-
else if (!masterPasswordUnlockData.Kdf.Memory.HasValue || !AuthConstants.ARGON2_MEMORY.InsideRange(masterPasswordUnlockData.Kdf.Memory.Value))
56-
{
57-
yield return new ValidationResult($"Argon2 memory must be between {AuthConstants.ARGON2_MEMORY.Min}mb and {AuthConstants.ARGON2_MEMORY.Max}mb.");
58-
}
59-
else if (!masterPasswordUnlockData.Kdf.Parallelism.HasValue || !AuthConstants.ARGON2_PARALLELISM.InsideRange(masterPasswordUnlockData.Kdf.Parallelism.Value))
60-
{
61-
yield return new ValidationResult($"Argon2 parallelism must be between {AuthConstants.ARGON2_PARALLELISM.Min} and {AuthConstants.ARGON2_PARALLELISM.Max}.");
62-
}
63-
break;
64-
}
65-
}
66-
6740
public static IEnumerable<ValidationResult> Validate(KdfSettings settings)
6841
{
6942
return Validate(settings.KdfType, settings.Iterations, settings.Memory, settings.Parallelism);

0 commit comments

Comments
 (0)