- Add EF Core migrations for initial schema (clubs, members, work_items, shifts, shift_signups) - Implement RLS policies with SET LOCAL for tenant isolation - Add Finbuckle multi-tenant middleware with ClaimStrategy + HeaderStrategy fallback - Create TenantValidationMiddleware to enforce JWT claims match X-Tenant-Id header - Add tenant-aware DB interceptors (SaveChangesTenantInterceptor, TenantDbConnectionInterceptor) - Configure AppDbContext with tenant scoping and RLS support - Add test infrastructure: CustomWebApplicationFactory, TestAuthHandler, DatabaseFixture - Write TDD integration tests for multi-tenant isolation and RLS enforcement - Add health check null safety for connection string Tasks: 7 (PostgreSQL schema + migrations + RLS), 8 (Finbuckle multi-tenancy + validation), 12 (test infrastructure)
71 lines
2.3 KiB
C#
71 lines
2.3 KiB
C#
using Finbuckle.MultiTenant;
|
|
using Finbuckle.MultiTenant.Abstractions;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.EntityFrameworkCore.Diagnostics;
|
|
using Microsoft.Extensions.Logging;
|
|
using WorkClub.Domain.Interfaces;
|
|
|
|
namespace WorkClub.Infrastructure.Data.Interceptors;
|
|
|
|
public class SaveChangesTenantInterceptor : SaveChangesInterceptor
|
|
{
|
|
private readonly IMultiTenantContextAccessor _tenantAccessor;
|
|
private readonly ILogger<SaveChangesTenantInterceptor> _logger;
|
|
|
|
public SaveChangesTenantInterceptor(
|
|
IMultiTenantContextAccessor tenantAccessor,
|
|
ILogger<SaveChangesTenantInterceptor> logger)
|
|
{
|
|
_tenantAccessor = tenantAccessor;
|
|
_logger = logger;
|
|
}
|
|
|
|
public override ValueTask<InterceptionResult<int>> SavingChangesAsync(
|
|
DbContextEventData eventData,
|
|
InterceptionResult<int> result,
|
|
CancellationToken cancellationToken = default)
|
|
{
|
|
SetTenantIdForNewEntities(eventData.Context);
|
|
return base.SavingChangesAsync(eventData, result, cancellationToken);
|
|
}
|
|
|
|
public override InterceptionResult<int> SavingChanges(
|
|
DbContextEventData eventData,
|
|
InterceptionResult<int> result)
|
|
{
|
|
SetTenantIdForNewEntities(eventData.Context);
|
|
return base.SavingChanges(eventData, result);
|
|
}
|
|
|
|
private void SetTenantIdForNewEntities(DbContext? context)
|
|
{
|
|
if (context == null) return;
|
|
|
|
var tenantId = _tenantAccessor.MultiTenantContext?.TenantInfo?.Identifier;
|
|
|
|
if (string.IsNullOrWhiteSpace(tenantId))
|
|
{
|
|
_logger.LogWarning("No tenant context available for SaveChanges");
|
|
return;
|
|
}
|
|
|
|
var addedEntries = context.ChangeTracker
|
|
.Entries()
|
|
.Where(e => e.State == EntityState.Added && e.Entity is ITenantEntity)
|
|
.ToList();
|
|
|
|
foreach (var entry in addedEntries)
|
|
{
|
|
if (entry.Entity is ITenantEntity tenantEntity)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(tenantEntity.TenantId))
|
|
{
|
|
tenantEntity.TenantId = tenantId;
|
|
_logger.LogDebug("Set TenantId for entity {EntityType}: {TenantId}",
|
|
entry.Entity.GetType().Name, tenantId);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|