Markers encoding

client/features/data-conversion.js

@@ -1,42 +1,54 @@
 import WebSocketAsPromised from 'websocket-as-promised';
 
-export const convertEventPayloadsWithRemoteEncoder = async (events, endpoint) => {
-  const headers = { 'Content-Type': 'application/json' };
+export const convertEventPayloadsWithRemoteEncoder = async (namespace, events, endpointTemplate, accessToken) => {
+  let headers = { 'Content-Type': 'application/json', 'X-Namespace': namespace };
+  if (accessToken) {
+    headers['Authorization'] = `Bearer ${accessToken}`;
+  }
   const requests = [];
+  const endpoint = endpointTemplate.replaceAll('{namespace}', namespace);
 
   events.forEach(event => {
-    let payloadsWrapper;
+    let payloadsPBs = [];
 
     if (event.details.input) {
-      payloadsWrapper = event.details.input;
-    } else if (event.details.result) {
-      payloadsWrapper = event.details.result;
+      payloadsPBs.push(event.details.input);
     }
-
-    if (!payloadsWrapper) {
-      return;
+
+    if (event.details.result) {
+      payloadsPBs.push(event.details.result);
+    }
+
+    if (event.details.details) {
+      Object.values(event.details.details).forEach(field => {
+        payloadsPBs.push(field) 
+      })
     }
 
-    requests.push(
-      fetch(`${endpoint}/decode`, { method: 'POST', headers: headers, body: JSON.stringify(payloadsWrapper) })
-        .then((response) => response.json())
-        .then((decodedPayloadsWrapper) => decodedPayloadsWrapper.payloads)
-        .then((decodedPayloads) => {
-          decodedPayloads.forEach((payload, i) => {
-            let data = window.atob(payload.data);
-            try {
-              payloadsWrapper.payloads[i] = JSON.parse(data);
-            } catch {
-              payloadsWrapper.payloads[i] = data;
-            }  
-          });
-        })
-        .catch(() => {
-          payloadsWrapper.payloads.forEach((payload) => {
-            payload.error = "Could not decode payload, remote decoder returned an error."
+    payloadsPBs.forEach(payloadsPB => {
+      requests.push(
+        fetch(`${endpoint}/decode`, { method: 'POST', headers: headers, body: JSON.stringify(payloadsPB) })
+          .then((response) => response.json())
+          .then((decodedPayloadsPB) => decodedPayloadsPB.payloads)
+          .then((decodedPayloads) => {
+            decodedPayloads.forEach((payload, i) => {
+              let data = window.atob(payload.data);
+              try {
+                decodedPayloads[i] = JSON.parse(data);
+              } catch {
+                decodedPayloads[i] = data;
+              }  
+            });
+
+            payloadsPB.payloads = decodedPayloads
+          })
+          .catch(() => {
+            payloadsPB.payloads.forEach((payload) => {
+              payload.error = "Could not decode payload, remote decoder returned an error."
+            })
           })
-        })
-    )
+      );
+    })
   })
 
   // We catch and handle errors above so no error handling needed here.

client/routes/workflow/index.vue

@@ -221,7 +221,9 @@ export default {
           }
 
           if (endpoint !== undefined) {
-            return convertEventPayloadsWithRemoteEncoder(events, endpoint).catch(error => {
+            const accessToken = this.webSettings.dataEncoder.accessToken;
+
+            return convertEventPayloadsWithRemoteEncoder(this.namespace, events, endpoint, accessToken).catch(error => {
               console.error(error);
 
               this.$emit('onNotification', {

server/config.yml

@@ -19,4 +19,5 @@ routing:
 
 # data_encoder:
   # Remote Data Encoder Endpoint
-  # endpoint: https://remote_encoder.myorg.com
+  # endpoint: https://remote_encoder.myorg.com
+  # pass_auth_token: false

server/config/index.js

@@ -5,6 +5,7 @@ const logger = require('../logger');
 
 const configPath = process.env.TEMPORAL_CONFIG_PATH || './server/config.yml';
 const dataEncoderEndpoint = process.env.TEMPORAL_DATA_ENCODER_ENDPOINT;
+const dataEncoderPassAccessToken = process.env.TEMPORAL_DATA_ENCODER_PASS_ACCESS_TOKEN ? ![false, 'false'].includes(process.env.TEMPORAL_DATA_ENCODER_PASS_ACCESS_TOKEN) : undefined;
 
 const readConfigSync = () => {
   const cfgContents = readFileSync(configPath, {
@@ -34,7 +35,8 @@ const getDataEncoderConfig = async () => {
   // Data encoder endpoint from the environment takes precedence over
   // configuration file value.
   const dataEncoderConfig = {
-    endpoint: dataEncoderEndpoint || data_encoder?.endpoint
+    endpoint: dataEncoderEndpoint || data_encoder?.endpoint,
+    passAccessToken: dataEncoderPassAccessToken || !!data_encoder?.pass_auth_token,
   }
 
   return dataEncoderConfig;

server/routes.js

@@ -367,6 +367,9 @@ router.get('/api/web-settings', async (ctx) => {
   if (ctx.session.dataEncoder?.endpoint) {
     dataEncoder.endpoint = ctx.session.dataEncoder.endpoint;
   }
+  if (dataEncoder.passAccessToken && !!ctx.state.user) {
+    dataEncoder.accessToken = ctx.state.user.accessToken;
+  }
 
   const auth = { enabled }; // only include non-sensitive data