fix(identity): align JWT claim mapping and add UserId fallbacks

src/BuildingBlocks/Shared/Identity/Claims/ClaimsPrincipalExtensions.cs

@@ -1,4 +1,4 @@
-using FSH.Framework.Shared.Constants;
+using FSH.Framework.Shared.Constants;
 using System.Security.Claims;
 
 namespace FSH.Framework.Shared.Identity.Claims;
@@ -31,7 +31,9 @@ public static class ClaimsPrincipalExtensions
 
     // Retrieves the user's ID
     public static string? GetUserId(this ClaimsPrincipal principal) =>
-        principal?.FindFirstValue(ClaimTypes.NameIdentifier);
+        principal?.FindFirstValue("uid")
+        ?? principal?.FindFirstValue("sub")
+        ?? principal?.FindFirstValue(ClaimTypes.NameIdentifier);
 
     // Retrieves the user's image URL as Uri
     public static Uri? GetImageUrl(this ClaimsPrincipal principal)

src/Modules/Identity/Modules.Identity/Authorization/Jwt/ConfigureJwtBearerOptions.cs

@@ -1,4 +1,4 @@
-using FSH.Framework.Core.Exceptions;
+using FSH.Framework.Core.Exceptions;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
@@ -41,6 +41,7 @@ public void Configure(string? name, JwtBearerOptions options)
 
         options.RequireHttpsMetadata = true;
         options.SaveToken = false;
+        options.MapInboundClaims = false;
         options.TokenValidationParameters = new TokenValidationParameters
         {
             ValidateIssuerSigningKey = true,

src/Tests/Generic.Tests/Identity/ClaimsPrincipalExtensionsTests.cs

@@ -0,0 +1,68 @@
+using System.Security.Claims;
+using FSH.Framework.Shared.Identity.Claims;
+using Xunit;
+
+namespace Generic.Tests.Identity;
+
+public class ClaimsPrincipalExtensionsTests
+{
+    [Fact]
+    public void GetUserId_Should_ReturnUidClaim_WhenPresent()
+    {
+        // Arrange
+        var claims = new List<Claim> { new Claim("uid", "user-123") };
+        var principal = new ClaimsPrincipal(new ClaimsIdentity(claims));
+
+        // Act
+        var userId = principal.GetUserId();
+
+        // Assert
+        Assert.Equal("user-123", userId);
+    }
+
+    [Fact]
+    public void GetUserId_Should_ReturnSubClaim_WhenUidIsMissing()
+    {
+        // Arrange
+        var claims = new List<Claim> { new Claim("sub", "user-456") };
+        var principal = new ClaimsPrincipal(new ClaimsIdentity(claims));
+
+        // Act
+        var userId = principal.GetUserId();
+
+        // Assert
+        Assert.Equal("user-456", userId);
+    }
+
+    [Fact]
+    public void GetUserId_Should_ReturnNameIdentifier_WhenUidAndSubAreMissing()
+    {
+        // Arrange
+        var claims = new List<Claim> { new Claim(ClaimTypes.NameIdentifier, "user-789") };
+        var principal = new ClaimsPrincipal(new ClaimsIdentity(claims));
+
+        // Act
+        var userId = principal.GetUserId();
+
+        // Assert
+        Assert.Equal("user-789", userId);
+    }
+
+    [Fact]
+    public void GetUserId_Should_PrioritizeUidOverSub()
+    {
+        // Arrange
+        var claims = new List<Claim> 
+        { 
+            new Claim("uid", "priority-uid"),
+            new Claim("sub", "fallback-sub")
+        };
+        var principal = new ClaimsPrincipal(new ClaimsIdentity(claims));
+
+        // Act
+        var userId = principal.GetUserId();
+
+        // Assert
+        Assert.Equal("priority-uid", userId);
+    }
+}