From b6dc66744fcd991de9c90394365a5281dfe54e8d Mon Sep 17 00:00:00 2001
From: MarcWieland <marc@wieland.de>
Date: Thu, 25 Jun 2026 21:04:04 +0200
Subject: [PATCH] asynchroner tenant

---
 timetracker.Server/Data/TenantProvider.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/timetracker.Server/Data/TenantProvider.cs b/timetracker.Server/Data/TenantProvider.cs
index bd93216..643ec0a 100644
--- a/timetracker.Server/Data/TenantProvider.cs
+++ b/timetracker.Server/Data/TenantProvider.cs
@@ -37,7 +37,7 @@ public class TenantProvider : ITenantProvider
             }
 
             // Resolve and cache in HttpContext.Items
-            ResolveTenantAsync().GetAwaiter().GetResult();
+            ResolveTenant();
 
             if (httpContext.Items.TryGetValue("TenantId", out cachedId))
             {
@@ -48,27 +48,27 @@ public class TenantProvider : ITenantProvider
         }
     }
 
-    public async Task<Tenant?> GetCurrentTenantAsync()
+    public Task<Tenant?> GetCurrentTenantAsync()
     {
         var httpContext = _httpContextAccessor.HttpContext;
-        if (httpContext == null) return null;
+        if (httpContext == null) return Task.FromResult<Tenant?>(null);
 
         if (httpContext.Items.TryGetValue("CurrentTenant", out var cachedTenant))
         {
-            return (Tenant?)cachedTenant;
+            return Task.FromResult((Tenant?)cachedTenant);
         }
 
-        await ResolveTenantAsync();
+        ResolveTenant();
 
         if (httpContext.Items.TryGetValue("CurrentTenant", out cachedTenant))
         {
-            return (Tenant?)cachedTenant;
+            return Task.FromResult((Tenant?)cachedTenant);
         }
 
-        return null;
+        return Task.FromResult<Tenant?>(null);
     }
 
-    private async Task ResolveTenantAsync()
+    private void ResolveTenant()
     {
         var httpContext = _httpContextAccessor.HttpContext;
         if (httpContext == null) return;
@@ -82,9 +82,9 @@ public class TenantProvider : ITenantProvider
 
         if (!string.IsNullOrEmpty(subdomain))
         {
-            await using var db = await _dbContextFactory.CreateDbContextAsync();
-            var tenant = await db.Tenants
-                .FirstOrDefaultAsync(t => t.Subdomain.ToLower() == subdomain.ToLower());
+            using var db = _dbContextFactory.CreateDbContext();
+            var tenant = db.Tenants
+                .FirstOrDefault(t => t.Subdomain.ToLower() == subdomain.ToLower());
 
             if (tenant != null)
             {
-- 
2.45.2