@twin.org/identity-connector-entity-storage 0.0.1-next.4 → 0.0.1-next.6

package/dist/cjs/index.cjs

@@ -3,6 +3,7 @@
 var entity = require('@twin.org/entity');
 var core = require('@twin.org/core');
 var crypto = require('@twin.org/crypto');
+var dataJsonLd = require('@twin.org/data-json-ld');
 var entityStorageModels = require('@twin.org/entity-storage-models');
 var identityModels = require('@twin.org/identity-models');
 var standardsW3cDid = require('@twin.org/standards-w3c-did');
@@ -372,38 +373,16 @@ class EntityStorageIdentityConnector {
      * Create a verifiable credential for a verification method.
      * @param controller The controller of the identity who can make changes.
      * @param verificationMethodId The verification method id to use.
-     * @param credentialId The id of the credential.
-     * @param types The type for the data stored in the verifiable credential.
-     * @param subject The subject data to store for the credential.
-     * @param contexts Additional contexts to include in the credential.
+     * @param id The id of the credential.
+     * @param credential The credential 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, credentialId, types, subject, contexts, revocationIndex) {
+    async createVerifiableCredential(controller, verificationMethodId, id, credential, revocationIndex) {
         core.Guards.stringValue(this.CLASS_NAME, "controller", controller);
         core.Guards.stringValue(this.CLASS_NAME, "verificationMethodId", verificationMethodId);
-        if (!core.Is.undefined(credentialId)) {
-            core.Guards.stringValue(this.CLASS_NAME, "credentialId", credentialId);
-        }
-        if (core.Is.array(types)) {
-            core.Guards.array(this.CLASS_NAME, "types", types);
-        }
-        else if (!core.Is.undefined(types)) {
-            core.Guards.stringValue(this.CLASS_NAME, "types", types);
-        }
-        if (core.Is.array(subject)) {
-            core.Guards.arrayValue(this.CLASS_NAME, "subject", subject);
-        }
-        else {
-            core.Guards.object(this.CLASS_NAME, "subject", subject);
-        }
-        if (core.Is.array(contexts)) {
-            core.Guards.array(this.CLASS_NAME, "contexts", contexts);
-        }
-        else if (!core.Is.undefined(contexts)) {
-            core.Guards.stringValue(this.CLASS_NAME, "contexts", contexts);
-        }
+        core.Guards.object(this.CLASS_NAME, "credential", credential);
         if (!core.Is.undefined(revocationIndex)) {
             core.Guards.number(this.CLASS_NAME, "revocationIndex", revocationIndex);
         }
@@ -434,24 +413,18 @@ class EntityStorageIdentityConnector {
             }
             const revocationService = issuerDidDocument.service?.find(s => s.id.endsWith("#revocation"));
             const finalTypes = ["VerifiableCredential"];
-            if (core.Is.array(types)) {
-                finalTypes.push(...types);
-            }
-            else if (core.Is.stringValue(types)) {
-                finalTypes.push(types);
-            }
-            const finalContexts = ["https://www.w3.org/2018/credentials/v1"];
-            if (core.Is.array(contexts)) {
-                finalContexts.push(...contexts);
-            }
-            else if (core.Is.stringValue(contexts)) {
-                finalContexts.push(contexts);
+            const credContext = dataJsonLd.JsonLdProcessor.extractProperty(credential, ["@context"]);
+            const credId = dataJsonLd.JsonLdProcessor.extractProperty(credential, ["@id", "id"], false);
+            const credType = dataJsonLd.JsonLdProcessor.extractProperty(credential, ["@type", "type"]);
+            if (core.Is.stringValue(credType)) {
+                finalTypes.push(credType);
             }
             const verifiableCredential = {
-                "@context": finalContexts,
-                id: credentialId,
+                "@context": dataJsonLd.JsonLdProcessor.combineContexts("https://www.w3.org/2018/credentials/v2", credContext) ??
+                    null,
+                id,
                 type: finalTypes,
-                credentialSubject: subject,
+                credentialSubject: credential,
                 issuer: issuerDidDocument.id,
                 issuanceDate: new Date().toISOString(),
                 credentialStatus: revocationService && !core.Is.undefined(revocationIndex)
@@ -488,9 +461,7 @@ class EntityStorageIdentityConnector {
                 iss: idParts.id,
                 nbf: Math.floor(Date.now() / 1000),
                 jti: verifiableCredential.id,
-                sub: core.Is.array(subject)
-                    ? core.ObjectHelper.propertyGet(subject[0], "id")
-                    : core.ObjectHelper.propertyGet(subject, "id"),
+                sub: credId,
                 vc: jwtVc
             };
             const signature = await web.Jwt.encodeWithSigner(jwtHeader, jwtPayload, async (alg, key, payload) => {
@@ -662,14 +633,15 @@ 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 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.
      * @param verifiableCredentials The credentials to use for creating the presentation in jwt format.
-     * @param contexts Additional contexts to include in the presentation.
      * @param expiresInMinutes The time in minutes for the presentation to expire.
      * @returns The created verifiable presentation and its token.
      * @throws NotFoundError if the id can not be resolved.
      */
-    async createVerifiablePresentation(controller, presentationMethodId, types, verifiableCredentials, contexts, expiresInMinutes) {
+    async createVerifiablePresentation(controller, presentationMethodId, presentationId, contexts, types, verifiableCredentials, expiresInMinutes) {
         core.Guards.stringValue(this.CLASS_NAME, "controller", controller);
         core.Guards.stringValue(this.CLASS_NAME, "presentationMethodId", presentationMethodId);
         if (core.Is.array(types)) {
@@ -679,12 +651,6 @@ class EntityStorageIdentityConnector {
             core.Guards.stringValue(this.CLASS_NAME, "types", types);
         }
         core.Guards.arrayValue(this.CLASS_NAME, "verifiableCredentials", verifiableCredentials);
-        if (core.Is.array(contexts)) {
-            core.Guards.arrayValue(this.CLASS_NAME, "contexts", contexts);
-        }
-        else if (core.Is.string(contexts)) {
-            core.Guards.stringValue(this.CLASS_NAME, "contexts", contexts);
-        }
         if (!core.Is.undefined(expiresInMinutes)) {
             core.Guards.integer(this.CLASS_NAME, "expiresInMinutes", expiresInMinutes);
         }
@@ -720,15 +686,10 @@ class EntityStorageIdentityConnector {
             else if (core.Is.stringValue(types)) {
                 finalTypes.push(types);
             }
-            const finalContexts = ["https://www.w3.org/2018/credentials/v1"];
-            if (core.Is.array(contexts)) {
-                finalContexts.push(...contexts);
-            }
-            else if (core.Is.stringValue(contexts)) {
-                finalContexts.push(contexts);
-            }
             const verifiablePresentation = {
-                "@context": finalContexts,
+                "@context": dataJsonLd.JsonLdProcessor.combineContexts("https://www.w3.org/2018/credentials/v2", contexts) ??
+                    null,
+                id: presentationId,
                 type: finalTypes,
                 verifiableCredential: verifiableCredentials,
                 holder: idParts.id
@@ -795,22 +756,27 @@ class EntityStorageIdentityConnector {
             if (core.Is.object(verifiablePresentation) &&
                 core.Is.array(verifiablePresentation.verifiableCredential)) {
                 for (const vcJwt of verifiablePresentation.verifiableCredential) {
-                    const jwt = await web.Jwt.decode(vcJwt);
                     let revoked = true;
-                    if (core.Is.string(jwt.payload?.iss)) {
-                        const issuerDocumentId = jwt.payload.iss;
-                        verifiablePresentation.holder = issuerDocumentId;
-                        const issuerDidDocument = await this._didDocumentEntityStorage.get(issuerDocumentId);
-                        if (core.Is.undefined(issuerDidDocument)) {
-                            throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
-                        }
-                        await this.verifyDocument(issuerDidDocument);
-                        issuers.push(issuerDidDocument);
-                        const vc = jwt.payload.vc;
-                        if (core.Is.object(vc)) {
-                            revoked = await this.checkRevocation(issuerDidDocument, vc.credentialStatus?.revocationBitmapIndex);
+                    if (core.Is.stringValue(vcJwt)) {
+                        const jwt = await web.Jwt.decode(vcJwt);
+                        if (core.Is.string(jwt.payload?.iss)) {
+                            const issuerDocumentId = jwt.payload.iss;
+                            verifiablePresentation.holder = issuerDocumentId;
+                            const issuerDidDocument = await this._didDocumentEntityStorage.get(issuerDocumentId);
+                            if (core.Is.undefined(issuerDidDocument)) {
+                                throw new core.NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
+                            }
+                            await this.verifyDocument(issuerDidDocument);
+                            issuers.push(issuerDidDocument);
+                            const vc = jwt.payload.vc;
+                            if (core.Is.object(vc)) {
+                                revoked = await this.checkRevocation(issuerDidDocument, vc.credentialStatus?.revocationBitmapIndex);
+                            }
                         }
                     }
+                    else {
+                        revoked = false;
+                    }
                     tokensRevoked.push(revoked);
                 }
             }

package/dist/esm/index.mjs

@@ -1,6 +1,7 @@
 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 { Sha256 } from '@twin.org/crypto';
+import { JsonLdProcessor } from '@twin.org/data-json-ld';
 import { EntityStorageConnectorFactory } from '@twin.org/entity-storage-models';
 import { DocumentHelper } from '@twin.org/identity-models';
 import { DidVerificationMethodType } from '@twin.org/standards-w3c-did';
@@ -370,38 +371,16 @@ class EntityStorageIdentityConnector {
      * Create a verifiable credential for a verification method.
      * @param controller The controller of the identity who can make changes.
      * @param verificationMethodId The verification method id to use.
-     * @param credentialId The id of the credential.
-     * @param types The type for the data stored in the verifiable credential.
-     * @param subject The subject data to store for the credential.
-     * @param contexts Additional contexts to include in the credential.
+     * @param id The id of the credential.
+     * @param credential The credential 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, credentialId, types, subject, contexts, revocationIndex) {
+    async createVerifiableCredential(controller, verificationMethodId, id, credential, revocationIndex) {
         Guards.stringValue(this.CLASS_NAME, "controller", controller);
         Guards.stringValue(this.CLASS_NAME, "verificationMethodId", verificationMethodId);
-        if (!Is.undefined(credentialId)) {
-            Guards.stringValue(this.CLASS_NAME, "credentialId", credentialId);
-        }
-        if (Is.array(types)) {
-            Guards.array(this.CLASS_NAME, "types", types);
-        }
-        else if (!Is.undefined(types)) {
-            Guards.stringValue(this.CLASS_NAME, "types", types);
-        }
-        if (Is.array(subject)) {
-            Guards.arrayValue(this.CLASS_NAME, "subject", subject);
-        }
-        else {
-            Guards.object(this.CLASS_NAME, "subject", subject);
-        }
-        if (Is.array(contexts)) {
-            Guards.array(this.CLASS_NAME, "contexts", contexts);
-        }
-        else if (!Is.undefined(contexts)) {
-            Guards.stringValue(this.CLASS_NAME, "contexts", contexts);
-        }
+        Guards.object(this.CLASS_NAME, "credential", credential);
         if (!Is.undefined(revocationIndex)) {
             Guards.number(this.CLASS_NAME, "revocationIndex", revocationIndex);
         }
@@ -432,24 +411,18 @@ class EntityStorageIdentityConnector {
             }
             const revocationService = issuerDidDocument.service?.find(s => s.id.endsWith("#revocation"));
             const finalTypes = ["VerifiableCredential"];
-            if (Is.array(types)) {
-                finalTypes.push(...types);
-            }
-            else if (Is.stringValue(types)) {
-                finalTypes.push(types);
-            }
-            const finalContexts = ["https://www.w3.org/2018/credentials/v1"];
-            if (Is.array(contexts)) {
-                finalContexts.push(...contexts);
-            }
-            else if (Is.stringValue(contexts)) {
-                finalContexts.push(contexts);
+            const credContext = JsonLdProcessor.extractProperty(credential, ["@context"]);
+            const credId = JsonLdProcessor.extractProperty(credential, ["@id", "id"], false);
+            const credType = JsonLdProcessor.extractProperty(credential, ["@type", "type"]);
+            if (Is.stringValue(credType)) {
+                finalTypes.push(credType);
             }
             const verifiableCredential = {
-                "@context": finalContexts,
-                id: credentialId,
+                "@context": JsonLdProcessor.combineContexts("https://www.w3.org/2018/credentials/v2", credContext) ??
+                    null,
+                id,
                 type: finalTypes,
-                credentialSubject: subject,
+                credentialSubject: credential,
                 issuer: issuerDidDocument.id,
                 issuanceDate: new Date().toISOString(),
                 credentialStatus: revocationService && !Is.undefined(revocationIndex)
@@ -486,9 +459,7 @@ class EntityStorageIdentityConnector {
                 iss: idParts.id,
                 nbf: Math.floor(Date.now() / 1000),
                 jti: verifiableCredential.id,
-                sub: Is.array(subject)
-                    ? ObjectHelper.propertyGet(subject[0], "id")
-                    : ObjectHelper.propertyGet(subject, "id"),
+                sub: credId,
                 vc: jwtVc
             };
             const signature = await Jwt.encodeWithSigner(jwtHeader, jwtPayload, async (alg, key, payload) => {
@@ -660,14 +631,15 @@ 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 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.
      * @param verifiableCredentials The credentials to use for creating the presentation in jwt format.
-     * @param contexts Additional contexts to include in the presentation.
      * @param expiresInMinutes The time in minutes for the presentation to expire.
      * @returns The created verifiable presentation and its token.
      * @throws NotFoundError if the id can not be resolved.
      */
-    async createVerifiablePresentation(controller, presentationMethodId, types, verifiableCredentials, contexts, expiresInMinutes) {
+    async createVerifiablePresentation(controller, presentationMethodId, presentationId, contexts, types, verifiableCredentials, expiresInMinutes) {
         Guards.stringValue(this.CLASS_NAME, "controller", controller);
         Guards.stringValue(this.CLASS_NAME, "presentationMethodId", presentationMethodId);
         if (Is.array(types)) {
@@ -677,12 +649,6 @@ class EntityStorageIdentityConnector {
             Guards.stringValue(this.CLASS_NAME, "types", types);
         }
         Guards.arrayValue(this.CLASS_NAME, "verifiableCredentials", verifiableCredentials);
-        if (Is.array(contexts)) {
-            Guards.arrayValue(this.CLASS_NAME, "contexts", contexts);
-        }
-        else if (Is.string(contexts)) {
-            Guards.stringValue(this.CLASS_NAME, "contexts", contexts);
-        }
         if (!Is.undefined(expiresInMinutes)) {
             Guards.integer(this.CLASS_NAME, "expiresInMinutes", expiresInMinutes);
         }
@@ -718,15 +684,10 @@ class EntityStorageIdentityConnector {
             else if (Is.stringValue(types)) {
                 finalTypes.push(types);
             }
-            const finalContexts = ["https://www.w3.org/2018/credentials/v1"];
-            if (Is.array(contexts)) {
-                finalContexts.push(...contexts);
-            }
-            else if (Is.stringValue(contexts)) {
-                finalContexts.push(contexts);
-            }
             const verifiablePresentation = {
-                "@context": finalContexts,
+                "@context": JsonLdProcessor.combineContexts("https://www.w3.org/2018/credentials/v2", contexts) ??
+                    null,
+                id: presentationId,
                 type: finalTypes,
                 verifiableCredential: verifiableCredentials,
                 holder: idParts.id
@@ -793,22 +754,27 @@ class EntityStorageIdentityConnector {
             if (Is.object(verifiablePresentation) &&
                 Is.array(verifiablePresentation.verifiableCredential)) {
                 for (const vcJwt of verifiablePresentation.verifiableCredential) {
-                    const jwt = await Jwt.decode(vcJwt);
                     let revoked = true;
-                    if (Is.string(jwt.payload?.iss)) {
-                        const issuerDocumentId = jwt.payload.iss;
-                        verifiablePresentation.holder = issuerDocumentId;
-                        const issuerDidDocument = await this._didDocumentEntityStorage.get(issuerDocumentId);
-                        if (Is.undefined(issuerDidDocument)) {
-                            throw new NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
-                        }
-                        await this.verifyDocument(issuerDidDocument);
-                        issuers.push(issuerDidDocument);
-                        const vc = jwt.payload.vc;
-                        if (Is.object(vc)) {
-                            revoked = await this.checkRevocation(issuerDidDocument, vc.credentialStatus?.revocationBitmapIndex);
+                    if (Is.stringValue(vcJwt)) {
+                        const jwt = await Jwt.decode(vcJwt);
+                        if (Is.string(jwt.payload?.iss)) {
+                            const issuerDocumentId = jwt.payload.iss;
+                            verifiablePresentation.holder = issuerDocumentId;
+                            const issuerDidDocument = await this._didDocumentEntityStorage.get(issuerDocumentId);
+                            if (Is.undefined(issuerDidDocument)) {
+                                throw new NotFoundError(this.CLASS_NAME, "documentNotFound", issuerDocumentId);
+                            }
+                            await this.verifyDocument(issuerDidDocument);
+                            issuers.push(issuerDidDocument);
+                            const vc = jwt.payload.vc;
+                            if (Is.object(vc)) {
+                                revoked = await this.checkRevocation(issuerDidDocument, vc.credentialStatus?.revocationBitmapIndex);
+                            }
                         }
                     }
+                    else {
+                        revoked = false;
+                    }
                     tokensRevoked.push(revoked);
                 }
             }

package/dist/types/entityStorageIdentityConnector.d.ts

@@ -1,3 +1,4 @@
+import { type IJsonLdNodeObject, type IJsonLdContextDefinitionRoot } from "@twin.org/data-json-ld";
 import { type IIdentityConnector } from "@twin.org/identity-models";
 import { DidVerificationMethodType, type IDidDocument, type IDidDocumentVerificationMethod, type IDidService, type IDidVerifiableCredential, type IDidVerifiablePresentation } from "@twin.org/standards-w3c-did";
 /**
@@ -78,16 +79,14 @@ export declare class EntityStorageIdentityConnector implements IIdentityConnecto
      * Create a verifiable credential for a verification method.
      * @param controller The controller of the identity who can make changes.
      * @param verificationMethodId The verification method id to use.
-     * @param credentialId The id of the credential.
-     * @param types The type for the data stored in the verifiable credential.
-     * @param subject The subject data to store for the credential.
-     * @param contexts Additional contexts to include in the credential.
+     * @param id The id of the credential.
+     * @param credential The credential 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<T>(controller: string, verificationMethodId: string, credentialId: string | undefined, types: string | string[] | undefined, subject: T | T[], contexts?: string | string[], revocationIndex?: number): Promise<{
-        verifiableCredential: IDidVerifiableCredential<T>;
+    createVerifiableCredential(controller: string, verificationMethodId: string, id: string | undefined, credential: IJsonLdNodeObject, revocationIndex?: number): Promise<{
+        verifiableCredential: IDidVerifiableCredential;
         jwt: string;
     }>;
     /**
@@ -95,9 +94,9 @@ export declare class EntityStorageIdentityConnector implements IIdentityConnecto
      * @param credentialJwt The credential to verify.
      * @returns The credential stored in the jwt and the revocation status.
      */
-    checkVerifiableCredential<T>(credentialJwt: string): Promise<{
+    checkVerifiableCredential(credentialJwt: string): Promise<{
         revoked: boolean;
-        verifiableCredential?: IDidVerifiableCredential<T>;
+        verifiableCredential?: IDidVerifiableCredential;
     }>;
     /**
      * Revoke verifiable credential(s).
@@ -119,14 +118,15 @@ 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 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.
      * @param verifiableCredentials The credentials to use for creating the presentation in jwt format.
-     * @param contexts Additional contexts to include in the presentation.
      * @param expiresInMinutes The time in minutes for the presentation to expire.
      * @returns The created verifiable presentation and its token.
      * @throws NotFoundError if the id can not be resolved.
      */
-    createVerifiablePresentation(controller: string, presentationMethodId: string, types: string | string[] | undefined, verifiableCredentials: string[], contexts?: string | string[], expiresInMinutes?: number): Promise<{
+    createVerifiablePresentation(controller: string, presentationMethodId: 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.4
+## v0.0.1-next.6
 
 - Initial Release

package/docs/reference/classes/EntityStorageIdentityConnector.md

@@ -264,14 +264,10 @@ NotFoundError if the id can not be resolved.
 
 ### createVerifiableCredential()
 
-> **createVerifiableCredential**\<`T`\>(`controller`, `verificationMethodId`, `credentialId`, `types`, `subject`, `contexts`?, `revocationIndex`?): `Promise`\<`object`\>
+> **createVerifiableCredential**(`controller`, `verificationMethodId`, `id`, `credential`, `revocationIndex`?): `Promise`\<`object`\>
 
 Create a verifiable credential for a verification method.
 
-#### Type Parameters
-
-• **T**
-
 #### Parameters
 
 • **controller**: `string`
@@ -282,21 +278,13 @@ The controller of the identity who can make changes.
 
 The verification method id to use.
 
-• **credentialId**: `undefined` \| `string`
+• **id**: `undefined` \| `string`
 
 The id of the credential.
 
-• **types**: `undefined` \| `string` \| `string`[]
-
-The type for the data stored in the verifiable credential.
+• **credential**: `IJsonLdNodeObject`
 
-• **subject**: `T` \| `T`[]
-
-The subject data to store for the credential.
-
-• **contexts?**: `string` \| `string`[]
-
-Additional contexts to include in the credential.
+The credential to store in the verifiable credential.
 
 • **revocationIndex?**: `number`
 
@@ -310,7 +298,7 @@ The created verifiable credential and its token.
 
 ##### verifiableCredential
 
-> **verifiableCredential**: `IDidVerifiableCredential`\<`T`\>
+> **verifiableCredential**: `IDidVerifiableCredential`
 
 ##### jwt
 
@@ -328,14 +316,10 @@ NotFoundError if the id can not be resolved.
 
 ### checkVerifiableCredential()
 
-> **checkVerifiableCredential**\<`T`\>(`credentialJwt`): `Promise`\<`object`\>
+> **checkVerifiableCredential**(`credentialJwt`): `Promise`\<`object`\>
 
 Check a verifiable credential is valid.
 
-#### Type Parameters
-
-• **T**
-
 #### Parameters
 
 • **credentialJwt**: `string`
@@ -354,7 +338,7 @@ The credential stored in the jwt and the revocation status.
 
 ##### verifiableCredential?
 
-> `optional` **verifiableCredential**: `IDidVerifiableCredential`\<`T`\>
+> `optional` **verifiableCredential**: `IDidVerifiableCredential`
 
 #### Implementation of
 
@@ -428,7 +412,7 @@ Nothing.
 
 ### createVerifiablePresentation()
 
-> **createVerifiablePresentation**(`controller`, `presentationMethodId`, `types`, `verifiableCredentials`, `contexts`?, `expiresInMinutes`?): `Promise`\<`object`\>
+> **createVerifiablePresentation**(`controller`, `presentationMethodId`, `presentationId`, `contexts`, `types`, `verifiableCredentials`, `expiresInMinutes`?): `Promise`\<`object`\>
 
 Create a verifiable presentation from the supplied verifiable credentials.
 
@@ -442,18 +426,22 @@ The controller of the identity who can make changes.
 
 The method to associate with the presentation.
 
+• **presentationId**: `undefined` \| `string`
+
+The id of the presentation.
+
+• **contexts**: `undefined` \| `IJsonLdContextDefinitionRoot`
+
+The contexts for the data stored in the verifiable credential.
+
 • **types**: `undefined` \| `string` \| `string`[]
 
 The types for the data stored in the verifiable credential.
 
-• **verifiableCredentials**: `string`[]
+• **verifiableCredentials**: (`string` \| `IDidVerifiableCredential`)[]
 
 The credentials to use for creating the presentation in jwt format.
 
-• **contexts?**: `string` \| `string`[]
-
-Additional contexts to include in the presentation.
-
 • **expiresInMinutes?**: `number`
 
 The time in minutes for the presentation to expire.

package/package.json

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