@docknetwork/wallet-sdk-wasm 1.4.0 → 1.5.6

package/lib/services/credential/pex-helpers.js

@@ -4,13 +4,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsonpath = require('@astronautlabs/jsonpath');
 
-const EPSILON_NUMBER = 0.0001;
+const EPSILON_NUMBER = 0.001;
 const EPSILON_INT = 1;
 
 const MAX_DATE_PLACEHOLDER = 884541351600000;
 const MIN_DATE_PLACEHOLDER = -17592186044415;
-const MAX_NUMBER = 100 ** 9;
-const MIN_NUMBER = -4294967295;
+const MAX_INTEGER = 100 ** 9;
+const MIN_INTEGER = -4294967295;
+const MAX_NUMBER = 100 ** 5;
+const MIN_NUMBER = -4294967294;
 
 /*
   PEX Filter rules:
@@ -25,6 +27,15 @@ function correctFieldPath(path) {
   return path.replace('$.', '');
 }
 
+function getNumDecimalPlaces(n) {
+  const parts = n.toString().split('.');
+  return parts.length > 1 && parts[1].length;
+}
+
+function toMaxDecimalPlaces(n, maxDecimalPlaces) {
+  return +n.toFixed(maxDecimalPlaces);
+}
+
 function getAttributeName({field, selectedCredentials, index}) {
   let attributeName;
   if (Array.isArray(field.path) && field.path.length > 1) {
@@ -56,18 +67,40 @@ function getAttributeName({field, selectedCredentials, index}) {
 function pexToBounds(
   pexRequest,
   selectedCredentials = [],
-  isRawBoundies = false,
+  removeFromRequest = false,
 ) {
   const descriptorBounds = [];
-  const [MIN_DATE_ADJ, MAX_DATE_ADJ, MIN_NUMBER_ADJ, MAX_NUMBER_ADJ] = [
-    MIN_DATE_PLACEHOLDER,
-    MAX_DATE_PLACEHOLDER,
-    MIN_NUMBER,
-    MAX_NUMBER,
-  ].map(value => (isRawBoundies ? undefined : value));
+  const fieldsToRemove = [];
 
   // One list of bounds per descriptor/credential
   pexRequest.input_descriptors.forEach((inputDescriptor, index) => {
+    const selectedCredential = selectedCredentials[index];
+    if (!selectedCredential) {
+      return;
+    }
+
+    // Get embedded schema if existing
+    let decodedSchema = {};
+    if (selectedCredential.credentialSchema) {
+      const schemaStartStr = 'data:application/json;charset=utf-8,';
+
+      if (selectedCredential.credentialSchema.details) {
+        decodedSchema =
+          JSON.parse(selectedCredential.credentialSchema.details).jsonSchema ||
+          {};
+      } else if (
+        selectedCredential.credentialSchema.id &&
+        selectedCredential.credentialSchema.id.startsWith(schemaStartStr)
+      ) {
+        // LEGACY embedded schema handling
+        decodedSchema = JSON.parse(
+          decodeURIComponent(
+            selectedCredential.credentialSchema.id.split(schemaStartStr)[1],
+          ),
+        );
+      }
+    }
+
     const bounds = [];
     inputDescriptor.constraints.fields.forEach(field => {
       const {
@@ -81,6 +114,44 @@ function pexToBounds(
         type,
       } = field.filter || {};
 
+      if (!field.path || field.path.length === 0) {
+        throw new Error(
+          'Missing or empty field "path" property, expected array or string',
+        );
+      }
+
+      let attributeName;
+      if (Array.isArray(field.path) && field.path.length > 1) {
+        // Must find a path that matches in selectedcredential, and choose that for bounds
+        const pathCount = field.path.length;
+        for (let i = 0; i < pathCount; i++) {
+          const path = field.path[i];
+          const paths = jsonpath.JSONPath.paths(selectedCredential, path);
+          if (paths.length) {
+            // First come first served
+            attributeName = correctFieldPath(jsonpath.JSONPath.stringify(paths[0]));
+            break;
+          }
+        }
+      } else {
+        const path = Array.isArray(field.path) ? field.path[0] : field.path;
+        attributeName = correctFieldPath(path);
+      }
+
+      if (!attributeName) {
+        return;
+      }
+
+      const schemaPath = `$.properties.${attributeName.replaceAll(
+        '.',
+        '.properties.',
+      )}`;
+      const attributeSchema = jsonpath.JSONPath.query(
+        decodedSchema,
+        schemaPath,
+        1,
+      )[0] || {type};
+
       let max =
         maximum === undefined
           ? formatMaximum === undefined
@@ -99,62 +170,89 @@ function pexToBounds(
         return;
       }
 
+      const attributeType = attributeSchema.type || type;
+
       // Get min/max bounds values, if using exclusive we must apply an epsilon so equality isnt true
       if (format === 'date-time' || format === 'date') {
-        max = max === undefined ? MAX_DATE_ADJ : max;
-        max = max ? new Date(max) : undefined;
-        min = min === undefined ? MIN_DATE_ADJ : min;
-        min = min ? new Date(min) : undefined;
-      } else if (type === 'number') {
+        max = new Date(max === undefined ? MAX_DATE_PLACEHOLDER : max);
+        min = new Date(min === undefined ? MIN_DATE_PLACEHOLDER : min);
+      } else if (attributeType === 'number') {
+        const epsilon = attributeSchema.multipleOf || EPSILON_NUMBER;
+        const attribDecimalPlaces = getNumDecimalPlaces(epsilon);
+
         max =
           max === undefined
-            ? MAX_NUMBER_ADJ
-            : exclusiveMaximum === undefined || isRawBoundies
+            ? attributeSchema.maximum === undefined
+              ? MAX_NUMBER
+              : attributeSchema.maximum
+            : exclusiveMaximum === undefined
             ? max
-            : max - EPSILON_NUMBER;
+            : max - epsilon;
         min =
           min === undefined
-            ? MIN_NUMBER_ADJ
-            : exclusiveMinimum === undefined || isRawBoundies
+            ? attributeSchema.minimum === undefined
+              ? MIN_NUMBER
+              : attributeSchema.minimum
+            : exclusiveMinimum === undefined
             ? min
-            : min + EPSILON_NUMBER;
-      } else if (type === 'integer') {
+            : min + epsilon;
+
+        // Because of floating point math sucks, sometimes we can get extra decimal points
+        // the bounds must also match the same decimal points as the input
+        // for this we read from the embedded schema
+        min = toMaxDecimalPlaces(min, attribDecimalPlaces);
+        max = toMaxDecimalPlaces(max, attribDecimalPlaces);
+      } else if (attributeType === 'integer') {
         max =
           max === undefined
-            ? MAX_NUMBER_ADJ
-            : exclusiveMaximum === undefined || isRawBoundies
+            ? attributeSchema.maximum === undefined
+              ? MAX_INTEGER
+              : attributeSchema.maximum
+            : exclusiveMaximum === undefined
             ? max
             : max - EPSILON_INT;
         min =
           min === undefined
-            ? MIN_NUMBER_ADJ
-            : exclusiveMinimum === undefined || isRawBoundies
+            ? attributeSchema.minimum === undefined
+              ? MIN_INTEGER
+              : attributeSchema.minimum
+            : exclusiveMinimum === undefined
             ? min
             : min + EPSILON_INT;
+
+        // Ensure that input values are not decimals otherwise crypto-wasm-ts will complain
+        min = Math.floor(min);
+        max = Math.floor(max);
       } else {
         throw new Error(
           `Unsupported format ${format} and type ${type} for enforce bounds`,
         );
       }
 
-      const attributeName = getAttributeName({
-        field,
-        selectedCredentials,
-        index,
-      });
+      if (removeFromRequest) {
+        fieldsToRemove.push({
+          fields: inputDescriptor.constraints.fields,
+          field,
+        });
+      }
 
       bounds.push({
         attributeName,
         min,
         max,
-        type,
-        format,
       });
     });
 
     descriptorBounds.push(bounds);
   });
 
+  fieldsToRemove.forEach(({fields, field}) => {
+    const idx = fields.indexOf(field);
+    if (idx !== -1) {
+      fields.splice(idx, 1);
+    }
+  });
+
   return descriptorBounds;
 }
 
@@ -174,7 +272,7 @@ function getPexRequiredAttributes(pexRequest, selectedCredentials = []) {
     .map((inputDescriptor, index) => {
       return inputDescriptor.constraints.fields
         .filter(field => {
-          if (field.filter) {
+          if (field.filter || field.optional) {
             return false;
           }
 
@@ -206,8 +304,10 @@ function getPexRequiredAttributes(pexRequest, selectedCredentials = []) {
 exports.EPSILON_INT = EPSILON_INT;
 exports.EPSILON_NUMBER = EPSILON_NUMBER;
 exports.MAX_DATE_PLACEHOLDER = MAX_DATE_PLACEHOLDER;
+exports.MAX_INTEGER = MAX_INTEGER;
 exports.MAX_NUMBER = MAX_NUMBER;
 exports.MIN_DATE_PLACEHOLDER = MIN_DATE_PLACEHOLDER;
+exports.MIN_INTEGER = MIN_INTEGER;
 exports.MIN_NUMBER = MIN_NUMBER;
 exports.getPexRequiredAttributes = getPexRequiredAttributes;
 exports.pexToBounds = pexToBounds;

package/lib/services/credential/pex-helpers.mjs

@@ -1,12 +1,14 @@
 import { JSONPath } from '@astronautlabs/jsonpath';
 
-const EPSILON_NUMBER = 0.0001;
+const EPSILON_NUMBER = 0.001;
 const EPSILON_INT = 1;
 
 const MAX_DATE_PLACEHOLDER = 884541351600000;
 const MIN_DATE_PLACEHOLDER = -17592186044415;
-const MAX_NUMBER = 100 ** 9;
-const MIN_NUMBER = -4294967295;
+const MAX_INTEGER = 100 ** 9;
+const MIN_INTEGER = -4294967295;
+const MAX_NUMBER = 100 ** 5;
+const MIN_NUMBER = -4294967294;
 
 /*
   PEX Filter rules:
@@ -21,6 +23,15 @@ function correctFieldPath(path) {
   return path.replace('$.', '');
 }
 
+function getNumDecimalPlaces(n) {
+  const parts = n.toString().split('.');
+  return parts.length > 1 && parts[1].length;
+}
+
+function toMaxDecimalPlaces(n, maxDecimalPlaces) {
+  return +n.toFixed(maxDecimalPlaces);
+}
+
 function getAttributeName({field, selectedCredentials, index}) {
   let attributeName;
   if (Array.isArray(field.path) && field.path.length > 1) {
@@ -52,18 +63,40 @@ function getAttributeName({field, selectedCredentials, index}) {
 function pexToBounds(
   pexRequest,
   selectedCredentials = [],
-  isRawBoundies = false,
+  removeFromRequest = false,
 ) {
   const descriptorBounds = [];
-  const [MIN_DATE_ADJ, MAX_DATE_ADJ, MIN_NUMBER_ADJ, MAX_NUMBER_ADJ] = [
-    MIN_DATE_PLACEHOLDER,
-    MAX_DATE_PLACEHOLDER,
-    MIN_NUMBER,
-    MAX_NUMBER,
-  ].map(value => (isRawBoundies ? undefined : value));
+  const fieldsToRemove = [];
 
   // One list of bounds per descriptor/credential
   pexRequest.input_descriptors.forEach((inputDescriptor, index) => {
+    const selectedCredential = selectedCredentials[index];
+    if (!selectedCredential) {
+      return;
+    }
+
+    // Get embedded schema if existing
+    let decodedSchema = {};
+    if (selectedCredential.credentialSchema) {
+      const schemaStartStr = 'data:application/json;charset=utf-8,';
+
+      if (selectedCredential.credentialSchema.details) {
+        decodedSchema =
+          JSON.parse(selectedCredential.credentialSchema.details).jsonSchema ||
+          {};
+      } else if (
+        selectedCredential.credentialSchema.id &&
+        selectedCredential.credentialSchema.id.startsWith(schemaStartStr)
+      ) {
+        // LEGACY embedded schema handling
+        decodedSchema = JSON.parse(
+          decodeURIComponent(
+            selectedCredential.credentialSchema.id.split(schemaStartStr)[1],
+          ),
+        );
+      }
+    }
+
     const bounds = [];
     inputDescriptor.constraints.fields.forEach(field => {
       const {
@@ -77,6 +110,44 @@ function pexToBounds(
         type,
       } = field.filter || {};
 
+      if (!field.path || field.path.length === 0) {
+        throw new Error(
+          'Missing or empty field "path" property, expected array or string',
+        );
+      }
+
+      let attributeName;
+      if (Array.isArray(field.path) && field.path.length > 1) {
+        // Must find a path that matches in selectedcredential, and choose that for bounds
+        const pathCount = field.path.length;
+        for (let i = 0; i < pathCount; i++) {
+          const path = field.path[i];
+          const paths = JSONPath.paths(selectedCredential, path);
+          if (paths.length) {
+            // First come first served
+            attributeName = correctFieldPath(JSONPath.stringify(paths[0]));
+            break;
+          }
+        }
+      } else {
+        const path = Array.isArray(field.path) ? field.path[0] : field.path;
+        attributeName = correctFieldPath(path);
+      }
+
+      if (!attributeName) {
+        return;
+      }
+
+      const schemaPath = `$.properties.${attributeName.replaceAll(
+        '.',
+        '.properties.',
+      )}`;
+      const attributeSchema = JSONPath.query(
+        decodedSchema,
+        schemaPath,
+        1,
+      )[0] || {type};
+
       let max =
         maximum === undefined
           ? formatMaximum === undefined
@@ -95,62 +166,89 @@ function pexToBounds(
         return;
       }
 
+      const attributeType = attributeSchema.type || type;
+
       // Get min/max bounds values, if using exclusive we must apply an epsilon so equality isnt true
       if (format === 'date-time' || format === 'date') {
-        max = max === undefined ? MAX_DATE_ADJ : max;
-        max = max ? new Date(max) : undefined;
-        min = min === undefined ? MIN_DATE_ADJ : min;
-        min = min ? new Date(min) : undefined;
-      } else if (type === 'number') {
+        max = new Date(max === undefined ? MAX_DATE_PLACEHOLDER : max);
+        min = new Date(min === undefined ? MIN_DATE_PLACEHOLDER : min);
+      } else if (attributeType === 'number') {
+        const epsilon = attributeSchema.multipleOf || EPSILON_NUMBER;
+        const attribDecimalPlaces = getNumDecimalPlaces(epsilon);
+
         max =
           max === undefined
-            ? MAX_NUMBER_ADJ
-            : exclusiveMaximum === undefined || isRawBoundies
+            ? attributeSchema.maximum === undefined
+              ? MAX_NUMBER
+              : attributeSchema.maximum
+            : exclusiveMaximum === undefined
             ? max
-            : max - EPSILON_NUMBER;
+            : max - epsilon;
         min =
           min === undefined
-            ? MIN_NUMBER_ADJ
-            : exclusiveMinimum === undefined || isRawBoundies
+            ? attributeSchema.minimum === undefined
+              ? MIN_NUMBER
+              : attributeSchema.minimum
+            : exclusiveMinimum === undefined
             ? min
-            : min + EPSILON_NUMBER;
-      } else if (type === 'integer') {
+            : min + epsilon;
+
+        // Because of floating point math sucks, sometimes we can get extra decimal points
+        // the bounds must also match the same decimal points as the input
+        // for this we read from the embedded schema
+        min = toMaxDecimalPlaces(min, attribDecimalPlaces);
+        max = toMaxDecimalPlaces(max, attribDecimalPlaces);
+      } else if (attributeType === 'integer') {
         max =
           max === undefined
-            ? MAX_NUMBER_ADJ
-            : exclusiveMaximum === undefined || isRawBoundies
+            ? attributeSchema.maximum === undefined
+              ? MAX_INTEGER
+              : attributeSchema.maximum
+            : exclusiveMaximum === undefined
             ? max
             : max - EPSILON_INT;
         min =
           min === undefined
-            ? MIN_NUMBER_ADJ
-            : exclusiveMinimum === undefined || isRawBoundies
+            ? attributeSchema.minimum === undefined
+              ? MIN_INTEGER
+              : attributeSchema.minimum
+            : exclusiveMinimum === undefined
             ? min
             : min + EPSILON_INT;
+
+        // Ensure that input values are not decimals otherwise crypto-wasm-ts will complain
+        min = Math.floor(min);
+        max = Math.floor(max);
       } else {
         throw new Error(
           `Unsupported format ${format} and type ${type} for enforce bounds`,
         );
       }
 
-      const attributeName = getAttributeName({
-        field,
-        selectedCredentials,
-        index,
-      });
+      if (removeFromRequest) {
+        fieldsToRemove.push({
+          fields: inputDescriptor.constraints.fields,
+          field,
+        });
+      }
 
       bounds.push({
         attributeName,
         min,
         max,
-        type,
-        format,
       });
     });
 
     descriptorBounds.push(bounds);
   });
 
+  fieldsToRemove.forEach(({fields, field}) => {
+    const idx = fields.indexOf(field);
+    if (idx !== -1) {
+      fields.splice(idx, 1);
+    }
+  });
+
   return descriptorBounds;
 }
 
@@ -170,7 +268,7 @@ function getPexRequiredAttributes(pexRequest, selectedCredentials = []) {
     .map((inputDescriptor, index) => {
       return inputDescriptor.constraints.fields
         .filter(field => {
-          if (field.filter) {
+          if (field.filter || field.optional) {
             return false;
           }
 
@@ -199,4 +297,4 @@ function getPexRequiredAttributes(pexRequest, selectedCredentials = []) {
     .filter(requiredAttributes => requiredAttributes.length > 0);
 }
 
-export { EPSILON_INT, EPSILON_NUMBER, MAX_DATE_PLACEHOLDER, MAX_NUMBER, MIN_DATE_PLACEHOLDER, MIN_NUMBER, getPexRequiredAttributes, pexToBounds };
+export { EPSILON_INT, EPSILON_NUMBER, MAX_DATE_PLACEHOLDER, MAX_INTEGER, MAX_NUMBER, MIN_DATE_PLACEHOLDER, MIN_INTEGER, MIN_NUMBER, getPexRequiredAttributes, pexToBounds };