From 9b4ff45b6e6dba0a2c732e9def9d8267ea9f577b Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 13 Sep 2023 20:07:02 +0200
Subject: [PATCH] frontend-app-api: add extension input validation

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/wiring/createExtensionInstance.ts     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/frontend-app-api/src/wiring/createExtensionInstance.ts b/packages/frontend-app-api/src/wiring/createExtensionInstance.ts
index 3ebf0b10e0..4a6addd033 100644
--- a/packages/frontend-app-api/src/wiring/createExtensionInstance.ts
+++ b/packages/frontend-app-api/src/wiring/createExtensionInstance.ts
@@ -41,10 +41,15 @@ export interface ExtensionInstance {
 function resolveInputData(
   dataMap: AnyExtensionDataMap,
   attachment: ExtensionInstance,
+  inputName: string,
 ) {
   return mapValues(dataMap, ref => {
     const value = attachment.getData(ref);
-    // TODO: validate input data presence
+    if (value === undefined && !ref.config.optional) {
+      throw new Error(
+        `input '${inputName}' did not receive required extension data '${ref.id}' from extension '${attachment.id}'`,
+      );
+    }
     return value;
   });
 }
@@ -70,11 +75,15 @@ function resolveInputs(
         }
         throw Error(`input '${inputName}' is required but was not received`);
       }
-      return resolveInputData(input.extensionData, attachedInstances[0]);
+      return resolveInputData(
+        input.extensionData,
+        attachedInstances[0],
+        inputName,
+      );
     }
 
     return attachedInstances.map(attachment =>
-      resolveInputData(input.extensionData, attachment),
+      resolveInputData(input.extensionData, attachment, inputName),
     );
   });
 }
@@ -94,7 +103,7 @@ export function createExtensionInstance(options: {
     parsedConfig = extension.configSchema?.parse(config ?? {});
   } catch (e) {
     throw new Error(
-      `Invalid configuration for extension instance '${extension.id}', ${e}`,
+      `Invalid configuration for extension '${extension.id}', ${e}`,
     );
   }
 
@@ -107,7 +116,7 @@ export function createExtensionInstance(options: {
           const ref = extension.output[name];
           if (!ref) {
             throw new Error(
-              `Extension instance '${extension.id}' tried to bind unknown output '${name}'`,
+              `Extension '${extension.id}' tried to bind unknown output '${name}'`,
             );
           }
           extensionData.set(ref.id, output);
@@ -117,7 +126,7 @@ export function createExtensionInstance(options: {
     });
   } catch (e) {
     throw new Error(
-      `Failed to instantiate extension instance '${extension.id}', ${
+      `Failed to instantiate extension '${extension.id}', ${
         e.name === 'Error' ? e.message : e
       }`,
     );