@twin.org/identity-connector-entity-storage 0.0.1-next.20 → 0.0.1-next.21

package/dist/cjs/index.cjs

@@ -125,6 +125,28 @@ class EntityStorageIdentityConnector {
         this._didDocumentEntityStorage = entityStorageModels.EntityStorageConnectorFactory.get(options?.didDocumentEntityStorageType ?? "identity-document");
         this._vaultConnector = vaultModels.VaultConnectorFactory.get(options?.vaultConnectorType ?? "vault");
     }
+    /**
+     * Build the key name to access the specified key in the vault.
+     * @param identity The identity of the user to access the vault keys.
+     * @returns The vault key.
+     * @internal
+     */
+    static buildVaultKey(identity, key) {
+        return `${identity}/${key}`;
+    }
+    /**
+     * Verify the document in storage.
+     * @param didDocument The did document that was stored.
+     * @internal
+     */
+    static async verifyDocument(didDocument, vaultConnector) {
+        const stringifiedDocument = core.JsonHelper.canonicalize(didDocument.document);
+        const docBytes = core.Converter.utf8ToBytes(stringifiedDocument);
+        const verified = await vaultConnector.verify(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, "did"), docBytes, core.Converter.base64ToBytes(didDocument.signature));
+        if (!verified) {
+            throw new core.GeneralError("EntityStorageIdentityResolverConnector", "signatureVerificationFailed");
+        }
+    }
     /**
      * Create a new document.
      * @param controller The controller of the identity who can make changes.
@@ -134,7 +156,7 @@ class EntityStorageIdentityConnector {
         core.Guards.stringValue(this.CLASS_NAME, "controller", controller);
         try {
             const did = `did:${EntityStorageIdentityConnector.NAMESPACE}:${core.Converter.bytesToHex(core.RandomHelper.generate(32), true)}`;
-            await this._vaultConnector.createKey(this.buildVaultKey(did, "did"), vaultModels.VaultKeyType.Ed25519);
+            await this._vaultConnector.createKey(EntityStorageIdentityConnector.buildVaultKey(did, "did"), vaultModels.VaultKeyType.Ed25519);
             const bitString = new core.BitString(EntityStorageIdentityConnector._REVOCATION_BITS_SIZE);
             const compressed = await core.Compression.compress(bitString.getBits(), core.CompressionType.Gzip);
             const didDocument = {
@@ -154,26 +176,6 @@ class EntityStorageIdentityConnector {
             throw new core.GeneralError(this.CLASS_NAME, "createDocumentFailed", undefined, error);
         }
     }
-    /**
-     * Resolve a document from its id.
-     * @param documentId The id of the document to resolve.
-     * @returns The resolved document.
-     * @throws NotFoundError if the id can not be resolved.
-     */
-    async resolveDocument(documentId) {
-        core.Guards.stringValue(this.CLASS_NAME, "documentId", documentId);
-        try {
-            const didIdentityDocument = await this._didDocumentEntityStorage.get(documentId);
-            if (core.Is.undefined(didIdentityDocument)) {
-                throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", documentId);
-            }
-            await this.verifyDocument(didIdentityDocument);
-            return didIdentityDocument.document;
-        }
-        catch (error) {
-            throw new core.GeneralError(this.CLASS_NAME, "resolveDocumentFailed", undefined, error);
-        }
-    }
     /**
      * Add a verification method to the document in JSON Web key Format.
      * @param controller The controller of the identity who can make changes.
@@ -193,10 +195,10 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(didIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", documentId);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             const tempKeyId = `temp-vm-${core.Converter.bytesToBase64Url(core.RandomHelper.generate(16))}`;
-            const verificationPublicKey = await this._vaultConnector.createKey(this.buildVaultKey(didDocument.id, tempKeyId), vaultModels.VaultKeyType.Ed25519);
+            const verificationPublicKey = await this._vaultConnector.createKey(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, tempKeyId), vaultModels.VaultKeyType.Ed25519);
             const jwkParams = {
                 alg: "EdDSA",
                 kty: "OKP",
@@ -205,7 +207,7 @@ class EntityStorageIdentityConnector {
             };
             const kid = core.Converter.bytesToBase64Url(crypto.Sha256.sum256(core.Converter.utf8ToBytes(JSON.stringify(jwkParams))));
             const methodId = `${documentId}#${verificationMethodId ?? kid}`;
-            await this._vaultConnector.renameKey(this.buildVaultKey(didDocument.id, tempKeyId), this.buildVaultKey(didDocument.id, verificationMethodId ?? kid));
+            await this._vaultConnector.renameKey(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, tempKeyId), EntityStorageIdentityConnector.buildVaultKey(didDocument.id, verificationMethodId ?? kid));
             const methods = this.getAllMethods(didDocument);
             const existingMethodIndex = methods.findIndex(m => {
                 if (core.Is.string(m.method)) {
@@ -257,7 +259,7 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(didIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             const methods = this.getAllMethods(didDocument);
             const existingMethodIndex = methods.findIndex(m => {
@@ -305,7 +307,7 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(didIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", documentId);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             const fullServiceId = serviceId.includes("#") ? serviceId : `${documentId}#${serviceId}`;
             if (core.Is.array(didDocument.service)) {
@@ -347,7 +349,7 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(didIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             if (core.Is.array(didDocument.service)) {
                 const existingServiceIndex = didDocument.service.findIndex(s => s.id === serviceId);
@@ -393,7 +395,7 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(issuerIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(issuerIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(issuerIdentityDocument, this._vaultConnector);
             const issuerDidDocument = issuerIdentityDocument.document;
             const methods = this.getAllMethods(issuerDidDocument);
             const methodAndArray = methods.find(m => {
@@ -465,7 +467,7 @@ class EntityStorageIdentityConnector {
                 vc: jwtVc
             };
             const signature = await web.Jwt.encodeWithSigner(jwtHeader, jwtPayload, async (alg, key, payload) => {
-                const sig = await this._vaultConnector.sign(this.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
+                const sig = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
                 return sig;
             });
             return {
@@ -500,7 +502,7 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(issuerIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
             }
-            await this.verifyDocument(issuerIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(issuerIdentityDocument, this._vaultConnector);
             const issuerDidDocument = issuerIdentityDocument.document;
             const methods = this.getAllMethods(issuerDidDocument);
             const methodAndArray = methods.find(m => {
@@ -565,7 +567,7 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(issuerIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
             }
-            await this.verifyDocument(issuerIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(issuerIdentityDocument, this._vaultConnector);
             const issuerDidDocument = issuerIdentityDocument.document;
             const revocationService = issuerDidDocument.service?.find(s => s.id.endsWith("#revocation"));
             if (revocationService &&
@@ -605,7 +607,7 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(issuerIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
             }
-            await this.verifyDocument(issuerIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(issuerIdentityDocument, this._vaultConnector);
             const issuerDidDocument = issuerIdentityDocument.document;
             const revocationService = issuerDidDocument.service?.find(s => s.id.endsWith("#revocation"));
             if (revocationService &&
@@ -663,7 +665,7 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(holderIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(holderIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(holderIdentityDocument, this._vaultConnector);
             const holderDidDocument = holderIdentityDocument.document;
             const methods = this.getAllMethods(holderDidDocument);
             const methodAndArray = methods.find(m => {
@@ -715,7 +717,7 @@ class EntityStorageIdentityConnector {
                 jwtPayload.exp = Math.floor(Date.now() / 1000) + expiresInSeconds;
             }
             const signature = await web.Jwt.encodeWithSigner(jwtHeader, jwtPayload, async (alg, key, payload) => {
-                const sig = await this._vaultConnector.sign(this.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
+                const sig = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
                 return sig;
             });
             return {
@@ -750,7 +752,7 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(holderIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", holderDocumentId);
             }
-            await this.verifyDocument(holderIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(holderIdentityDocument, this._vaultConnector);
             const issuers = [];
             const tokensRevoked = [];
             const verifiablePresentation = jwtPayload?.vp;
@@ -767,7 +769,7 @@ class EntityStorageIdentityConnector {
                             if (core.Is.undefined(issuerDidDocument)) {
                                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
                             }
-                            await this.verifyDocument(issuerDidDocument);
+                            await EntityStorageIdentityConnector.verifyDocument(issuerDidDocument, this._vaultConnector);
                             issuers.push(issuerDidDocument);
                             const vc = jwt.payload.vc;
                             if (core.Is.object(vc)) {
@@ -816,7 +818,7 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(didIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             const methods = this.getAllMethods(didDocument);
             const methodAndArray = methods.find(m => {
@@ -834,7 +836,7 @@ class EntityStorageIdentityConnector {
                     method: verificationMethodId
                 });
             }
-            const signature = await this._vaultConnector.sign(this.buildVaultKey(didDocument.id, idParts.hash ?? ""), bytes);
+            const signature = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, idParts.hash ?? ""), bytes);
             return {
                 "@context": standardsW3cDid.DidContexts.ContextVCDataIntegrity,
                 type: standardsW3cDid.DidTypes.DataIntegrityProof,
@@ -877,7 +879,7 @@ class EntityStorageIdentityConnector {
             if (core.Is.undefined(didIdentityDocument)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             const methods = this.getAllMethods(didDocument);
             const methodAndArray = methods.find(m => {
@@ -897,7 +899,7 @@ class EntityStorageIdentityConnector {
                     method: proof.verificationMethodId
                 });
             }
-            return this._vaultConnector.verify(this.buildVaultKey(didIdentityDocument.id, idParts.hash), bytes, core.Converter.base58ToBytes(proof.proofValue));
+            return this._vaultConnector.verify(EntityStorageIdentityConnector.buildVaultKey(didIdentityDocument.id, idParts.hash), bytes, core.Converter.base58ToBytes(proof.proofValue));
         }
         catch (error) {
             throw new core.GeneralError(this.CLASS_NAME, "verifyProofFailed", undefined, error);
@@ -950,19 +952,6 @@ class EntityStorageIdentityConnector {
         }
         return false;
     }
-    /**
-     * Verify the document in storage.
-     * @param didDocument The did document that was stored.
-     * @internal
-     */
-    async verifyDocument(didDocument) {
-        const stringifiedDocument = core.JsonHelper.canonicalize(didDocument.document);
-        const docBytes = core.Converter.utf8ToBytes(stringifiedDocument);
-        const verified = await this._vaultConnector.verify(this.buildVaultKey(didDocument.id, "did"), docBytes, core.Converter.base64ToBytes(didDocument.signature));
-        if (!verified) {
-            throw new core.GeneralError(this.CLASS_NAME, "signatureVerificationFailed");
-        }
-    }
     /**
      * Update the document in storage.
      * @param controller The controller of the document.
@@ -972,7 +961,7 @@ class EntityStorageIdentityConnector {
     async updateDocument(controller, didDocument) {
         const stringifiedDocument = core.JsonHelper.canonicalize(didDocument);
         const docBytes = core.Converter.utf8ToBytes(stringifiedDocument);
-        const signature = await this._vaultConnector.sign(this.buildVaultKey(didDocument.id, "did"), docBytes);
+        const signature = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, "did"), docBytes);
         await this._didDocumentEntityStorage.set({
             id: didDocument.id,
             document: didDocument,
@@ -980,15 +969,6 @@ class EntityStorageIdentityConnector {
             controller
         });
     }
-    /**
-     * Build the key name to access the specified key in the vault.
-     * @param identity The identity of the user to access the vault keys.
-     * @returns The vault key.
-     * @internal
-     */
-    buildVaultKey(identity, key) {
-        return `${identity}/${key}`;
-    }
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -1184,6 +1164,60 @@ class EntityStorageIdentityProfileConnector {
     }
 }
 
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Class for performing identity operations using entity storage.
+ */
+class EntityStorageIdentityResolverConnector {
+    /**
+     * The namespace supported by the identity connector.
+     */
+    static NAMESPACE = "entity-storage";
+    /**
+     * Runtime name for the class.
+     */
+    CLASS_NAME = "EntityStorageIdentityResolverConnector";
+    /**
+     * The entity storage for identities.
+     * @internal
+     */
+    _didDocumentEntityStorage;
+    /**
+     * The vault for the keys.
+     * @internal
+     */
+    _vaultConnector;
+    /**
+     * Create a new instance of EntityStorageIdentityResolverConnector.
+     * @param options The options for the identity connector.
+     */
+    constructor(options) {
+        this._didDocumentEntityStorage = entityStorageModels.EntityStorageConnectorFactory.get(options?.didDocumentEntityStorageType ?? "identity-document");
+        this._vaultConnector = vaultModels.VaultConnectorFactory.get(options?.vaultConnectorType ?? "vault");
+    }
+    /**
+     * Resolve a document from its id.
+     * @param documentId The id of the document to resolve.
+     * @returns The resolved document.
+     * @throws NotFoundError if the id can not be resolved.
+     */
+    async resolveDocument(documentId) {
+        core.Guards.stringValue(this.CLASS_NAME, "documentId", documentId);
+        try {
+            const didIdentityDocument = await this._didDocumentEntityStorage.get(documentId);
+            if (core.Is.undefined(didIdentityDocument)) {
+                throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", documentId);
+            }
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
+            return didIdentityDocument.document;
+        }
+        catch (error) {
+            throw new core.GeneralError(this.CLASS_NAME, "resolveDocumentFailed", undefined, error);
+        }
+    }
+}
+
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
 /**
@@ -1203,4 +1237,5 @@ function initSchema(options) {
 
 exports.EntityStorageIdentityConnector = EntityStorageIdentityConnector;
 exports.EntityStorageIdentityProfileConnector = EntityStorageIdentityProfileConnector;
+exports.EntityStorageIdentityResolverConnector = EntityStorageIdentityResolverConnector;
 exports.initSchema = initSchema;

package/dist/esm/index.mjs

@@ -1,5 +1,5 @@
 import { property, entity, ComparisonOperator, EntitySchemaFactory, EntitySchemaHelper } from '@twin.org/entity';
-import { Guards, Converter, RandomHelper, BitString, Compression, CompressionType, GeneralError, Is, NotFoundError, ObjectHelper, Coerce, JsonHelper, AlreadyExistsError, BaseError } from '@twin.org/core';
+import { JsonHelper, Converter, GeneralError, Guards, RandomHelper, BitString, Compression, CompressionType, Is, NotFoundError, ObjectHelper, Coerce, AlreadyExistsError, BaseError } from '@twin.org/core';
 import { Sha256 } from '@twin.org/crypto';
 import { JsonLdProcessor } from '@twin.org/data-json-ld';
 import { EntityStorageConnectorFactory } from '@twin.org/entity-storage-models';
@@ -123,6 +123,28 @@ class EntityStorageIdentityConnector {
         this._didDocumentEntityStorage = EntityStorageConnectorFactory.get(options?.didDocumentEntityStorageType ?? "identity-document");
         this._vaultConnector = VaultConnectorFactory.get(options?.vaultConnectorType ?? "vault");
     }
+    /**
+     * Build the key name to access the specified key in the vault.
+     * @param identity The identity of the user to access the vault keys.
+     * @returns The vault key.
+     * @internal
+     */
+    static buildVaultKey(identity, key) {
+        return `${identity}/${key}`;
+    }
+    /**
+     * Verify the document in storage.
+     * @param didDocument The did document that was stored.
+     * @internal
+     */
+    static async verifyDocument(didDocument, vaultConnector) {
+        const stringifiedDocument = JsonHelper.canonicalize(didDocument.document);
+        const docBytes = Converter.utf8ToBytes(stringifiedDocument);
+        const verified = await vaultConnector.verify(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, "did"), docBytes, Converter.base64ToBytes(didDocument.signature));
+        if (!verified) {
+            throw new GeneralError("EntityStorageIdentityResolverConnector", "signatureVerificationFailed");
+        }
+    }
     /**
      * Create a new document.
      * @param controller The controller of the identity who can make changes.
@@ -132,7 +154,7 @@ class EntityStorageIdentityConnector {
         Guards.stringValue(this.CLASS_NAME, "controller", controller);
         try {
             const did = `did:${EntityStorageIdentityConnector.NAMESPACE}:${Converter.bytesToHex(RandomHelper.generate(32), true)}`;
-            await this._vaultConnector.createKey(this.buildVaultKey(did, "did"), VaultKeyType.Ed25519);
+            await this._vaultConnector.createKey(EntityStorageIdentityConnector.buildVaultKey(did, "did"), VaultKeyType.Ed25519);
             const bitString = new BitString(EntityStorageIdentityConnector._REVOCATION_BITS_SIZE);
             const compressed = await Compression.compress(bitString.getBits(), CompressionType.Gzip);
             const didDocument = {
@@ -152,26 +174,6 @@ class EntityStorageIdentityConnector {
             throw new GeneralError(this.CLASS_NAME, "createDocumentFailed", undefined, error);
         }
     }
-    /**
-     * Resolve a document from its id.
-     * @param documentId The id of the document to resolve.
-     * @returns The resolved document.
-     * @throws NotFoundError if the id can not be resolved.
-     */
-    async resolveDocument(documentId) {
-        Guards.stringValue(this.CLASS_NAME, "documentId", documentId);
-        try {
-            const didIdentityDocument = await this._didDocumentEntityStorage.get(documentId);
-            if (Is.undefined(didIdentityDocument)) {
-                throw new NotFoundError(this.CLASS_NAME, "documentNotFound", documentId);
-            }
-            await this.verifyDocument(didIdentityDocument);
-            return didIdentityDocument.document;
-        }
-        catch (error) {
-            throw new GeneralError(this.CLASS_NAME, "resolveDocumentFailed", undefined, error);
-        }
-    }
     /**
      * Add a verification method to the document in JSON Web key Format.
      * @param controller The controller of the identity who can make changes.
@@ -191,10 +193,10 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(didIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", documentId);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             const tempKeyId = `temp-vm-${Converter.bytesToBase64Url(RandomHelper.generate(16))}`;
-            const verificationPublicKey = await this._vaultConnector.createKey(this.buildVaultKey(didDocument.id, tempKeyId), VaultKeyType.Ed25519);
+            const verificationPublicKey = await this._vaultConnector.createKey(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, tempKeyId), VaultKeyType.Ed25519);
             const jwkParams = {
                 alg: "EdDSA",
                 kty: "OKP",
@@ -203,7 +205,7 @@ class EntityStorageIdentityConnector {
             };
             const kid = Converter.bytesToBase64Url(Sha256.sum256(Converter.utf8ToBytes(JSON.stringify(jwkParams))));
             const methodId = `${documentId}#${verificationMethodId ?? kid}`;
-            await this._vaultConnector.renameKey(this.buildVaultKey(didDocument.id, tempKeyId), this.buildVaultKey(didDocument.id, verificationMethodId ?? kid));
+            await this._vaultConnector.renameKey(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, tempKeyId), EntityStorageIdentityConnector.buildVaultKey(didDocument.id, verificationMethodId ?? kid));
             const methods = this.getAllMethods(didDocument);
             const existingMethodIndex = methods.findIndex(m => {
                 if (Is.string(m.method)) {
@@ -255,7 +257,7 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(didIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             const methods = this.getAllMethods(didDocument);
             const existingMethodIndex = methods.findIndex(m => {
@@ -303,7 +305,7 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(didIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", documentId);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             const fullServiceId = serviceId.includes("#") ? serviceId : `${documentId}#${serviceId}`;
             if (Is.array(didDocument.service)) {
@@ -345,7 +347,7 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(didIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             if (Is.array(didDocument.service)) {
                 const existingServiceIndex = didDocument.service.findIndex(s => s.id === serviceId);
@@ -391,7 +393,7 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(issuerIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(issuerIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(issuerIdentityDocument, this._vaultConnector);
             const issuerDidDocument = issuerIdentityDocument.document;
             const methods = this.getAllMethods(issuerDidDocument);
             const methodAndArray = methods.find(m => {
@@ -463,7 +465,7 @@ class EntityStorageIdentityConnector {
                 vc: jwtVc
             };
             const signature = await Jwt.encodeWithSigner(jwtHeader, jwtPayload, async (alg, key, payload) => {
-                const sig = await this._vaultConnector.sign(this.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
+                const sig = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
                 return sig;
             });
             return {
@@ -498,7 +500,7 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(issuerIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
             }
-            await this.verifyDocument(issuerIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(issuerIdentityDocument, this._vaultConnector);
             const issuerDidDocument = issuerIdentityDocument.document;
             const methods = this.getAllMethods(issuerDidDocument);
             const methodAndArray = methods.find(m => {
@@ -563,7 +565,7 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(issuerIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
             }
-            await this.verifyDocument(issuerIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(issuerIdentityDocument, this._vaultConnector);
             const issuerDidDocument = issuerIdentityDocument.document;
             const revocationService = issuerDidDocument.service?.find(s => s.id.endsWith("#revocation"));
             if (revocationService &&
@@ -603,7 +605,7 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(issuerIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
             }
-            await this.verifyDocument(issuerIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(issuerIdentityDocument, this._vaultConnector);
             const issuerDidDocument = issuerIdentityDocument.document;
             const revocationService = issuerDidDocument.service?.find(s => s.id.endsWith("#revocation"));
             if (revocationService &&
@@ -661,7 +663,7 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(holderIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(holderIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(holderIdentityDocument, this._vaultConnector);
             const holderDidDocument = holderIdentityDocument.document;
             const methods = this.getAllMethods(holderDidDocument);
             const methodAndArray = methods.find(m => {
@@ -713,7 +715,7 @@ class EntityStorageIdentityConnector {
                 jwtPayload.exp = Math.floor(Date.now() / 1000) + expiresInSeconds;
             }
             const signature = await Jwt.encodeWithSigner(jwtHeader, jwtPayload, async (alg, key, payload) => {
-                const sig = await this._vaultConnector.sign(this.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
+                const sig = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
                 return sig;
             });
             return {
@@ -748,7 +750,7 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(holderIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", holderDocumentId);
             }
-            await this.verifyDocument(holderIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(holderIdentityDocument, this._vaultConnector);
             const issuers = [];
             const tokensRevoked = [];
             const verifiablePresentation = jwtPayload?.vp;
@@ -765,7 +767,7 @@ class EntityStorageIdentityConnector {
                             if (Is.undefined(issuerDidDocument)) {
                                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
                             }
-                            await this.verifyDocument(issuerDidDocument);
+                            await EntityStorageIdentityConnector.verifyDocument(issuerDidDocument, this._vaultConnector);
                             issuers.push(issuerDidDocument);
                             const vc = jwt.payload.vc;
                             if (Is.object(vc)) {
@@ -814,7 +816,7 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(didIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             const methods = this.getAllMethods(didDocument);
             const methodAndArray = methods.find(m => {
@@ -832,7 +834,7 @@ class EntityStorageIdentityConnector {
                     method: verificationMethodId
                 });
             }
-            const signature = await this._vaultConnector.sign(this.buildVaultKey(didDocument.id, idParts.hash ?? ""), bytes);
+            const signature = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, idParts.hash ?? ""), bytes);
             return {
                 "@context": DidContexts.ContextVCDataIntegrity,
                 type: DidTypes.DataIntegrityProof,
@@ -875,7 +877,7 @@ class EntityStorageIdentityConnector {
             if (Is.undefined(didIdentityDocument)) {
                 throw new NotFoundError(this.CLASS_NAME, "documentNotFound", idParts.id);
             }
-            await this.verifyDocument(didIdentityDocument);
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
             const didDocument = didIdentityDocument.document;
             const methods = this.getAllMethods(didDocument);
             const methodAndArray = methods.find(m => {
@@ -895,7 +897,7 @@ class EntityStorageIdentityConnector {
                     method: proof.verificationMethodId
                 });
             }
-            return this._vaultConnector.verify(this.buildVaultKey(didIdentityDocument.id, idParts.hash), bytes, Converter.base58ToBytes(proof.proofValue));
+            return this._vaultConnector.verify(EntityStorageIdentityConnector.buildVaultKey(didIdentityDocument.id, idParts.hash), bytes, Converter.base58ToBytes(proof.proofValue));
         }
         catch (error) {
             throw new GeneralError(this.CLASS_NAME, "verifyProofFailed", undefined, error);
@@ -948,19 +950,6 @@ class EntityStorageIdentityConnector {
         }
         return false;
     }
-    /**
-     * Verify the document in storage.
-     * @param didDocument The did document that was stored.
-     * @internal
-     */
-    async verifyDocument(didDocument) {
-        const stringifiedDocument = JsonHelper.canonicalize(didDocument.document);
-        const docBytes = Converter.utf8ToBytes(stringifiedDocument);
-        const verified = await this._vaultConnector.verify(this.buildVaultKey(didDocument.id, "did"), docBytes, Converter.base64ToBytes(didDocument.signature));
-        if (!verified) {
-            throw new GeneralError(this.CLASS_NAME, "signatureVerificationFailed");
-        }
-    }
     /**
      * Update the document in storage.
      * @param controller The controller of the document.
@@ -970,7 +959,7 @@ class EntityStorageIdentityConnector {
     async updateDocument(controller, didDocument) {
         const stringifiedDocument = JsonHelper.canonicalize(didDocument);
         const docBytes = Converter.utf8ToBytes(stringifiedDocument);
-        const signature = await this._vaultConnector.sign(this.buildVaultKey(didDocument.id, "did"), docBytes);
+        const signature = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, "did"), docBytes);
         await this._didDocumentEntityStorage.set({
             id: didDocument.id,
             document: didDocument,
@@ -978,15 +967,6 @@ class EntityStorageIdentityConnector {
             controller
         });
     }
-    /**
-     * Build the key name to access the specified key in the vault.
-     * @param identity The identity of the user to access the vault keys.
-     * @returns The vault key.
-     * @internal
-     */
-    buildVaultKey(identity, key) {
-        return `${identity}/${key}`;
-    }
 }
 
 // Copyright 2024 IOTA Stiftung.
