Removed setUserLockout from PartnerUI

This commit is contained in:
2026-10-24 11:39:47 +02:00
parent 3316fc0275
commit 7220700bac
6 changed files with 67 additions and 177 deletions
@@ -1,4 +1,4 @@
namespace PostFundManagement.Application.Extensions;
namespace PostFundManagement.Application.Extensions;
public static class General
{
@@ -16,7 +16,8 @@ public static class General
public static (bool Decoded, Guid userId) GetUserId(this ClaimsPrincipal principal)
{
var subClaim = principal.FindFirst(JwtRegisteredClaimNames.Sub)?.Value ?? principal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
var subClaim = principal.FindFirst(JwtRegisteredClaimNames.Sub)?.Value
?? principal.FindFirst(ClaimTypes.NameIdentifier)?.Value;
var decoded = Guid.TryParse(subClaim, out var userId);
@@ -25,20 +26,34 @@ public static class General
public static (bool Decoded, string email) GetUserEmail(this ClaimsPrincipal principal)
{
var emailClaim = principal.FindFirst("email")?.Value ?? principal.FindFirst(ClaimTypes.Email)?.Value;
var emailClaim = principal.FindFirst("email")?.Value
?? principal.FindFirst(ClaimTypes.Email)?.Value
?? principal.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress")?.Value
?? principal.FindFirst("preferred_username")?.Value
?? principal.FindFirst("name")?.Value
?? principal.FindFirst(ClaimTypes.Name)?.Value;
var decoded = !string.IsNullOrWhiteSpace(emailClaim);
return (decoded, emailClaim!);
return (decoded, emailClaim ?? string.Empty);
}
public static (bool Decoded, string role) GetUserRole(this ClaimsPrincipal principal)
{
var roleClaim = principal.FindFirst("role")?.Value ?? principal.FindFirst(ClaimTypes.Role)?.Value;
var roleClaims = principal.FindAll("role")
.Concat(principal.FindAll(ClaimTypes.Role))
.Concat(principal.FindAll("http://schemas.microsoft.com/ws/2008/06/identity/claims/role"))
.Concat(principal.FindAll("roles"))
.Select(c => c.Value)
.Where(v => !string.IsNullOrWhiteSpace(v))
.ToList();
var decoded = !string.IsNullOrWhiteSpace(roleClaim);
var partnerRole = roleClaims.FirstOrDefault(r => r.Equals("Partner", StringComparison.OrdinalIgnoreCase));
var role = partnerRole ?? roleClaims.FirstOrDefault();
return (decoded, roleClaim!);
var decoded = !string.IsNullOrWhiteSpace(role);
return (decoded, role ?? string.Empty);
}
public static Microsoft.AspNetCore.Mvc.ProblemDetails ToProblems(this IReadOnlyList<IError> errors, int statusCode = StatusCodes.Status400BadRequest) => new()