Create Organisation Fix

2026-10-20 12:47:06 +02:00
parent 28a821ae91
commit d7a168c9fa
17 changed files with 527 additions and 155 deletions
@@ -1,4 +1,4 @@
-using PostFundManagement.Domain.Abstractions;
+using PostFundManagement.Domain.Abstractions;

 namespace PostFundManagement.Infrastructure.Database.Services;

@@ -17,18 +17,18 @@ public sealed class TenantContextService : ITenantContextService
    public TenantContextService(IHttpContextAccessor httpContextAccessor)
    {
        var user = httpContextAccessor.HttpContext?.User;
-            
-        IsAdmin = user?.IsInRole("Admin") == true || user?.HasClaim("role", "Admin") == true;
-        ByPassTenantQueryFilter = user?.IsInRole("Partner") == true || user?.HasClaim("role", "Partner") == true;
-
-        ByPassTenantQueryFilter = ByPassTenantQueryFilter || IsAdmin;
-
-        HasTenantFilter = !IsAdmin;

        var tenantIdClaimVal = user?.FindFirst("tenant_id")?.Value ?? user?.FindFirst("TenantId")?.Value;
        TenantId = long.TryParse(tenantIdClaimVal, out var id) ? id : 0L;

        var tenantNameClaimVal = user?.FindFirst("tenant")?.Value ?? user?.FindFirst("Tenant")?.Value;
        TenantName = !string.IsNullOrWhiteSpace(tenantNameClaimVal) ? tenantNameClaimVal : null;
+
+        IsAdmin = (user?.IsInRole("Admin") == true || user?.HasClaim("role", "Admin") == true) && TenantId == 1;
+        ByPassTenantQueryFilter = user?.IsInRole("Partner") == true || user?.HasClaim("role", "Partner") == true;
+
+        ByPassTenantQueryFilter = ByPassTenantQueryFilter || IsAdmin;
+
+        HasTenantFilter = !IsAdmin;
    }
-}
+}