@twin.org/immutable-proof-service 0.0.1-next.23 → 0.0.1-next.25

package/dist/cjs/index.cjs

@@ -305,7 +305,7 @@ async function immutableProofCreate(httpRequestContext, componentName, request)
     core.Guards.object(ROUTES_SOURCE, "request", request);
     core.Guards.object(ROUTES_SOURCE, "request.body.proofObject", request.body.proofObject);
     const component = core.ComponentFactory.get(componentName);
-    const result = await component.create(request.body.proofObject);
+    const result = await component.create(request.body.proofObject, httpRequestContext.userIdentity, httpRequestContext.nodeIdentity);
     return {
         statusCode: web.HttpStatusCode.created,
         headers: {
@@ -644,29 +644,30 @@ class ImmutableProofService {
         if (core.Is.empty(proofEntity)) {
             throw new core.NotFoundError(this.CLASS_NAME, "proofNotFound", id);
         }
-        let proofModel = await this.proofEntityToJsonLd(proofEntity);
+        let proofJsonLd = await this.proofEntityToJsonLd(proofEntity);
         let verified = false;
         let failure = immutableProofModels.ImmutableProofFailure.NotIssued;
         if (core.Is.stringValue(proofEntity.immutableStorageId)) {
             failure = immutableProofModels.ImmutableProofFailure.ProofMissing;
             const immutableResult = await this._immutableStorage.get(proofEntity.immutableStorageId);
             if (core.Is.uint8Array(immutableResult.data)) {
-                proofModel = core.ObjectHelper.fromBytes(immutableResult.data);
-                proofModel.immutableReceipt = immutableResult.receipt;
-                // As we are adding the receipt to the data we update its context
-                if (core.Is.array(proofModel["@context"])) {
-                    proofModel["@context"].push(immutableStorageModels.ImmutableStorageTypes.ContextRoot);
+                proofJsonLd = core.ObjectHelper.fromBytes(immutableResult.data);
+                proofJsonLd.immutableReceipt = immutableResult.receipt;
+                // As we are adding the receipt to the data we update the JSON-LD context
+                const receiptContext = immutableResult.receipt["@context"];
+                if (!core.Is.empty(receiptContext)) {
+                    proofJsonLd["@context"] = dataJsonLd.JsonLdProcessor.combineContexts(proofJsonLd["@context"], receiptContext);
                 }
-                if (verify && core.Is.object(proofModel.proof)) {
-                    if (proofModel.proof.cryptosuite !== standardsW3cDid.DidCryptoSuites.EdDSAJcs2022) {
+                if (verify && core.Is.object(proofJsonLd.proof)) {
+                    if (proofJsonLd.proof.cryptosuite !== standardsW3cDid.DidCryptoSuites.EdDSAJcs2022) {
                         failure = immutableProofModels.ImmutableProofFailure.CryptoSuiteMismatch;
                     }
-                    else if (proofModel.proof.type !== standardsW3cDid.DidTypes.DataIntegrityProof) {
+                    else if (proofJsonLd.proof.type !== standardsW3cDid.DidTypes.DataIntegrityProof) {
                         failure = immutableProofModels.ImmutableProofFailure.ProofTypeMismatch;
                     }
                     else {
-                        const hashData = await this.generateHashData(proofEntity.nodeIdentity, proofModel);
-                        const isVerified = await this._identityConnector.verifyProof(hashData, proofModel.proof);
+                        const hashData = await this.generateHashData(proofEntity.nodeIdentity, proofJsonLd);
+                        const isVerified = await this._identityConnector.verifyProof(hashData, proofJsonLd.proof);
                         if (isVerified) {
                             verified = true;
                             failure = undefined;
@@ -679,7 +680,7 @@ class ImmutableProofService {
             }
         }
         return {
-            immutableProof: proofModel,
+            immutableProof: proofJsonLd,
             verified,
             failure
         };

package/dist/esm/index.mjs

@@ -8,7 +8,7 @@ import { Blake2b, Sha256 } from '@twin.org/crypto';
 import { JsonLdHelper, JsonLdProcessor } from '@twin.org/data-json-ld';
 import { EntityStorageConnectorFactory } from '@twin.org/entity-storage-models';
 import { IdentityConnectorFactory } from '@twin.org/identity-models';
-import { ImmutableStorageConnectorFactory, ImmutableStorageTypes } from '@twin.org/immutable-storage-models';
+import { ImmutableStorageConnectorFactory } from '@twin.org/immutable-storage-models';
 import { VaultConnectorFactory } from '@twin.org/vault-models';
 
 // Copyright 2024 IOTA Stiftung.
@@ -303,7 +303,7 @@ async function immutableProofCreate(httpRequestContext, componentName, request)
     Guards.object(ROUTES_SOURCE, "request", request);
     Guards.object(ROUTES_SOURCE, "request.body.proofObject", request.body.proofObject);
     const component = ComponentFactory.get(componentName);
-    const result = await component.create(request.body.proofObject);
+    const result = await component.create(request.body.proofObject, httpRequestContext.userIdentity, httpRequestContext.nodeIdentity);
     return {
         statusCode: HttpStatusCode.created,
         headers: {
@@ -642,29 +642,30 @@ class ImmutableProofService {
         if (Is.empty(proofEntity)) {
             throw new NotFoundError(this.CLASS_NAME, "proofNotFound", id);
         }
-        let proofModel = await this.proofEntityToJsonLd(proofEntity);
+        let proofJsonLd = await this.proofEntityToJsonLd(proofEntity);
         let verified = false;
         let failure = ImmutableProofFailure.NotIssued;
         if (Is.stringValue(proofEntity.immutableStorageId)) {
             failure = ImmutableProofFailure.ProofMissing;
             const immutableResult = await this._immutableStorage.get(proofEntity.immutableStorageId);
             if (Is.uint8Array(immutableResult.data)) {
-                proofModel = ObjectHelper.fromBytes(immutableResult.data);
-                proofModel.immutableReceipt = immutableResult.receipt;
-                // As we are adding the receipt to the data we update its context
-                if (Is.array(proofModel["@context"])) {
-                    proofModel["@context"].push(ImmutableStorageTypes.ContextRoot);
+                proofJsonLd = ObjectHelper.fromBytes(immutableResult.data);
+                proofJsonLd.immutableReceipt = immutableResult.receipt;
+                // As we are adding the receipt to the data we update the JSON-LD context
+                const receiptContext = immutableResult.receipt["@context"];
+                if (!Is.empty(receiptContext)) {
+                    proofJsonLd["@context"] = JsonLdProcessor.combineContexts(proofJsonLd["@context"], receiptContext);
                 }
-                if (verify && Is.object(proofModel.proof)) {
-                    if (proofModel.proof.cryptosuite !== DidCryptoSuites.EdDSAJcs2022) {
+                if (verify && Is.object(proofJsonLd.proof)) {
+                    if (proofJsonLd.proof.cryptosuite !== DidCryptoSuites.EdDSAJcs2022) {
                         failure = ImmutableProofFailure.CryptoSuiteMismatch;
                     }
-                    else if (proofModel.proof.type !== DidTypes.DataIntegrityProof) {
+                    else if (proofJsonLd.proof.type !== DidTypes.DataIntegrityProof) {
                         failure = ImmutableProofFailure.ProofTypeMismatch;
                     }
                     else {
-                        const hashData = await this.generateHashData(proofEntity.nodeIdentity, proofModel);
-                        const isVerified = await this._identityConnector.verifyProof(hashData, proofModel.proof);
+                        const hashData = await this.generateHashData(proofEntity.nodeIdentity, proofJsonLd);
+                        const isVerified = await this._identityConnector.verifyProof(hashData, proofJsonLd.proof);
                         if (isVerified) {
                             verified = true;
                             failure = undefined;
@@ -677,7 +678,7 @@ class ImmutableProofService {
             }
         }
         return {
-            immutableProof: proofModel,
+            immutableProof: proofJsonLd,
             verified,
             failure
         };

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/immutable-proof-service - Changelog
 
-## v0.0.1-next.23
+## v0.0.1-next.25
 
 - Initial Release

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/immutable-proof-service",
-	"version": "0.0.1-next.23",
+	"version": "0.0.1-next.25",
 	"description": "Immutable proof contract implementation and REST endpoint definitions",
 	"repository": {
 		"type": "git",
@@ -23,8 +23,8 @@
 		"@twin.org/entity-storage-models": "next",
 		"@twin.org/event-bus-models": "next",
 		"@twin.org/identity-models": "next",
-		"@twin.org/immutable-proof-models": "0.0.1-next.23",
-		"@twin.org/immutable-proof-task": "0.0.1-next.23",
+		"@twin.org/immutable-proof-models": "0.0.1-next.25",
+		"@twin.org/immutable-proof-task": "0.0.1-next.25",
 		"@twin.org/immutable-storage-models": "next",
 		"@twin.org/nameof": "next",
 		"@twin.org/standards-w3c-did": "next",