Replaced nullable claim accessors with strict versions that throw exceptions if required claims are missing or invalid. Updated controller logic to use new methods and removed fallback/error handling for missing claims, ensuring stricter claim validation throughout the codebase.
78 lines
3.5 KiB
C#
78 lines
3.5 KiB
C#
using Microsoft.AspNetCore.Mvc;
|
|
using System.Security.Claims;
|
|
|
|
namespace EnvelopeGenerator.API.Extensions
|
|
{
|
|
/// <summary>
|
|
/// Provides extension methods for extracting user information from a <see cref="ClaimsPrincipal"/>.
|
|
/// </summary>
|
|
public static class SenderClaimExtensions
|
|
{
|
|
private static string GetRequiredClaimOfSender(this ClaimsPrincipal user, string claimType)
|
|
{
|
|
var value = user.FindFirstValue(claimType);
|
|
if (value is not null)
|
|
{
|
|
return value;
|
|
}
|
|
|
|
var identity = user.Identity;
|
|
var principalName = identity?.Name ?? "(anonymous)";
|
|
var authType = identity?.AuthenticationType ?? "(none)";
|
|
var availableClaims = string.Join(", ", user.Claims.Select(c => $"{c.Type}={c.Value}"));
|
|
var message = $"Required claim '{claimType}' is missing for user '{principalName}' (auth: {authType}). Available claims: [{availableClaims}].";
|
|
throw new InvalidOperationException(message);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Retrieves the user's ID from the claims. Throws an exception if the ID is missing or invalid.
|
|
/// </summary>
|
|
/// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
|
|
/// <returns>The user's ID as an integer.</returns>
|
|
/// <exception cref="InvalidOperationException">Thrown if the user ID claim is missing or invalid.</exception>
|
|
public static int GetId(this ClaimsPrincipal user)
|
|
{
|
|
var idValue = user.FindFirstValue(ClaimTypes.NameIdentifier) ?? user.FindFirstValue("sub");
|
|
idValue ??= user.GetRequiredClaimOfSender(ClaimTypes.NameIdentifier);
|
|
|
|
if (!int.TryParse(idValue, out var result))
|
|
{
|
|
throw new InvalidOperationException("User ID claim is missing or invalid. This may indicate a misconfigured or forged JWT token.");
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Retrieves the username from the claims.
|
|
/// </summary>
|
|
/// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
|
|
/// <returns>The username as a string.</returns>
|
|
public static string GetUsername(this ClaimsPrincipal user)
|
|
=> user.GetRequiredClaimOfSender(ClaimTypes.Name);
|
|
|
|
/// <summary>
|
|
/// Retrieves the user's surname (last name) from the claims.
|
|
/// </summary>
|
|
/// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
|
|
/// <returns>The surname as a string.</returns>
|
|
public static string GetName(this ClaimsPrincipal user)
|
|
=> user.GetRequiredClaimOfSender(ClaimTypes.Surname);
|
|
|
|
/// <summary>
|
|
/// Retrieves the user's given name (first name) from the claims.
|
|
/// </summary>
|
|
/// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
|
|
/// <returns>The given name as a string.</returns>
|
|
public static string GetPrename(this ClaimsPrincipal user)
|
|
=> user.GetRequiredClaimOfSender(ClaimTypes.GivenName);
|
|
|
|
/// <summary>
|
|
/// Retrieves the user's email address from the claims.
|
|
/// </summary>
|
|
/// <param name="user">The <see cref="ClaimsPrincipal"/> representing the user.</param>
|
|
/// <returns>The email address as a string.</returns>
|
|
public static string GetEmail(this ClaimsPrincipal user)
|
|
=> user.GetRequiredClaimOfSender(ClaimTypes.Email);
|
|
}
|
|
} |