@@ -1182,6 +1162,60 @@ class EntityStorageIdentityProfileConnector {
     }
 }
 
+// Copyright 2024 IOTA Stiftung.
+// SPDX-License-Identifier: Apache-2.0.
+/**
+ * Class for performing identity operations using entity storage.
+ */
+class EntityStorageIdentityResolverConnector {
+    /**
+     * The namespace supported by the identity connector.
+     */
+    static NAMESPACE = "entity-storage";
+    /**
+     * Runtime name for the class.
+     */
+    CLASS_NAME = "EntityStorageIdentityResolverConnector";
+    /**
+     * The entity storage for identities.
+     * @internal
+     */
+    _didDocumentEntityStorage;
+    /**
+     * The vault for the keys.
+     * @internal
+     */
+    _vaultConnector;
+    /**
+     * Create a new instance of EntityStorageIdentityResolverConnector.
+     * @param options The options for the identity connector.
+     */
+    constructor(options) {
+        this._didDocumentEntityStorage = EntityStorageConnectorFactory.get(options?.didDocumentEntityStorageType ?? "identity-document");
+        this._vaultConnector = VaultConnectorFactory.get(options?.vaultConnectorType ?? "vault");
+    }
+    /**
+     * Resolve a document from its id.
+     * @param documentId The id of the document to resolve.
+     * @returns The resolved document.
+     * @throws NotFoundError if the id can not be resolved.
+     */
+    async resolveDocument(documentId) {
+        Guards.stringValue(this.CLASS_NAME, "documentId", documentId);
+        try {
+            const didIdentityDocument = await this._didDocumentEntityStorage.get(documentId);
+            if (Is.undefined(didIdentityDocument)) {
+                throw new NotFoundError(this.CLASS_NAME, "documentNotFound", documentId);
+            }
+            await EntityStorageIdentityConnector.verifyDocument(didIdentityDocument, this._vaultConnector);
+            return didIdentityDocument.document;
+        }
+        catch (error) {
+            throw new GeneralError(this.CLASS_NAME, "resolveDocumentFailed", undefined, error);
+        }
+    }
+}
+
 // Copyright 2024 IOTA Stiftung.
 // SPDX-License-Identifier: Apache-2.0.
 /**
@@ -1199,4 +1233,4 @@ function initSchema(options) {
     }
 }
 
-export { EntityStorageIdentityConnector, EntityStorageIdentityProfileConnector, IdentityDocument, IdentityProfile, initSchema };
+export { EntityStorageIdentityConnector, EntityStorageIdentityProfileConnector, EntityStorageIdentityResolverConnector, IdentityDocument, IdentityProfile, initSchema };

package/dist/types/entityStorageIdentityConnector.d.ts

@@ -25,13 +25,6 @@ export declare class EntityStorageIdentityConnector implements IIdentityConnecto
      * @returns The created document.
      */
     createDocument(controller: string): Promise<IDidDocument>;
