@sphereon/ssi-sdk.data-store 0.32.1-next.20 → 0.32.1-next.291

package/src/types/presentationDefinition/presentationDefinition.ts

@@ -1,4 +1,5 @@
 import { IPresentationDefinition } from '@sphereon/pex'
+import { DcqlQueryREST } from '@sphereon/ssi-types'
 
 export type PresentationDefinitionItem = {
   id: string
@@ -8,10 +9,11 @@ export type PresentationDefinitionItem = {
   name?: string
   purpose?: string
   definitionPayload: IPresentationDefinition
+  dcqlPayload?: DcqlQueryREST
   createdAt: Date
   lastUpdatedAt: Date
 }
 
 export type NonPersistedPresentationDefinitionItem = Omit<PresentationDefinitionItem, 'id' | 'createdAt' | 'lastUpdatedAt'>
 export type PartialPresentationDefinitionItem = Partial<PresentationDefinitionItem>
-export type PresentationDefinitionItemFilter = Partial<Omit<PresentationDefinitionItem, 'definitionPayload'>> // TODO add logic to linearize & hash definitionPayload into a separate column so we can filter on it?
+export type PresentationDefinitionItemFilter = Partial<Omit<PresentationDefinitionItem, 'definitionPayload' | 'dcqlPayload'>>

package/src/types/statusList/IAbstractStatusListStore.ts

@@ -1,7 +1,7 @@
 import { FindOptionsWhere } from 'typeorm'
-import { IStatusListEntity, IStatusListEntryEntity } from './statusList'
+import { IOAuthStatusListEntity, IStatusList2021Entity, IStatusListEntity, IStatusListEntryEntity } from './statusList'
 
-export type FindStatusListArgs = FindOptionsWhere<IStatusListEntity>[]
+export type FindStatusListArgs = FindOptionsWhere<IStatusList2021Entity | IOAuthStatusListEntity>[]
 export type FindStatusListEntryArgs = FindOptionsWhere<IStatusListEntryEntity>[] | FindOptionsWhere<IStatusListEntryEntity>
 
 export interface IStatusListEntryAvailableArgs {
@@ -12,8 +12,9 @@ export interface IStatusListEntryAvailableArgs {
 
 export interface IGetStatusListEntryByIndexArgs {
   statusListId?: string
-  correlationId?: string
-  statusListIndex: number
+  statusListCorrelationId?: string
+  statusListIndex?: number
+  entryCorrelationId?: string
   errorOnNotFound?: boolean
 }
 

package/src/types/statusList/statusList.ts

@@ -1,14 +1,15 @@
 import {
   IIssuer,
-  OriginalVerifiableCredential,
+  StatusListCredential,
   StatusListCredentialIdMode,
   StatusListDriverType,
   StatusListIndexingDirection,
   StatusListType,
   StatusPurpose2021,
+  ProofFormat,
+  RequireOneOf,
 } from '@sphereon/ssi-types'
-import { ProofFormat } from '@veramo/core'
-import { StatusListEntity } from '../../entities/statusList2021/StatusList2021Entity'
+import { StatusListEntity } from '../../entities/statusList/StatusListEntities'
 
 export interface IStatusListEntity {
   id: string
@@ -19,21 +20,28 @@ export interface IStatusListEntity {
   issuer: string | IIssuer
   type: StatusListType
   proofFormat: ProofFormat
+  statusListCredential?: StatusListCredential
+}
+
+export interface IStatusList2021Entity extends IStatusListEntity {
   indexingDirection: StatusListIndexingDirection
   statusPurpose: StatusPurpose2021
-  statusListCredential?: OriginalVerifiableCredential
 }
 
-export interface IStatusListEntryEntity {
-  statusList: StatusListEntity | string // string is here to accept the id, so we can query it easily with typeorm
-
-  value?: string
-
-  statusListIndex: number
-
-  credentialHash?: string
-
-  credentialId?: string
-
-  correlationId?: string
+export interface IOAuthStatusListEntity extends IStatusListEntity {
+  bitsPerStatus: number
+  expiresAt?: Date
 }
+
+export type IStatusListEntryEntity = RequireOneOf<
+  {
+    statusList: StatusListEntity
+    statusListId: string
+    value?: string
+    statusListIndex: number
+    credentialHash?: string
+    credentialId?: string
+    correlationId?: string
+  },
+  'statusList' | 'statusListId'
+>

package/src/utils/digitalCredential/MappingUtils.ts

@@ -19,6 +19,7 @@ import {
   RegulationType,
 } from '../../types'
 import { replaceNullWithUndefined } from '../FormattingUtils'
+import { defaultHasher } from '@sphereon/ssi-sdk.core'
 
 function determineDocumentType(raw: string): DocumentType {
   const rawDocument = parseRawDocument(raw)
@@ -123,14 +124,14 @@ const safeStringify = (object: any): string => {
 export const nonPersistedDigitalCredentialEntityFromAddArgs = (addCredentialArgs: AddCredentialArgs): NonPersistedDigitalCredential => {
   const documentType: DocumentType = determineDocumentType(addCredentialArgs.rawDocument)
   const documentFormat: DocumentFormat = CredentialMapper.detectDocumentType(addCredentialArgs.rawDocument)
+  const hasher = addCredentialArgs?.opts?.hasher ?? defaultHasher
   if (documentFormat === DocumentFormat.SD_JWT_VC && !addCredentialArgs.opts?.hasher) {
     throw new Error('No hasher function is provided for SD_JWT credential.')
   }
-  const hasher = addCredentialArgs.opts?.hasher
   const uniformDocument =
     documentType === DocumentType.VC || documentType === DocumentType.C
       ? CredentialMapper.toUniformCredential(addCredentialArgs.rawDocument, { hasher })
-      : CredentialMapper.toUniformPresentation(addCredentialArgs.rawDocument)
+      : CredentialMapper.toUniformPresentation(addCredentialArgs.rawDocument, { hasher })
   const validFrom: Date | undefined = getValidFrom(uniformDocument)
   const validUntil: Date | undefined = getValidUntil(uniformDocument)
   const hash = computeEntryHash(addCredentialArgs.rawDocument)

package/src/utils/presentationDefinition/MappingUtils.ts

@@ -3,6 +3,7 @@ import { IPresentationDefinition } from '@sphereon/pex'
 import { NonPersistedPresentationDefinitionItem, PartialPresentationDefinitionItem, PresentationDefinitionItem } from '../../types'
 import { blake2bHex } from 'blakejs'
 import { replaceNullWithUndefined } from '../FormattingUtils'
+import { DcqlQueryREST } from '@sphereon/ssi-types'
 
 export const presentationDefinitionItemFrom = (entity: PresentationDefinitionItemEntity): PresentationDefinitionItem => {
   const result: PresentationDefinitionItem = {
@@ -13,6 +14,7 @@ export const presentationDefinitionItemFrom = (entity: PresentationDefinitionIte
     name: entity.name,
     purpose: entity.purpose,
     definitionPayload: JSON.parse(entity.definitionPayload) as IPresentationDefinition,
+    dcqlPayload: JSON.parse(entity.dcqlPayload) as DcqlQueryREST,
     createdAt: entity.createdAt,
     lastUpdatedAt: entity.lastUpdatedAt,
   }
@@ -29,6 +31,7 @@ export const presentationDefinitionEntityItemFrom = (item: NonPersistedPresentat
   entity.name = item.name
   entity.purpose = item.purpose
   entity.definitionPayload = JSON.stringify(item.definitionPayload!)
+  entity.dcqlPayload = JSON.stringify(item.dcqlPayload!)
   return entity
 }
 

package/src/utils/statusList/MappingUtils.ts

@@ -0,0 +1,82 @@
+import { IOAuthStatusListEntity, IStatusList2021Entity, IStatusListEntity } from '../../types'
+import { OAuthStatusListEntity, StatusList2021Entity, StatusListEntity } from '../../entities/statusList/StatusListEntities'
+import { StatusListType } from '@sphereon/ssi-types'
+import { replaceNullWithUndefined } from '../FormattingUtils'
+
+export const statusListEntityFrom = (args: IStatusListEntity): StatusListEntity => {
+  if (args.type === StatusListType.StatusList2021) {
+    const entity = new StatusList2021Entity()
+    const sl2021 = args as IStatusList2021Entity
+    entity.indexingDirection = sl2021.indexingDirection
+    entity.statusPurpose = sl2021.statusPurpose
+    setBaseFields(entity, args)
+    Object.defineProperty(entity, 'type', {
+      value: StatusListType.StatusList2021,
+      enumerable: true,
+      configurable: true,
+    })
+    return entity
+  }
+
+  if (args.type === StatusListType.OAuthStatusList) {
+    const entity = new OAuthStatusListEntity()
+    const oauthSl = args as IOAuthStatusListEntity
+    entity.bitsPerStatus = oauthSl.bitsPerStatus
+    entity.expiresAt = oauthSl.expiresAt
+    setBaseFields(entity, args)
+    Object.defineProperty(entity, 'type', {
+      value: StatusListType.OAuthStatusList,
+      enumerable: true,
+      configurable: true,
+    })
+    return entity
+  }
+
+  throw new Error(`Invalid status list type ${args.type}`)
+}
+
+export const statusListFrom = (entity: StatusListEntity): IStatusListEntity => {
+  if (entity instanceof StatusList2021Entity) {
+    const result: IStatusList2021Entity = {
+      ...getBaseFields(entity),
+      type: StatusListType.StatusList2021,
+      indexingDirection: entity.indexingDirection,
+      statusPurpose: entity.statusPurpose,
+    }
+    return replaceNullWithUndefined(result)
+  }
+
+  if (entity instanceof OAuthStatusListEntity) {
+    const result: IOAuthStatusListEntity = {
+      ...getBaseFields(entity),
+      type: StatusListType.OAuthStatusList,
+      bitsPerStatus: entity.bitsPerStatus,
+      expiresAt: entity.expiresAt,
+    }
+    return replaceNullWithUndefined(result)
+  }
+
+  throw new Error(`Invalid status list type ${typeof entity}`)
+}
+
+const setBaseFields = (entity: StatusListEntity, args: IStatusListEntity) => {
+  entity.id = args.id
+  entity.correlationId = args.correlationId
+  entity.length = args.length
+  entity.issuer = args.issuer
+  entity.driverType = args.driverType
+  entity.credentialIdMode = args.credentialIdMode
+  entity.proofFormat = args.proofFormat
+  entity.statusListCredential = args.statusListCredential
+}
+
+const getBaseFields = (entity: StatusListEntity): Omit<IStatusListEntity, 'type'> => ({
+  id: entity.id,
+  correlationId: entity.correlationId,
+  length: entity.length,
+  issuer: entity.issuer,
+  driverType: entity.driverType,
+  credentialIdMode: entity.credentialIdMode,
+  proofFormat: entity.proofFormat,
+  statusListCredential: entity.statusListCredential,
+})

package/dist/entities/statusList2021/StatusList2021Entity.d.ts

@@ -1,19 +0,0 @@
-import { IIssuer, JwtDecodedVerifiableCredential, StatusListCredentialIdMode, StatusListDriverType, StatusListIndexingDirection, StatusListType, StatusPurpose2021, W3CVerifiableCredential } from '@sphereon/ssi-types';
-import { ProofFormat } from '@veramo/core';
-import { BaseEntity } from 'typeorm';
-import { StatusListEntryEntity } from './StatusList2021EntryEntity';
-export declare class StatusListEntity extends BaseEntity {
-    id: string;
-    correlationId: string;
-    length: number;
-    issuer: string | IIssuer;
-    type: StatusListType;
-    driverType: StatusListDriverType;
-    credentialIdMode: StatusListCredentialIdMode;
-    proofFormat: ProofFormat;
-    indexingDirection: StatusListIndexingDirection;
-    statusPurpose: StatusPurpose2021;
-    statusListCredential?: W3CVerifiableCredential | JwtDecodedVerifiableCredential;
-    statusListEntries: StatusListEntryEntity[];
-}
-//# sourceMappingURL=StatusList2021Entity.d.ts.map

package/dist/entities/statusList2021/StatusList2021Entity.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"StatusList2021Entity.d.ts","sourceRoot":"","sources":["../../../src/entities/statusList2021/StatusList2021Entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,8BAA8B,EAC9B,0BAA0B,EAC1B,oBAAoB,EACpB,2BAA2B,EAC3B,cAAc,EACd,iBAAiB,EACjB,uBAAuB,EACxB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAoD,MAAM,SAAS,CAAA;AACtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAEnE,qBAEa,gBAAiB,SAAQ,UAAU;IAE9C,EAAE,EAAG,MAAM,CAAA;IAGX,aAAa,EAAG,MAAM,CAAA;IAGtB,MAAM,EAAG,MAAM,CAAA;IAsBf,MAAM,EAAG,MAAM,GAAG,OAAO,CAAA;IAGzB,IAAI,EAAG,cAAc,CAAA;IAGrB,UAAU,EAAG,oBAAoB,CAAA;IAQjC,gBAAgB,EAAG,0BAA0B,CAAA;IAG7C,WAAW,EAAG,WAAW,CAAA;IAGzB,iBAAiB,EAAG,2BAA2B,CAAA;IAG/C,aAAa,EAAG,iBAAiB,CAAA;IAsBjC,oBAAoB,CAAC,EAAE,uBAAuB,GAAG,8BAA8B,CAAA;IAG/E,iBAAiB,EAAG,qBAAqB,EAAE,CAAA;CAC5C"}

package/dist/entities/statusList2021/StatusList2021Entity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StatusList2021Entity.js","sourceRoot":"","sources":["../../../src/entities/statusList2021/StatusList2021Entity.ts"],"names":[],"mappings":"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"}

package/dist/entities/statusList2021/StatusList2021EntryEntity.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"StatusList2021EntryEntity.d.ts","sourceRoot":"","sources":["../../../src/entities/statusList2021/StatusList2021EntryEntity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAA4C,MAAM,SAAS,CAAA;AAE9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAEzD,qBAGa,qBAAsB,SAAQ,UAAU;IAGnD,UAAU,EAAG,gBAAgB,CAAA;IAI7B,eAAe,EAAG,MAAM,CAAA;IAGxB,YAAY,CAAC,EAAE,MAAM,CAAA;IAGrB,cAAc,CAAC,EAAE,MAAM,CAAA;IAGvB,aAAa,CAAC,EAAE,MAAM,CAAA;IAGtB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf"}

package/dist/entities/statusList2021/StatusList2021EntryEntity.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StatusList2021EntryEntity.js","sourceRoot":"","sources":["../../../src/entities/statusList2021/StatusList2021EntryEntity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA0C;AAC1C,qCAA8E;AAC9E,8CAA0D;AAC1D,iEAAyD;AAKlD,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,oBAAU;CAoBpD,CAAA;AApBY,sDAAqB;AAGhC;IAFC,IAAA,uBAAa,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IACxD,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uCAAgB,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC;8BACnE,uCAAgB;yDAAA;AAI7B;IAFC,IAAA,uBAAa,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAC3F,IAAA,0BAAQ,EAAC,uCAA0B,EAAE,EAAE,OAAO,EAAE,+BAA+B,EAAE,CAAC;;8DAC3D;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DAC1C;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;;6DACzE;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;;4DACzE;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;;oDACxE;gCAnBH,qBAAqB;IAHjC,IAAA,gBAAM,EAAC,iBAAiB,CAAC;IAC1B,+GAA+G;IAC/G,uHAAuH;GAC1G,qBAAqB,CAoBjC"}