@twin.org/identity-connector-entity-storage 0.0.1-next.23 → 0.0.1-next.25

package/dist/cjs/index.cjs

@@ -36,19 +36,19 @@ exports.IdentityDocument = class IdentityDocument {
 __decorate([
     entity.property({ type: "string", isPrimary: true }),
     __metadata("design:type", String)
-], exports.IdentityDocument.prototype, "id", undefined);
+], exports.IdentityDocument.prototype, "id", void 0);
 __decorate([
     entity.property({ type: "object" }),
     __metadata("design:type", Object)
-], exports.IdentityDocument.prototype, "document", undefined);
+], exports.IdentityDocument.prototype, "document", void 0);
 __decorate([
     entity.property({ type: "string" }),
     __metadata("design:type", String)
-], exports.IdentityDocument.prototype, "signature", undefined);
+], exports.IdentityDocument.prototype, "signature", void 0);
 __decorate([
     entity.property({ type: "string" }),
     __metadata("design:type", String)
-], exports.IdentityDocument.prototype, "controller", undefined);
+], exports.IdentityDocument.prototype, "controller", void 0);
 exports.IdentityDocument = __decorate([
     entity.entity()
 ], exports.IdentityDocument);
@@ -75,15 +75,15 @@ exports.IdentityProfile = class IdentityProfile {
 __decorate([
     entity.property({ type: "string", isPrimary: true }),
     __metadata("design:type", String)
-], exports.IdentityProfile.prototype, "identity", undefined);
+], exports.IdentityProfile.prototype, "identity", void 0);
 __decorate([
     entity.property({ type: "object" }),
     __metadata("design:type", Object)
-], exports.IdentityProfile.prototype, "publicProfile", undefined);
+], exports.IdentityProfile.prototype, "publicProfile", void 0);
 __decorate([
     entity.property({ type: "object" }),
     __metadata("design:type", Object)
-], exports.IdentityProfile.prototype, "privateProfile", undefined);
+], exports.IdentityProfile.prototype, "privateProfile", void 0);
 exports.IdentityProfile = __decorate([
     entity.entity()
 ], exports.IdentityProfile);