-    /**
-     * Resolve a document from its id.
-     * @param documentId The id of the document to resolve.
-     * @returns The resolved document.
-     * @throws NotFoundError if the id can not be resolved.
-     */
-    resolveDocument(documentId: string): Promise<IDidDocument>;
     /**
      * Add a verification method to the document in JSON Web key Format.
      * @param controller The controller of the identity who can make changes.

package/dist/types/entityStorageIdentityResolverConnector.d.ts

@@ -0,0 +1,28 @@
+import type { IIdentityResolverConnector } from "@twin.org/identity-models";
+import type { IDidDocument } from "@twin.org/standards-w3c-did";
+import type { IEntityStorageIdentityResolverConnectorConstructorOptions } from "./models/IEntityStorageIdentityResolverConnectorConstructorOptions";
+/**
+ * Class for performing identity operations using entity storage.
+ */
+export declare class EntityStorageIdentityResolverConnector implements IIdentityResolverConnector {
+    /**
+     * The namespace supported by the identity connector.
+     */
+    static readonly NAMESPACE: string;
+    /**
+     * Runtime name for the class.
+     */
+    readonly CLASS_NAME: string;
+    /**
+     * Create a new instance of EntityStorageIdentityResolverConnector.
+     * @param options The options for the identity connector.
+     */
+    constructor(options?: IEntityStorageIdentityResolverConnectorConstructorOptions);
+    /**
+     * Resolve a document from its id.
+     * @param documentId The id of the document to resolve.
+     * @returns The resolved document.
+     * @throws NotFoundError if the id can not be resolved.
+     */
+    resolveDocument(documentId: string): Promise<IDidDocument>;
+}

