Merge pull request #426 from docknetwork/feat/pass-parsing-opts-blank…

…-schema
docknetwork · May 1, 2024 · 86dc4e4 · 86dc4e4
2 parents 1100c3c + 3152edc
commit 86dc4e4
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docknetwork/sdk",
-  "version": "8.1.4",
+  "version": "8.1.5",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/src/utils/vc/crypto/common/DockCryptoSignature.js b/src/utils/vc/crypto/common/DockCryptoSignature.js
@@ -406,7 +406,7 @@ export default withExtendedStaticProperties(
       let credSchema;
       if (document.credentialSchema) {
         // schema object exists but no ID means the SDK is signalling for the suite to generate a schema
-        credSchema = new CredentialSchema(CredentialSchema.essential());
+        credSchema = new CredentialSchema(CredentialSchema.essential(), document.credentialSchema.parsingOptions);
       } else {
         // Else, no schema was found so just use the essentials and v0.0.1 schema version
         // NOTE: version is important here and MUST be 0.0.1 otherwise it will invalidate BBS+ credentials

diff --git a/tests/integration/anoncreds/issuing.test.js b/tests/integration/anoncreds/issuing.test.js
@@ -1,6 +1,6 @@
 import { randomAsHex } from '@polkadot/util-crypto';
 import { u8aToHex } from '@polkadot/util';
-import { CredentialBuilder, CredentialSchema, initializeWasm } from '@docknetwork/crypto-wasm-ts';
+import { DefaultSchemaParsingOpts, CredentialBuilder, CredentialSchema, initializeWasm } from '@docknetwork/crypto-wasm-ts';
 import { DockAPI } from '../../../src';
 import { createNewDockDID, DidKeypair } from '../../../src/utils/did';
 import { DockResolver } from '../../../src/resolver';
@@ -238,6 +238,76 @@ describe.each(Schemes)('Issuance', ({
     );
   }, 30000);
 
+  test(`Can issue+verify a ${Name} credential with blank schema and custom parsingOptions`, async () => {
+    const parsingOptions = {
+      ...DefaultSchemaParsingOpts,
+      defaultDecimalPlaces: 5,
+      useDefaults: true,
+    };
+
+    const issuerKey = getKeyDoc(did1, keypair, keypair.type, keypair.id);
+    const unsignedCred = {
+      ...credentialJSON,
+      issuer: did1,
+    };
+
+    unsignedCred.credentialSchema = {
+      id: '',
+      type: 'JsonSchemaValidator2018',
+      parsingOptions,
+    };
+
+    const credential = await issueCredential(issuerKey, unsignedCred);
+
+    // Ensure schema was now defined, added by crypto-wasm-ts
+    expect(credential.credentialSchema).toBeDefined();
+    expect(credential.credentialSchema).toMatchObject({
+      parsingOptions,
+      version: CredentialSchema.VERSION,
+    });
+
+    const result = await verifyCredential(credential, { resolver });
+    expect(result).toMatchObject(
+      expect.objectContaining(getProofMatcherDoc()),
+    );
+  }, 30000);
+
+  test(`Can issue+verify a ${Name} credential with embedded schema and custom parsingOptions`, async () => {
+    const parsingOptions = {
+      ...DefaultSchemaParsingOpts,
+      defaultDecimalPlaces: 5,
+      useDefaults: true,
+    };
+
+    const issuerKey = getKeyDoc(did1, keypair, keypair.type, keypair.id);
+    const unsignedCred = {
+      ...credentialJSON,
+      credentialSchema: {
+        id: credentialJSON.credentialSchema.id,
+        type: 'JsonSchemaValidator2018',
+        parsingOptions,
+      },
+      issuer: did1,
+    };
+
+    expect(unsignedCred.credentialSchema.id).toBeDefined();
+    expect(unsignedCred.credentialSchema.id).not.toEqual('');
+
+    const credential = await issueCredential(issuerKey, unsignedCred);
+
+    // Ensure schema was now defined, added by crypto-wasm-ts
+    expect(credential.credentialSchema).toBeDefined();
+    expect(credential.credentialSchema).toMatchObject({
+      parsingOptions,
+      version: CredentialSchema.VERSION,
+    });
+
+    const result = await verifyCredential(credential, { resolver });
+    expect(result).toMatchObject(
+      expect.objectContaining(getProofMatcherDoc()),
+    );
+  }, 30000);
+
   afterAll(async () => {
     await dock.disconnect();
   }, 10000);