@@ -251,8 +251,8 @@ class EntityStorageIdentityConnector {
         core.Guards.stringValue(this.CLASS_NAME, "controller", controller);
         core.Guards.stringValue(this.CLASS_NAME, "verificationMethodId", verificationMethodId);
         try {
-            const idParts = identityModels.DocumentHelper.parse(verificationMethodId);
-            if (core.Is.empty(idParts.hash)) {
+            const idParts = identityModels.DocumentHelper.parseId(verificationMethodId);
+            if (core.Is.empty(idParts.fragment)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "missingDid", verificationMethodId);
             }
             const didIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
@@ -300,8 +300,18 @@ class EntityStorageIdentityConnector {
         core.Guards.stringValue(this.CLASS_NAME, "controller", controller);
         core.Guards.stringValue(this.CLASS_NAME, "documentId", documentId);
         core.Guards.stringValue(this.CLASS_NAME, "serviceId", serviceId);
-        core.Guards.stringValue(this.CLASS_NAME, "serviceType", serviceType);
-        core.Guards.stringValue(this.CLASS_NAME, "serviceEndpoint", serviceEndpoint);
+        if (core.Is.array(serviceType)) {
+            core.Guards.arrayValue(this.CLASS_NAME, "serviceType", serviceType);
+        }
+        else {
+            core.Guards.stringValue(this.CLASS_NAME, "serviceType", serviceType);
+        }
+        if (core.Is.array(serviceEndpoint)) {
+            core.Guards.arrayValue(this.CLASS_NAME, "serviceEndpoint", serviceEndpoint);
+        }
+        else {
+            core.Guards.stringValue(this.CLASS_NAME, "serviceEndpoint", serviceEndpoint);
+        }
         try {
             const didIdentityDocument = await this._didDocumentEntityStorage.get(documentId);
             if (core.Is.undefined(didIdentityDocument)) {
@@ -341,8 +351,8 @@ class EntityStorageIdentityConnector {
         core.Guards.stringValue(this.CLASS_NAME, "controller", controller);
         core.Guards.stringValue(this.CLASS_NAME, "serviceId", serviceId);
         try {
-            const idParts = identityModels.DocumentHelper.parse(serviceId);
-            if (core.Is.empty(idParts.hash)) {
+            const idParts = identityModels.DocumentHelper.parseId(serviceId);
+            if (core.Is.empty(idParts.fragment)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "missingDid", serviceId);
             }
             const didIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
@@ -374,21 +384,21 @@ class EntityStorageIdentityConnector {
      * @param controller The controller of the identity who can make changes.
      * @param verificationMethodId The verification method id to use.
      * @param id The id of the credential.
-     * @param credential The credential to store in the verifiable credential.
+     * @param subject The credential subject to store in the verifiable credential.
      * @param revocationIndex The bitmap revocation index of the credential, if undefined will not have revocation status.
      * @returns The created verifiable credential and its token.
      * @throws NotFoundError if the id can not be resolved.
      */
-    async createVerifiableCredential(controller, verificationMethodId, id, credential, revocationIndex) {
+    async createVerifiableCredential(controller, verificationMethodId, id, subject, revocationIndex) {
         core.Guards.stringValue(this.CLASS_NAME, "controller", controller);
         core.Guards.stringValue(this.CLASS_NAME, "verificationMethodId", verificationMethodId);
-        core.Guards.object(this.CLASS_NAME, "credential", credential);
+        core.Guards.object(this.CLASS_NAME, "subject", subject);
         if (!core.Is.undefined(revocationIndex)) {
             core.Guards.number(this.CLASS_NAME, "revocationIndex", revocationIndex);
         }
         try {
-            const idParts = identityModels.DocumentHelper.parse(verificationMethodId);
-            if (core.Is.empty(idParts.hash)) {
+            const idParts = identityModels.DocumentHelper.parseId(verificationMethodId);
+            if (core.Is.empty(idParts.fragment)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "missingDid", verificationMethodId);
             }
             const issuerIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
@@ -414,11 +424,13 @@ class EntityStorageIdentityConnector {
                 });
             }
             const revocationService = issuerDidDocument.service?.find(s => s.id.endsWith("#revocation"));
-            const credentialClone = core.ObjectHelper.clone(credential);
+            const subjectClone = core.ObjectHelper.clone(subject);
             const finalTypes = [standardsW3cDid.DidTypes.VerifiableCredential];
-            const credContext = core.ObjectHelper.extractProperty(credentialClone, ["@context"]);
-            const credId = core.ObjectHelper.extractProperty(credentialClone, ["@id", "id"], false);
-            const credType = core.ObjectHelper.extractProperty(credentialClone, ["@type", "type"]);
+            const credContext = core.ObjectHelper.extractProperty(subjectClone, [
+                "@context"
+            ]);
+            const credId = core.ObjectHelper.extractProperty(subjectClone, ["@id", "id"], false);
+            const credType = core.ObjectHelper.extractProperty(subjectClone, ["@type", "type"]);
             if (core.Is.stringValue(credType)) {
                 finalTypes.push(credType);
             }
@@ -426,7 +438,7 @@ class EntityStorageIdentityConnector {
                 "@context": dataJsonLd.JsonLdProcessor.combineContexts(standardsW3cDid.DidContexts.ContextVCv2, credContext),
                 id,
                 type: finalTypes,
-                credentialSubject: credentialClone,
+                credentialSubject: subjectClone,
                 issuer: issuerDidDocument.id,
                 issuanceDate: new Date().toISOString(),
                 credentialStatus: revocationService && !core.Is.undefined(revocationIndex)
@@ -467,7 +479,7 @@ class EntityStorageIdentityConnector {
                 vc: jwtVc
             };
             const signature = await web.Jwt.encodeWithSigner(jwtHeader, jwtPayload, async (alg, key, payload) => {
-                const sig = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
+                const sig = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.fragment ?? ""), payload);
                 return sig;
             });
             return {
@@ -634,7 +646,7 @@ class EntityStorageIdentityConnector {
     /**
      * Create a verifiable presentation from the supplied verifiable credentials.
      * @param controller The controller of the identity who can make changes.
-     * @param presentationMethodId The method to associate with the presentation.
+     * @param verificationMethodId The method to associate with the presentation.
      * @param presentationId The id of the presentation.
      * @param contexts The contexts for the data stored in the verifiable credential.
      * @param types The types for the data stored in the verifiable credential.
@@ -643,9 +655,9 @@ class EntityStorageIdentityConnector {
      * @returns The created verifiable presentation and its token.
      * @throws NotFoundError if the id can not be resolved.
      */
-    async createVerifiablePresentation(controller, presentationMethodId, presentationId, contexts, types, verifiableCredentials, expiresInMinutes) {
+    async createVerifiablePresentation(controller, verificationMethodId, presentationId, contexts, types, verifiableCredentials, expiresInMinutes) {
         core.Guards.stringValue(this.CLASS_NAME, "controller", controller);
-        core.Guards.stringValue(this.CLASS_NAME, "presentationMethodId", presentationMethodId);
+        core.Guards.stringValue(this.CLASS_NAME, "verificationMethodId", verificationMethodId);
         if (core.Is.array(types)) {
             core.Guards.arrayValue(this.CLASS_NAME, "types", types);
         }
@@ -657,9 +669,9 @@ class EntityStorageIdentityConnector {
             core.Guards.integer(this.CLASS_NAME, "expiresInMinutes", expiresInMinutes);
         }
         try {
-            const idParts = identityModels.DocumentHelper.parse(presentationMethodId);
-            if (core.Is.empty(idParts.hash)) {
-                throw new core.NotFoundError(this.CLASS_NAME, "missingDid", presentationMethodId);
+            const idParts = identityModels.DocumentHelper.parseId(verificationMethodId);
+            if (core.Is.empty(idParts.fragment)) {
+                throw new core.NotFoundError(this.CLASS_NAME, "missingDid", verificationMethodId);
             }
             const holderIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
             if (core.Is.undefined(holderIdentityDocument)) {
@@ -670,17 +682,17 @@ class EntityStorageIdentityConnector {
             const methods = this.getAllMethods(holderDidDocument);
             const methodAndArray = methods.find(m => {
                 if (core.Is.string(m.method)) {
-                    return m.method === presentationMethodId;
+                    return m.method === verificationMethodId;
                 }
-                return m.method.id === presentationMethodId;
+                return m.method.id === verificationMethodId;
             });
             if (!methodAndArray) {
-                throw new core.GeneralError(this.CLASS_NAME, "methodMissing", { method: presentationMethodId });
+                throw new core.GeneralError(this.CLASS_NAME, "methodMissing", { method: verificationMethodId });
             }
             const didMethod = methodAndArray.method;
             if (!core.Is.stringValue(didMethod.publicKeyJwk?.x)) {
                 throw new core.GeneralError(this.CLASS_NAME, "publicKeyJwkMissing", {
-                    method: presentationMethodId
+                    method: verificationMethodId
                 });
             }
             const finalTypes = [standardsW3cDid.DidTypes.VerifiablePresentation];
@@ -717,7 +729,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(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
+                const sig = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.fragment ?? ""), payload);
                 return sig;
             });
             return {
@@ -810,8 +822,8 @@ class EntityStorageIdentityConnector {
         core.Guards.stringValue(this.CLASS_NAME, "verificationMethodId", verificationMethodId);
         core.Guards.uint8Array(this.CLASS_NAME, "bytes", bytes);
         try {
-            const idParts = identityModels.DocumentHelper.parse(verificationMethodId);
-            if (core.Is.empty(idParts.hash)) {
+            const idParts = identityModels.DocumentHelper.parseId(verificationMethodId);
+            if (core.Is.empty(idParts.fragment)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "missingDid", verificationMethodId);
             }
             const didIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
@@ -836,7 +848,7 @@ class EntityStorageIdentityConnector {
                     method: verificationMethodId
                 });
             }
-            const signature = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, idParts.hash ?? ""), bytes);
+            const signature = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, idParts.fragment ?? ""), bytes);
             return {
                 "@context": standardsW3cDid.DidContexts.ContextVCDataIntegrity,
                 type: standardsW3cDid.DidTypes.DataIntegrityProof,
@@ -871,8 +883,8 @@ class EntityStorageIdentityConnector {
             if (proof.cryptosuite !== standardsW3cDid.DidCryptoSuites.EdDSAJcs2022) {
                 throw new core.GeneralError(this.CLASS_NAME, "cryptoSuite", { cryptosuite: proof.cryptosuite });
             }
-            const idParts = identityModels.DocumentHelper.parse(proof.verificationMethod);
-            if (core.Is.empty(idParts.hash)) {
+            const idParts = identityModels.DocumentHelper.parseId(proof.verificationMethod);
+            if (core.Is.empty(idParts.fragment)) {
                 throw new core.NotFoundError(this.CLASS_NAME, "missingDid", proof.verificationMethod);
             }
             const didIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
@@ -899,7 +911,7 @@ class EntityStorageIdentityConnector {
                     method: proof.verificationMethodId
                 });
             }
-            return this._vaultConnector.verify(EntityStorageIdentityConnector.buildVaultKey(didIdentityDocument.id, idParts.hash), bytes, core.Converter.base58ToBytes(proof.proofValue));
+            return this._vaultConnector.verify(EntityStorageIdentityConnector.buildVaultKey(didIdentityDocument.id, idParts.fragment), bytes, core.Converter.base58ToBytes(proof.proofValue));
         }
         catch (error) {
             throw new core.GeneralError(this.CLASS_NAME, "verifyProofFailed", undefined, error);

package/dist/esm/index.mjs

@@ -34,19 +34,19 @@ let IdentityDocument = class IdentityDocument {
 __decorate([
     property({ type: "string", isPrimary: true }),
     __metadata("design:type", String)
-], IdentityDocument.prototype, "id", undefined);
+], IdentityDocument.prototype, "id", void 0);
 __decorate([
     property({ type: "object" }),
     __metadata("design:type", Object)
-], IdentityDocument.prototype, "document", undefined);
+], IdentityDocument.prototype, "document", void 0);
 __decorate([
     property({ type: "string" }),
     __metadata("design:type", String)
-], IdentityDocument.prototype, "signature", undefined);
+], IdentityDocument.prototype, "signature", void 0);
 __decorate([
     property({ type: "string" }),
     __metadata("design:type", String)
-], IdentityDocument.prototype, "controller", undefined);
+], IdentityDocument.prototype, "controller", void 0);
 IdentityDocument = __decorate([
     entity()
 ], IdentityDocument);
@@ -73,15 +73,15 @@ let IdentityProfile = class IdentityProfile {
 __decorate([
     property({ type: "string", isPrimary: true }),
     __metadata("design:type", String)
-], IdentityProfile.prototype, "identity", undefined);
+], IdentityProfile.prototype, "identity", void 0);
 __decorate([
     property({ type: "object" }),
     __metadata("design:type", Object)
-], IdentityProfile.prototype, "publicProfile", undefined);
+], IdentityProfile.prototype, "publicProfile", void 0);
 __decorate([
     property({ type: "object" }),
     __metadata("design:type", Object)
-], IdentityProfile.prototype, "privateProfile", undefined);
+], IdentityProfile.prototype, "privateProfile", void 0);
 IdentityProfile = __decorate([
     entity()
 ], IdentityProfile);
