swcs/mixtape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2fa helpers

Browse Source
This commit is contained in:
Tobias Klika
2022-12-13 16:25:36 +01:00
parent 8f3a20e5ba
commit c5cdb0f799
11 changed files with 297 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zero/Validation/ModelStateDictionaryExtensions.cs
+67 -4
View File
@@ -1,4 +1,5 @@
using FluentValidation.Results;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc.ModelBinding;
namespace zero.Validation;
@@ -22,7 +23,7 @@ public static class ModelStateDictionaryExtensions
if (propertyName != null && removePrefixes != null && removePrefixes.Any())
{
foreach (var removePrefix in removePrefixes)
foreach (string removePrefix in removePrefixes)
{
if (propertyName.StartsWith(removePrefix, StringComparison.InvariantCultureIgnoreCase))
{
@@ -32,7 +33,7 @@ public static class ModelStateDictionaryExtensions
}
}
string key = prefix.IsNullOrEmpty() ? propertyName : (propertyName.IsNullOrEmpty() ? String.Empty : prefix + DOT + propertyName);
string key = prefix.IsNullOrEmpty() ? propertyName : (propertyName.IsNullOrEmpty() ? string.Empty : prefix + DOT + propertyName);
string message = error.ErrorMessage;
bool found = formProperties.Contains(key, StringComparer.InvariantCultureIgnoreCase);
@@ -40,17 +41,79 @@ public static class ModelStateDictionaryExtensions
if (!found && aliases != null && aliases.ContainsKey(propertyName))
{
key = aliases[propertyName];
key = prefix.IsNullOrEmpty() ? key : (key.IsNullOrEmpty() ? String.Empty : prefix + DOT + key);
key = prefix.IsNullOrEmpty() ? key : (key.IsNullOrEmpty() ? string.Empty : prefix + DOT + key);
found = formProperties.Contains(key, StringComparer.InvariantCultureIgnoreCase);
}
// move property errors to model if they are not part of the form
if (!found && convertUnresolvedPropertiesToModel)
{
key = String.Empty;
key = string.Empty;
}
modelState.AddModelError(key, message);
}
}
public static void AddToModelState<T>(this Result<T> result, ModelStateDictionary modelState, bool convertUnresolvedPropertiesToModel = true, string prefix = "Form", Dictionary<string, string> aliases = default, IEnumerable<string> removePrefixes = default)
{
if (result == null || result.IsSuccess)
{
return;
}
string[] formProperties = modelState.Keys.ToArray();
foreach (var error in result.Errors)
{
string propertyName = error.Property;
if (propertyName != null && removePrefixes != null && removePrefixes.Any())
{
foreach (string removePrefix in removePrefixes)
{
if (propertyName.StartsWith(removePrefix, StringComparison.InvariantCultureIgnoreCase))
{
propertyName = propertyName.Substring(removePrefix.Length);
break;
}
}
}
string key = prefix.IsNullOrEmpty() ? propertyName : (propertyName.IsNullOrEmpty() ? string.Empty : prefix + DOT + propertyName);
string message = error.Message;
bool found = formProperties.Contains(key, StringComparer.InvariantCultureIgnoreCase);
// find property by alias
if (!found && aliases != null && aliases.ContainsKey(propertyName))
{
key = aliases[propertyName];
key = prefix.IsNullOrEmpty() ? key : (key.IsNullOrEmpty() ? string.Empty : prefix + DOT + key);
found = formProperties.Contains(key, StringComparer.InvariantCultureIgnoreCase);
}
// move property errors to model if they are not part of the form
if (!found && convertUnresolvedPropertiesToModel)
{
key = string.Empty;
}
modelState.AddModelError(key, message);
}
}
public static void AddToModelState(this IdentityResult result, ModelStateDictionary modelState)
{
if (result == null || result.Succeeded)
{
return;
}
foreach (IdentityError error in result.Errors)
{
modelState.AddModelError(string.Empty, error.Description);
}
}
}