package/dist/types/index.d.ts

@@ -2,6 +2,8 @@ export * from "./entities/identityDocument";
 export * from "./entities/identityProfile";
 export * from "./entityStorageIdentityConnector";
 export * from "./entityStorageIdentityProfileConnector";
+export * from "./entityStorageIdentityResolverConnector";
 export * from "./models/IEntityStorageIdentityConnectorConstructorOptions";
 export * from "./models/IEntityStorageIdentityProfileConnectorConstructorOptions";
+export * from "./models/IEntityStorageIdentityResolverConnectorConstructorOptions";
 export * from "./schema";

package/dist/types/models/IEntityStorageIdentityConnectorConstructorOptions.d.ts

@@ -1,15 +1,6 @@
+import type { IEntityStorageIdentityResolverConnectorConstructorOptions } from "./IEntityStorageIdentityResolverConnectorConstructorOptions";
 /**
  * Options for the entity storage identity connector constructor.
  */
-export interface IEntityStorageIdentityConnectorConstructorOptions {
-    /**
-     * The entity storage for the did documents.
-     * @default identity-document
-     */
-    didDocumentEntityStorageType?: string;
-    /**
-     * The vault for the private keys.
-     * @default vault
-     */
-    vaultConnectorType?: string;
+export interface IEntityStorageIdentityConnectorConstructorOptions extends IEntityStorageIdentityResolverConnectorConstructorOptions {
 }

package/dist/types/models/IEntityStorageIdentityResolverConnectorConstructorOptions.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Options for the entity storage identity connector constructor.
+ */
+export interface IEntityStorageIdentityResolverConnectorConstructorOptions {
+    /**
+     * The entity storage for the did documents.
+     * @default identity-document
+     */
+    didDocumentEntityStorageType?: string;
+    /**
+     * The vault for the private keys.
+     * @default vault
+     */
+    vaultConnectorType?: string;
+}

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/identity-connector-entity-storage- Changelog
 
-## v0.0.1-next.20
+## v0.0.1-next.21
 
 - Initial Release

package/docs/reference/classes/EntityStorageIdentityConnector.md

@@ -74,36 +74,6 @@ The created document.
 
 ***
 
-### resolveDocument()
-
-> **resolveDocument**(`documentId`): `Promise`\<`IDidDocument`\>
-
-Resolve a document from its id.
-
-#### Parameters
-
-##### documentId
-
-`string`
-
-The id of the document to resolve.
-
-#### Returns
-
-`Promise`\<`IDidDocument`\>
-
-The resolved document.
-
-#### Throws
-
-NotFoundError if the id can not be resolved.
-
-#### Implementation of
-
-`IIdentityConnector.resolveDocument`
-
-***
-
 ### addVerificationMethod()
 
 > **addVerificationMethod**(`controller`, `documentId`, `verificationMethodType`, `verificationMethodId`?): `Promise`\<`IDidDocumentVerificationMethod`\>

package/docs/reference/classes/EntityStorageIdentityResolverConnector.md

@@ -0,0 +1,77 @@
+# Class: EntityStorageIdentityResolverConnector
+
+Class for performing identity operations using entity storage.
+
+## Implements
+
+- `IIdentityResolverConnector`
+
+## Constructors
+
+### new EntityStorageIdentityResolverConnector()
+
+> **new EntityStorageIdentityResolverConnector**(`options`?): [`EntityStorageIdentityResolverConnector`](EntityStorageIdentityResolverConnector.md)
+
+Create a new instance of EntityStorageIdentityResolverConnector.
+
+#### Parameters
+
+##### options?
+
+[`IEntityStorageIdentityResolverConnectorConstructorOptions`](../interfaces/IEntityStorageIdentityResolverConnectorConstructorOptions.md)
+
+The options for the identity connector.
+
+#### Returns
+
+[`EntityStorageIdentityResolverConnector`](EntityStorageIdentityResolverConnector.md)
+
+## Properties
+
+### NAMESPACE
+
+> `readonly` `static` **NAMESPACE**: `string` = `"entity-storage"`
+
+The namespace supported by the identity connector.
+
+***
+
+### CLASS\_NAME
+
+> `readonly` **CLASS\_NAME**: `string`
+
+Runtime name for the class.
+
+#### Implementation of
+
+`IIdentityResolverConnector.CLASS_NAME`
+
+## Methods
+
+### resolveDocument()
+
+> **resolveDocument**(`documentId`): `Promise`\<`IDidDocument`\>
+
+Resolve a document from its id.
+
+#### Parameters
+
+##### documentId
+
+`string`
+
+The id of the document to resolve.
+
+#### Returns
+
+`Promise`\<`IDidDocument`\>
+
+The resolved document.
+
+#### Throws
+
+NotFoundError if the id can not be resolved.
+
+#### Implementation of
+
+`IIdentityResolverConnector.resolveDocument`

package/docs/reference/index.md

@@ -6,11 +6,13 @@
 - [IdentityProfile](classes/IdentityProfile.md)
 - [EntityStorageIdentityConnector](classes/EntityStorageIdentityConnector.md)
 - [EntityStorageIdentityProfileConnector](classes/EntityStorageIdentityProfileConnector.md)
+- [EntityStorageIdentityResolverConnector](classes/EntityStorageIdentityResolverConnector.md)
 
 ## Interfaces
 
 - [IEntityStorageIdentityConnectorConstructorOptions](interfaces/IEntityStorageIdentityConnectorConstructorOptions.md)
 - [IEntityStorageIdentityProfileConnectorConstructorOptions](interfaces/IEntityStorageIdentityProfileConnectorConstructorOptions.md)
+- [IEntityStorageIdentityResolverConnectorConstructorOptions](interfaces/IEntityStorageIdentityResolverConnectorConstructorOptions.md)
 
 ## Functions
 

package/docs/reference/interfaces/IEntityStorageIdentityConnectorConstructorOptions.md

@@ -2,6 +2,10 @@
 
 Options for the entity storage identity connector constructor.
 
+## Extends
+
+- [`IEntityStorageIdentityResolverConnectorConstructorOptions`](IEntityStorageIdentityResolverConnectorConstructorOptions.md)
+
 ## Properties
 
 ### didDocumentEntityStorageType?
@@ -16,6 +20,10 @@ The entity storage for the did documents.
 identity-document
 ```
 
+#### Inherited from
+
+[`IEntityStorageIdentityResolverConnectorConstructorOptions`](IEntityStorageIdentityResolverConnectorConstructorOptions.md).[`didDocumentEntityStorageType`](IEntityStorageIdentityResolverConnectorConstructorOptions.md#diddocumententitystoragetype)
+
 ***
 
 ### vaultConnectorType?
@@ -29,3 +37,7 @@ The vault for the private keys.
 ```ts
 vault
 ```
+
+#### Inherited from
+
+[`IEntityStorageIdentityResolverConnectorConstructorOptions`](IEntityStorageIdentityResolverConnectorConstructorOptions.md).[`vaultConnectorType`](IEntityStorageIdentityResolverConnectorConstructorOptions.md#vaultconnectortype)

package/docs/reference/interfaces/IEntityStorageIdentityResolverConnectorConstructorOptions.md

@@ -0,0 +1,35 @@
+# Interface: IEntityStorageIdentityResolverConnectorConstructorOptions
+
+Options for the entity storage identity connector constructor.
+
+## Extended by
+
+- [`IEntityStorageIdentityConnectorConstructorOptions`](IEntityStorageIdentityConnectorConstructorOptions.md)
+
+## Properties
+
+### didDocumentEntityStorageType?
+
+> `optional` **didDocumentEntityStorageType**: `string`
+
+The entity storage for the did documents.
+
+#### Default
+
+```ts
+identity-document
+```
+
+***
+
+### vaultConnectorType?
+
+> `optional` **vaultConnectorType**: `string`
+
+The vault for the private keys.
+
+#### Default
+
+```ts
+vault
+```

package/locales/en.json

@@ -1,9 +1,12 @@
 {
 	"error": {
+		"entityStorageIdentityResolverConnector": {
+			"documentNotFound": "The document could not be found",
+			"resolveDocumentFailed": "Resolving the document failed"
+		},
 		"entityStorageIdentityConnector": {
 			"createDocumentFailed": "Creating the document failed",
 			"signatureVerificationFailed": "The document integrity check failed",
-			"resolveDocumentFailed": "Resolving the document failed",
 			"missingDid": "The full id including DID is required",
 			"addVerificationMethodFailed": "Adding the verification method failed",
 			"removeVerificationMethodFailed": "Removing the verification method failed",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/identity-connector-entity-storage",
-	"version": "0.0.1-next.20",
+	"version": "0.0.1-next.21",
 	"description": "Identity connector implementation using entity storage",
 	"repository": {
 		"type": "git",
@@ -19,7 +19,7 @@
 		"@twin.org/data-core": "next",
 		"@twin.org/data-json-ld": "next",
 		"@twin.org/entity": "next",
-		"@twin.org/identity-models": "0.0.1-next.20",
+		"@twin.org/identity-models": "0.0.1-next.21",
 		"@twin.org/nameof": "next",
 		"@twin.org/standards-w3c-did": "next",
 		"@twin.org/vault-models": "next",
@@ -30,9 +30,9 @@
 	"types": "./dist/types/index.d.ts",
 	"exports": {
 		".": {
+			"types": "./dist/types/index.d.ts",
 			"require": "./dist/cjs/index.cjs",
-			"import": "./dist/esm/index.mjs",
-			"types": "./dist/types/index.d.ts"
+			"import": "./dist/esm/index.mjs"
 		},
 		"./locales/*.json": "./locales/*.json"
 	},