@@ -249,8 +249,8 @@ class EntityStorageIdentityConnector {
         Guards.stringValue(this.CLASS_NAME, "controller", controller);
         Guards.stringValue(this.CLASS_NAME, "verificationMethodId", verificationMethodId);
         try {
-            const idParts = DocumentHelper.parse(verificationMethodId);
-            if (Is.empty(idParts.hash)) {
+            const idParts = DocumentHelper.parseId(verificationMethodId);
+            if (Is.empty(idParts.fragment)) {
                 throw new NotFoundError(this.CLASS_NAME, "missingDid", verificationMethodId);
             }
             const didIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
@@ -298,8 +298,18 @@ class EntityStorageIdentityConnector {
         Guards.stringValue(this.CLASS_NAME, "controller", controller);
         Guards.stringValue(this.CLASS_NAME, "documentId", documentId);
         Guards.stringValue(this.CLASS_NAME, "serviceId", serviceId);
-        Guards.stringValue(this.CLASS_NAME, "serviceType", serviceType);
-        Guards.stringValue(this.CLASS_NAME, "serviceEndpoint", serviceEndpoint);
+        if (Is.array(serviceType)) {
+            Guards.arrayValue(this.CLASS_NAME, "serviceType", serviceType);
+        }
+        else {
+            Guards.stringValue(this.CLASS_NAME, "serviceType", serviceType);
+        }
+        if (Is.array(serviceEndpoint)) {
+            Guards.arrayValue(this.CLASS_NAME, "serviceEndpoint", serviceEndpoint);
+        }
+        else {
+            Guards.stringValue(this.CLASS_NAME, "serviceEndpoint", serviceEndpoint);
+        }
         try {
             const didIdentityDocument = await this._didDocumentEntityStorage.get(documentId);
             if (Is.undefined(didIdentityDocument)) {
@@ -339,8 +349,8 @@ class EntityStorageIdentityConnector {
         Guards.stringValue(this.CLASS_NAME, "controller", controller);
         Guards.stringValue(this.CLASS_NAME, "serviceId", serviceId);
         try {
-            const idParts = DocumentHelper.parse(serviceId);
-            if (Is.empty(idParts.hash)) {
+            const idParts = DocumentHelper.parseId(serviceId);
+            if (Is.empty(idParts.fragment)) {
                 throw new NotFoundError(this.CLASS_NAME, "missingDid", serviceId);
             }
             const didIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
@@ -372,21 +382,21 @@ class EntityStorageIdentityConnector {
      * @param controller The controller of the identity who can make changes.
      * @param verificationMethodId The verification method id to use.
      * @param id The id of the credential.
-     * @param credential The credential to store in the verifiable credential.
+     * @param subject The credential subject to store in the verifiable credential.
      * @param revocationIndex The bitmap revocation index of the credential, if undefined will not have revocation status.
      * @returns The created verifiable credential and its token.
      * @throws NotFoundError if the id can not be resolved.
      */
-    async createVerifiableCredential(controller, verificationMethodId, id, credential, revocationIndex) {
+    async createVerifiableCredential(controller, verificationMethodId, id, subject, revocationIndex) {
         Guards.stringValue(this.CLASS_NAME, "controller", controller);
         Guards.stringValue(this.CLASS_NAME, "verificationMethodId", verificationMethodId);
-        Guards.object(this.CLASS_NAME, "credential", credential);
+        Guards.object(this.CLASS_NAME, "subject", subject);
         if (!Is.undefined(revocationIndex)) {
             Guards.number(this.CLASS_NAME, "revocationIndex", revocationIndex);
         }
         try {
-            const idParts = DocumentHelper.parse(verificationMethodId);
-            if (Is.empty(idParts.hash)) {
+            const idParts = DocumentHelper.parseId(verificationMethodId);
+            if (Is.empty(idParts.fragment)) {
                 throw new NotFoundError(this.CLASS_NAME, "missingDid", verificationMethodId);
             }
             const issuerIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
@@ -412,11 +422,13 @@ class EntityStorageIdentityConnector {
                 });
             }
             const revocationService = issuerDidDocument.service?.find(s => s.id.endsWith("#revocation"));
-            const credentialClone = ObjectHelper.clone(credential);
+            const subjectClone = ObjectHelper.clone(subject);
             const finalTypes = [DidTypes.VerifiableCredential];
-            const credContext = ObjectHelper.extractProperty(credentialClone, ["@context"]);
-            const credId = ObjectHelper.extractProperty(credentialClone, ["@id", "id"], false);
-            const credType = ObjectHelper.extractProperty(credentialClone, ["@type", "type"]);
+            const credContext = ObjectHelper.extractProperty(subjectClone, [
+                "@context"
+            ]);
+            const credId = ObjectHelper.extractProperty(subjectClone, ["@id", "id"], false);
+            const credType = ObjectHelper.extractProperty(subjectClone, ["@type", "type"]);
             if (Is.stringValue(credType)) {
                 finalTypes.push(credType);
             }
@@ -424,7 +436,7 @@ class EntityStorageIdentityConnector {
                 "@context": JsonLdProcessor.combineContexts(DidContexts.ContextVCv2, credContext),
                 id,
                 type: finalTypes,
-                credentialSubject: credentialClone,
+                credentialSubject: subjectClone,
                 issuer: issuerDidDocument.id,
                 issuanceDate: new Date().toISOString(),
                 credentialStatus: revocationService && !Is.undefined(revocationIndex)
@@ -465,7 +477,7 @@ class EntityStorageIdentityConnector {
                 vc: jwtVc
             };
             const signature = await Jwt.encodeWithSigner(jwtHeader, jwtPayload, async (alg, key, payload) => {
-                const sig = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
+                const sig = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.fragment ?? ""), payload);
                 return sig;
             });
             return {
@@ -632,7 +644,7 @@ class EntityStorageIdentityConnector {
     /**
      * Create a verifiable presentation from the supplied verifiable credentials.
      * @param controller The controller of the identity who can make changes.
-     * @param presentationMethodId The method to associate with the presentation.
+     * @param verificationMethodId The method to associate with the presentation.
      * @param presentationId The id of the presentation.
      * @param contexts The contexts for the data stored in the verifiable credential.
      * @param types The types for the data stored in the verifiable credential.
@@ -641,9 +653,9 @@ class EntityStorageIdentityConnector {
      * @returns The created verifiable presentation and its token.
      * @throws NotFoundError if the id can not be resolved.
      */
-    async createVerifiablePresentation(controller, presentationMethodId, presentationId, contexts, types, verifiableCredentials, expiresInMinutes) {
+    async createVerifiablePresentation(controller, verificationMethodId, presentationId, contexts, types, verifiableCredentials, expiresInMinutes) {
         Guards.stringValue(this.CLASS_NAME, "controller", controller);
-        Guards.stringValue(this.CLASS_NAME, "presentationMethodId", presentationMethodId);
+        Guards.stringValue(this.CLASS_NAME, "verificationMethodId", verificationMethodId);
         if (Is.array(types)) {
             Guards.arrayValue(this.CLASS_NAME, "types", types);
         }
@@ -655,9 +667,9 @@ class EntityStorageIdentityConnector {
             Guards.integer(this.CLASS_NAME, "expiresInMinutes", expiresInMinutes);
         }
         try {
-            const idParts = DocumentHelper.parse(presentationMethodId);
-            if (Is.empty(idParts.hash)) {
-                throw new NotFoundError(this.CLASS_NAME, "missingDid", presentationMethodId);
+            const idParts = DocumentHelper.parseId(verificationMethodId);
+            if (Is.empty(idParts.fragment)) {
+                throw new NotFoundError(this.CLASS_NAME, "missingDid", verificationMethodId);
             }
             const holderIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
             if (Is.undefined(holderIdentityDocument)) {
@@ -668,17 +680,17 @@ class EntityStorageIdentityConnector {
             const methods = this.getAllMethods(holderDidDocument);
             const methodAndArray = methods.find(m => {
                 if (Is.string(m.method)) {
-                    return m.method === presentationMethodId;
+                    return m.method === verificationMethodId;
                 }
-                return m.method.id === presentationMethodId;
+                return m.method.id === verificationMethodId;
             });
             if (!methodAndArray) {
-                throw new GeneralError(this.CLASS_NAME, "methodMissing", { method: presentationMethodId });
+                throw new GeneralError(this.CLASS_NAME, "methodMissing", { method: verificationMethodId });
             }
             const didMethod = methodAndArray.method;
             if (!Is.stringValue(didMethod.publicKeyJwk?.x)) {
                 throw new GeneralError(this.CLASS_NAME, "publicKeyJwkMissing", {
-                    method: presentationMethodId
+                    method: verificationMethodId
                 });
             }
             const finalTypes = [DidTypes.VerifiablePresentation];
@@ -715,7 +727,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(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.hash ?? ""), payload);
+                const sig = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(idParts.id, idParts.fragment ?? ""), payload);
                 return sig;
             });
             return {
@@ -808,8 +820,8 @@ class EntityStorageIdentityConnector {
         Guards.stringValue(this.CLASS_NAME, "verificationMethodId", verificationMethodId);
         Guards.uint8Array(this.CLASS_NAME, "bytes", bytes);
         try {
-            const idParts = DocumentHelper.parse(verificationMethodId);
-            if (Is.empty(idParts.hash)) {
+            const idParts = DocumentHelper.parseId(verificationMethodId);
+            if (Is.empty(idParts.fragment)) {
                 throw new NotFoundError(this.CLASS_NAME, "missingDid", verificationMethodId);
             }
             const didIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
@@ -834,7 +846,7 @@ class EntityStorageIdentityConnector {
                     method: verificationMethodId
                 });
             }
-            const signature = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, idParts.hash ?? ""), bytes);
+            const signature = await this._vaultConnector.sign(EntityStorageIdentityConnector.buildVaultKey(didDocument.id, idParts.fragment ?? ""), bytes);
             return {
                 "@context": DidContexts.ContextVCDataIntegrity,
                 type: DidTypes.DataIntegrityProof,
@@ -869,8 +881,8 @@ class EntityStorageIdentityConnector {
             if (proof.cryptosuite !== DidCryptoSuites.EdDSAJcs2022) {
                 throw new GeneralError(this.CLASS_NAME, "cryptoSuite", { cryptosuite: proof.cryptosuite });
             }
-            const idParts = DocumentHelper.parse(proof.verificationMethod);
-            if (Is.empty(idParts.hash)) {
+            const idParts = DocumentHelper.parseId(proof.verificationMethod);
+            if (Is.empty(idParts.fragment)) {
                 throw new NotFoundError(this.CLASS_NAME, "missingDid", proof.verificationMethod);
             }
             const didIdentityDocument = await this._didDocumentEntityStorage.get(idParts.id);
@@ -897,7 +909,7 @@ class EntityStorageIdentityConnector {
                     method: proof.verificationMethodId
                 });
             }
-            return this._vaultConnector.verify(EntityStorageIdentityConnector.buildVaultKey(didIdentityDocument.id, idParts.hash), bytes, Converter.base58ToBytes(proof.proofValue));
+            return this._vaultConnector.verify(EntityStorageIdentityConnector.buildVaultKey(didIdentityDocument.id, idParts.fragment), bytes, Converter.base58ToBytes(proof.proofValue));
         }
         catch (error) {
             throw new GeneralError(this.CLASS_NAME, "verifyProofFailed", undefined, error);

package/dist/types/entityStorageIdentityConnector.d.ts

@@ -55,7 +55,7 @@ export declare class EntityStorageIdentityConnector implements IIdentityConnecto
      * @returns The service.
      * @throws NotFoundError if the id can not be resolved.
      */
-    addService(controller: string, documentId: string, serviceId: string, serviceType: string, serviceEndpoint: string): Promise<IDidService>;
+    addService(controller: string, documentId: string, serviceId: string, serviceType: string | string[], serviceEndpoint: string | string[]): Promise<IDidService>;
     /**
      * Remove a service from the document.
      * @param controller The controller of the identity who can make changes.
@@ -69,12 +69,12 @@ export declare class EntityStorageIdentityConnector implements IIdentityConnecto
      * @param controller The controller of the identity who can make changes.
      * @param verificationMethodId The verification method id to use.
      * @param id The id of the credential.
-     * @param credential The credential to store in the verifiable credential.
+     * @param subject The credential subject to store in the verifiable credential.
      * @param revocationIndex The bitmap revocation index of the credential, if undefined will not have revocation status.
      * @returns The created verifiable credential and its token.
      * @throws NotFoundError if the id can not be resolved.
      */
-    createVerifiableCredential(controller: string, verificationMethodId: string, id: string | undefined, credential: IJsonLdNodeObject, revocationIndex?: number): Promise<{
+    createVerifiableCredential(controller: string, verificationMethodId: string, id: string | undefined, subject: IJsonLdNodeObject, revocationIndex?: number): Promise<{
         verifiableCredential: IDidVerifiableCredential;
         jwt: string;
     }>;
@@ -106,7 +106,7 @@ export declare class EntityStorageIdentityConnector implements IIdentityConnecto
     /**
      * Create a verifiable presentation from the supplied verifiable credentials.
      * @param controller The controller of the identity who can make changes.
-     * @param presentationMethodId The method to associate with the presentation.
+     * @param verificationMethodId The method to associate with the presentation.
      * @param presentationId The id of the presentation.
      * @param contexts The contexts for the data stored in the verifiable credential.
      * @param types The types for the data stored in the verifiable credential.
@@ -115,7 +115,7 @@ export declare class EntityStorageIdentityConnector implements IIdentityConnecto
      * @returns The created verifiable presentation and its token.
      * @throws NotFoundError if the id can not be resolved.
      */
-    createVerifiablePresentation(controller: string, presentationMethodId: string, presentationId: string | undefined, contexts: IJsonLdContextDefinitionRoot | undefined, types: string | string[] | undefined, verifiableCredentials: (string | IDidVerifiableCredential)[], expiresInMinutes?: number): Promise<{
+    createVerifiablePresentation(controller: string, verificationMethodId: string, presentationId: string | undefined, contexts: IJsonLdContextDefinitionRoot | undefined, types: string | string[] | undefined, verifiableCredentials: (string | IDidVerifiableCredential)[], expiresInMinutes?: number): Promise<{
         verifiablePresentation: IDidVerifiablePresentation;
         jwt: string;
     }>;

package/docs/changelog.md

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

package/docs/reference/classes/EntityStorageIdentityConnector.md

@@ -194,16 +194,16 @@ The id of the service.
 
 ##### serviceType
 
-`string`
-
 The type of the service.
 
-##### serviceEndpoint
+`string` | `string`[]
 
-`string`
+##### serviceEndpoint
 
 The endpoint for the service.
 
+`string` | `string`[]
+
 #### Returns
 
 `Promise`\<`IDidService`\>
@@ -258,7 +258,7 @@ NotFoundError if the id can not be resolved.
 
 ### createVerifiableCredential()
 
-> **createVerifiableCredential**(`controller`, `verificationMethodId`, `id`, `credential`, `revocationIndex`?): `Promise`\<\{ `verifiableCredential`: `IDidVerifiableCredential`; `jwt`: `string`; \}\>
+> **createVerifiableCredential**(`controller`, `verificationMethodId`, `id`, `subject`, `revocationIndex`?): `Promise`\<\{ `verifiableCredential`: `IDidVerifiableCredential`; `jwt`: `string`; \}\>
 
 Create a verifiable credential for a verification method.
 
@@ -282,11 +282,11 @@ The id of the credential.
 
 `undefined` | `string`
 
-##### credential
+##### subject
 
 `IJsonLdNodeObject`
 
-The credential to store in the verifiable credential.
+The credential subject to store in the verifiable credential.
 
 ##### revocationIndex?
 
@@ -414,7 +414,7 @@ Nothing.
 
 ### createVerifiablePresentation()
 
-> **createVerifiablePresentation**(`controller`, `presentationMethodId`, `presentationId`, `contexts`, `types`, `verifiableCredentials`, `expiresInMinutes`?): `Promise`\<\{ `verifiablePresentation`: `IDidVerifiablePresentation`; `jwt`: `string`; \}\>
+> **createVerifiablePresentation**(`controller`, `verificationMethodId`, `presentationId`, `contexts`, `types`, `verifiableCredentials`, `expiresInMinutes`?): `Promise`\<\{ `verifiablePresentation`: `IDidVerifiablePresentation`; `jwt`: `string`; \}\>
 
 Create a verifiable presentation from the supplied verifiable credentials.
 
@@ -426,7 +426,7 @@ Create a verifiable presentation from the supplied verifiable credentials.
 
 The controller of the identity who can make changes.
 
-##### presentationMethodId
+##### verificationMethodId
 
 `string`
 

package/docs/reference/functions/initSchema.md

@@ -10,13 +10,13 @@ Initialize the schema for the identity entity storage connector.
 
 Options for which entities to register.
 
-#### includeDocument
+#### includeDocument?
 
 `boolean`
 
 Whether to include the document entity, defaults to true.
 
-#### includeProfile
+#### includeProfile?
 
 `boolean`
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/identity-connector-entity-storage",
-	"version": "0.0.1-next.23",
+	"version": "0.0.1-next.25",
 	"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.23",
+		"@twin.org/identity-models": "0.0.1-next.25",
 		"@twin.org/nameof": "next",
 		"@twin.org/standards-w3c-did": "next",
 		"@twin.org/vault-models": "next",