#11 TenantManager.GetTenant by id

MetroPoliPlan/mep-backend#353 Delete vs. Authorization
marcwittke · Dec 24, 2017 · 957c553 · 957c553
1 parent 4217c90
commit 957c553
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 1 deletion.
diff --git a/src/Backend.Fx/BuildingBlocks/Repository.cs b/src/Backend.Fx/BuildingBlocks/Repository.cs
@@ -66,10 +66,11 @@ public TAggregateRoot[] GetAll()
 
         public void Delete(TAggregateRoot aggregateRoot)
         {
-            if (aggregateRoot.TenantId != tenantId.Value)
+            if (aggregateRoot.TenantId != tenantId.Value || !aggregateAuthorization.CanDelete(aggregateRoot))
             {
                 throw new System.Security.SecurityException($"You are not allowed to delete {typeof(TAggregateRoot).Name}[{aggregateRoot.Id}]");
             }
+
             DeletePersistent(aggregateRoot);
         }
 

diff --git a/src/Backend.Fx/Environment/MultiTenancy/ITenantManager.cs b/src/Backend.Fx/Environment/MultiTenancy/ITenantManager.cs
@@ -10,6 +10,7 @@ public interface ITenantManager
     {
         TenantId[] GetTenantIds();
         Tenant[] GetTenants();
+        Tenant GetTenant(TenantId id);
         bool IsActive(TenantId tenantId);
         TenantId CreateDemonstrationTenant(string name, string description, bool isDefault);
         TenantId CreateProductionTenant(string name, string description, bool isDefault);
@@ -63,6 +64,17 @@ protected void InitializeTenant(Tenant tenant)
         public abstract TenantId[] GetTenantIds();
 
         public abstract Tenant[] GetTenants();
+        public Tenant GetTenant(TenantId tenantId)
+        {
+            Tenant tenant = FindTenant(tenantId);
+
+            if (tenant == null)
+            {
+                throw new ArgumentException($"Invalid tenant Id [{tenantId.Value}]", nameof(tenantId));
+            }
+
+            return tenant;
+        }
 
         public bool IsActive(TenantId tenantId)
         {

diff --git a/src/Backend.Fx/Patterns/Authorization/AggregateAuthorization.cs b/src/Backend.Fx/Patterns/Authorization/AggregateAuthorization.cs
@@ -30,5 +30,10 @@ public virtual bool CanModify(TAggregateRoot t)
         {
             return true;
         }
+
+        public bool CanDelete(TAggregateRoot t)
+        {
+            return CanModify(t);
+        }
     }
 }
diff --git a/src/Backend.Fx/Patterns/Authorization/IAggregateAuthorization.cs b/src/Backend.Fx/Patterns/Authorization/IAggregateAuthorization.cs
@@ -27,5 +27,11 @@ public interface IAggregateAuthorization<TAggregateRoot> where TAggregateRoot :
         /// This overload is called directly before saving modification of an instance, so that you can use the instance's state for deciding.
         /// </summary>
         bool CanModify(TAggregateRoot t);
+
+        /// <summary>
+        /// Implement a guard that might disallow deleting an existing aggregate.
+        /// This overload is called directly before saving modification of an instance, so that you can use the instance's state for deciding.
+        /// </summary>
+        bool CanDelete(TAggregateRoot t);
     }
 }
diff --git a/tests/Backend.Fx.Tests/BuildingBlocks/TheRepository.cs b/tests/Backend.Fx.Tests/BuildingBlocks/TheRepository.cs
@@ -121,6 +121,23 @@ public void ThrowsOnDeleteWhenTenantIdHolderIsEmpty()
             Assert.Throws<InvalidOperationException>(() => sut.Delete(agg1));
         }
 
+        [Fact]
+        public void ThrowsOnDeleteWhenUnauthorized()
+        {
+            var authorization = A.Fake<IAggregateAuthorization<TheAggregateRoot.TestAggregateRoot>>();
+            A.CallTo(() => authorization.HasAccessExpression).Returns(agg => true);
+            A.CallTo(() => authorization.Filter(A<IQueryable<TheAggregateRoot.TestAggregateRoot>>._)).ReturnsLazily((IQueryable<TheAggregateRoot.TestAggregateRoot> q) => q);
+            A.CallTo(() => authorization.CanCreate(A<TheAggregateRoot.TestAggregateRoot>._)).Returns(true);
+            A.CallTo(() => authorization.CanDelete(A<TheAggregateRoot.TestAggregateRoot>._)).Returns(false);
+
+            var sut = new InMemoryRepository<TheAggregateRoot.TestAggregateRoot>(new InMemoryStore<TheAggregateRoot.TestAggregateRoot>(), new TenantId(234), authorization);
+
+            var agg1 = new TheAggregateRoot.TestAggregateRoot(12123123, "whatever") { TenantId = 234 };
+            sut.Store.Add(agg1.Id, agg1);
+
+            Assert.Throws<SecurityException>(() => sut.Delete(agg1));
+        }
+
         [Fact]
         public void ReturnsEmptyWhenTenantIdHolderIsEmpty()
         {
@@ -212,6 +229,7 @@ public void DeletesItemFromMyTenant()
             A.CallTo(() => authorization.HasAccessExpression).Returns(agg => true);
             A.CallTo(() => authorization.Filter(A<IQueryable<TheAggregateRoot.TestAggregateRoot>>._)).ReturnsLazily((IQueryable<TheAggregateRoot.TestAggregateRoot> q) => q);
             A.CallTo(() => authorization.CanCreate(A<TheAggregateRoot.TestAggregateRoot>._)).Returns(true);
+            A.CallTo(() => authorization.CanDelete(A<TheAggregateRoot.TestAggregateRoot>._)).Returns(true);
 
             var sut = new InMemoryRepository<TheAggregateRoot.TestAggregateRoot>(new InMemoryStore<TheAggregateRoot.TestAggregateRoot>(), new TenantId(234), authorization);