@izara_project/izara-core-library-asynchronous-flow 1.0.5 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-asynchronous-flow",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Shared asynchronous flow logic",
   "main": "index.js",
   "scripts": {

package/src/AsyncFlowSharedLib.js

@@ -817,21 +817,24 @@ module.exports.validateStartKeyParam = (
   _izContext,
   startKey,
   partitionKeyFieldName,
-  sortKeyFieldName = null
+  sortKeyFieldName
 ) => {
+  const stringNotEmptyRegex = /^[A-Za-z0-9_-]+$/;
+
+  if (
+    !partitionKeyFieldName || !sortKeyFieldName
+    || !stringNotEmptyRegex.test(partitionKeyFieldName)
+    || !stringNotEmptyRegex.test(sortKeyFieldName)
+  ) {
+    throw new NoRetryError("validateStartKeyParam: Invalid partitionKeyFieldName or sortKeyFieldName");
+  }
 
   if (startKey && Object.keys(startKey).length != 0) {
-    if (
-      startKey.constructor !== Object ||
-      !startKey[partitionKeyFieldName]
-    ) {
-      startKey = false; // we can type check for false to see if invalid
-    }
-    if (sortKeyFieldName !== null && sortKeyFieldName !== undefined && !startKey[sortKeyFieldName]) {
-      startKey = false;
+    if (!startKey[partitionKeyFieldName] || !startKey[sortKeyFieldName]) {
+      throw new NoRetryError("validateStartKeyParam: Invalid startKey, missing partitionKeyFieldName or sortKeyFieldName");
     }
   } else {
-    startKey = null; // if empty set to null so lib functions process correctly (not want empty object)
+    startKey = null; // if empty set to null so lib functions process correctly
   }
 
   return startKey;