@digitalbazaar/oid4-client 3.7.0 → 4.0.0

package/lib/OID4Client.js

@@ -178,7 +178,7 @@ export class OID4Client {
         }
       }
 
-      // wallet / client receives credential:
+      // wallet / client receives credential(s):
       /* Note: The credential is not wrapped here in a VP in the current spec:
 
       HTTP/1.1 200 OK
@@ -186,10 +186,17 @@ export class OID4Client {
         Cache-Control: no-store
 
       {
-        "format": "ldp_vc"
+        "format": "ldp_vc",
         "credential" : {...}
       }
 
+      OR (if multiple VCs *of the same type* were issued)
+
+      {
+        "format": "ldp_vc",
+        "credentials" : {...}
+      }
+
       OR (if multiple `requests` were given)
 
       {

package/lib/oid4vp.js

@@ -446,7 +446,9 @@ function _filterToValue({filter, strict = false}) {
     partial support as it will be treated as a simple string not a regex; regex
     is a DoS attack vector
 
-  `array`: with `items` or `contains` where uses a `string` filter
+  `array`: with `contains` where uses a `string` filter
+
+  `allOf`: supported only with the above schemas present in it.
 
   */
   let value;
@@ -455,14 +457,18 @@ function _filterToValue({filter, strict = false}) {
   if(type === 'array') {
     if(filter.contains) {
       if(Array.isArray(filter.contains)) {
-        value = filter.contains.map(filter => _filterToValue({filter, strict}));
-      } else {
-        value = _filterToValue({filter: filter.contains, strict});
+        return filter.contains.map(filter => _filterToValue({filter, strict}));
       }
-    } else if(strict) {
+      return _filterToValue({filter: filter.contains, strict});
+    }
+    if(Array.isArray(filter.allOf) && filter.allOf.every(f => f.contains)) {
+      return filter.allOf.map(
+        f => _filterToValue({filter: f.contains, strict}));
+    }
+    if(strict) {
       throw new Error(
-        'Unsupported filter; array filters must use "enum" or "contains" ' +
-        'with a string filter.');
+        'Unsupported filter; array filters must use "allOf" and/or ' +
+        '"contains" with a string filter.');
     }
     return value;
   }
@@ -584,9 +590,11 @@ export function _fromQueryByExampleQuery({credentialQuery, prefixJwtVcPath}) {
     const filter = {};
     if(Array.isArray(value)) {
       filter.type = 'array';
-      filter.contains = value.map(v => ({
-        type: 'string',
-        const: v
+      filter.allOf = value.map(v => ({
+        contains: {
+          type: 'string',
+          const: v
+        }
       }));
     } else if(key === 'type') {
       // special provision for array/string for `type`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalbazaar/oid4-client",
-  "version": "3.7.0",
+  "version": "4.0.0",
   "description": "An OID4 (VC + VP) client",
   "homepage": "https://github.com/digitalbazaar/oid4-client",
   "author": {