feat: add nongeneric IMultiTenantContext for flexibility

Finbuckle · Jan 21, 2023 · b3a198f · b3a198f
1 parent 688d09b
commit b3a198f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/src/Finbuckle.MultiTenant/Abstractions/IMultiTenantContext.cs b/src/Finbuckle.MultiTenant/Abstractions/IMultiTenantContext.cs
@@ -3,6 +3,12 @@
 
 namespace Finbuckle.MultiTenant
 {
+    public interface IMultiTenantContext
+    {
+        ITenantInfo? TenantInfo { get; }
+        StrategyInfo? StrategyInfo { get; }
+    }
+
     public interface IMultiTenantContext<T>
         where T : class, ITenantInfo, new()
     {

diff --git a/src/Finbuckle.MultiTenant/Abstractions/IMultiTenantContextAccessor.cs b/src/Finbuckle.MultiTenant/Abstractions/IMultiTenantContextAccessor.cs
@@ -5,7 +5,7 @@ namespace Finbuckle.MultiTenant
 {
     public interface IMultiTenantContextAccessor
     {
-        object? MultiTenantContext { get; set; }
+        IMultiTenantContext? MultiTenantContext { get; set; }
     }
 
     public interface IMultiTenantContextAccessor<T> where T : class, ITenantInfo, new()

diff --git a/src/Finbuckle.MultiTenant/Abstractions/ITenantResolver.cs b/src/Finbuckle.MultiTenant/Abstractions/ITenantResolver.cs
@@ -8,7 +8,7 @@ namespace Finbuckle.MultiTenant
 {
     public interface ITenantResolver
     {
-        Task<object?> ResolveAsync(object context);
+        Task<IMultiTenantContext?> ResolveAsync(object context);
     }
 
     public interface ITenantResolver<T>

diff --git a/src/Finbuckle.MultiTenant/Internal/MultiTenantContextAccessor.cs b/src/Finbuckle.MultiTenant/Internal/MultiTenantContextAccessor.cs
@@ -23,9 +23,9 @@ public IMultiTenantContext<T>? MultiTenantContext
             }
         }
 
-        object? IMultiTenantContextAccessor.MultiTenantContext
+        IMultiTenantContext? IMultiTenantContextAccessor.MultiTenantContext
         {
-            get => MultiTenantContext;
+            get => MultiTenantContext as IMultiTenantContext;
             set => MultiTenantContext = value as IMultiTenantContext<T> ?? MultiTenantContext;
         }
     }

diff --git a/src/Finbuckle.MultiTenant/MultiTenantContext.cs b/src/Finbuckle.MultiTenant/MultiTenantContext.cs
@@ -6,11 +6,13 @@ namespace Finbuckle.MultiTenant
     /// <summary>
     /// Contains information for the multitenant tenant, store, and strategy.
     /// </summary>
-    public class MultiTenantContext<T> : IMultiTenantContext<T>
+    public class MultiTenantContext<T> : IMultiTenantContext<T>, IMultiTenantContext
         where T : class, ITenantInfo, new()
     {
         public T? TenantInfo { get; set; }
         public StrategyInfo? StrategyInfo { get; set; }
         public StoreInfo<T>? StoreInfo { get; set; }
+
+        ITenantInfo? IMultiTenantContext.TenantInfo => TenantInfo;
     }
 }
diff --git a/src/Finbuckle.MultiTenant/TenantResolver.cs b/src/Finbuckle.MultiTenant/TenantResolver.cs
@@ -81,10 +81,9 @@ await options.CurrentValue.Events.OnTenantResolved(new TenantResolvedContext { C
             return result;
         }
 
-        async Task<object?> ITenantResolver.ResolveAsync(object context)
+        async Task<IMultiTenantContext?> ITenantResolver.ResolveAsync(object context)
         {
-            var multiTenantContext = await ResolveAsync(context);
-            return multiTenantContext;
+            return (await ResolveAsync(context)) as IMultiTenantContext;
         }
     }
 }