From 390a6d798269380f9eefdbb570cdcd1bda529bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 12 Oct 2020 11:16:12 +0200
Subject: [PATCH] fix(catalog-backend): actually use modified entity output
 (default namespace was broken)

---
 packages/catalog-model/src/EntityPolicies.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/catalog-model/src/EntityPolicies.ts b/packages/catalog-model/src/EntityPolicies.ts
index ca59338c16..acdfb4df2a 100644
--- a/packages/catalog-model/src/EntityPolicies.ts
+++ b/packages/catalog-model/src/EntityPolicies.ts
@@ -40,10 +40,13 @@ class AllEntityPolicies implements EntityPolicy {
   async enforce(entity: Entity): Promise<Entity> {
     let result = entity;
     for (const policy of this.policies) {
-      const output = await policy.enforce(entity);
-      if (output) {
-        result = output;
+      const output = await policy.enforce(result);
+      if (!output) {
+        throw new Error(
+          `Policy ${policy.constructor.name} did not return a result`,
+        );
       }
+      result = output;
     }
     return result;
   }
@@ -54,10 +57,10 @@ class AllEntityPolicies implements EntityPolicy {
 class AnyEntityPolicy implements EntityPolicy {
   constructor(private readonly policies: EntityPolicy[]) {}
 
-  async enforce(entity: Entity): Promise<Entity | undefined> {
+  async enforce(entity: Entity): Promise<Entity> {
     for (const policy of this.policies) {
       const output = await policy.enforce(entity);
-      if (output !== null) {
+      if (output) {
         return output;
       }
     }