@sphereon/ssi-sdk.vc-status-list 0.34.1-feature.SSISDK.17.bitstring.sl.7 → 0.34.1-feature.SSISDK.17.bitstring.sl.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/ssi-sdk.vc-status-list",
   "description": "Sphereon SSI-SDK plugin for Status List management, like StatusList2021.",
-  "version": "0.34.1-feature.SSISDK.17.bitstring.sl.7+eb4b995a",
+  "version": "0.34.1-feature.SSISDK.17.bitstring.sl.9+a052acba",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -31,7 +31,7 @@
     "@sphereon/ssi-sdk-ext.did-utils": "0.29.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.29.0",
     "@sphereon/ssi-sdk-ext.jwt-service": "0.29.0",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.17.bitstring.sl.7+eb4b995a",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.17.bitstring.sl.9+a052acba",
     "@sphereon/vc-status-list": "7.0.0-next.0",
     "@veramo/core": "4.2.0",
     "@veramo/credential-status": "4.2.0",
@@ -70,5 +70,5 @@
     "SSI",
     "StatusList2021"
   ],
-  "gitHead": "eb4b995abb68a5aee39ad40c3ee996f2e1dff8da"
+  "gitHead": "a052acbaa88acf4be22236ca3afaadd5b2821fe1"
 }

package/src/impl/BitstringStatusListImplementation.ts

@@ -20,7 +20,7 @@ import {
   UpdateStatusListIndexArgs,
 } from '../types'
 
-import { assertValidProofType, getAssertedProperty, getAssertedValue, getAssertedValues } from '../utils'
+import { assertValidProofType, ensureDate, getAssertedProperty, getAssertedValue, getAssertedValues } from '../utils'
 import { BitstringStatusListCredential } from '../types/BitstringStatusList'
 import { BitstreamStatusList, BitstringStatusPurpose, createStatusListCredential } from '@4sure-tech/vc-bitstring-status-lists'
 
@@ -50,8 +50,8 @@ export class BitstringStatusListImplementation implements IStatusList {
         ...args,
         proofFormat: veramoProofFormat,
         statusPurpose: statusPurpose ?? DEFAULT_STATUS_PURPOSE,
-        validFrom,
-        validUntil,
+        validFrom: ensureDate(validFrom),
+        validUntil: ensureDate(validUntil),
         ttl,
       },
       context,
@@ -170,8 +170,8 @@ export class BitstringStatusListImplementation implements IStatusList {
         proofFormat: veramoProofFormat,
         keyRef: args.keyRef,
         statusPurpose,
-        validFrom,
-        validUntil,
+        validFrom: ensureDate(validFrom),
+        validUntil: ensureDate(validUntil),
         ttl,
       },
       context,

package/src/impl/OAuthStatusList.ts

@@ -1,5 +1,5 @@
 import type { IAgentContext, ICredentialPlugin, IKeyManager } from '@veramo/core'
-import { type CompactJWT, type CWT, type CredentialProofFormat, StatusListType } from '@sphereon/ssi-types'
+import { type CompactJWT, type CredentialProofFormat, type CWT, StatusListType } from '@sphereon/ssi-types'
 import type {
   CheckStatusIndexArgs,
   CreateStatusListArgs,
@@ -10,7 +10,7 @@ import type {
   UpdateStatusListFromEncodedListArgs,
   UpdateStatusListIndexArgs,
 } from '../types'
-import { determineProofFormat, getAssertedValue, getAssertedValues } from '../utils'
+import { determineProofFormat, ensureDate, getAssertedValue, getAssertedValues } from '../utils'
 import type { IStatusList } from './IStatusList'
 import { StatusList } from '@sd-jwt/jwt-status-list'
 import type { IJwtService } from '@sphereon/ssi-sdk-ext.jwt-service'
@@ -32,7 +32,8 @@ export class OAuthStatusListImplementation implements IStatusList {
 
     const proofFormat = args?.proofFormat ?? DEFAULT_PROOF_FORMAT
     const { issuer, id, oauthStatusList, keyRef } = args
-    const { bitsPerStatus, expiresAt } = oauthStatusList
+    const { bitsPerStatus } = oauthStatusList
+    const expiresAt = ensureDate(oauthStatusList.expiresAt)
     const length = args.length ?? DEFAULT_LIST_LENGTH
     const issuerString = typeof issuer === 'string' ? issuer : issuer.id
     const correlationId = getAssertedValue('correlationId', args.correlationId)
@@ -56,7 +57,8 @@ export class OAuthStatusListImplementation implements IStatusList {
   }
 
   async updateStatusListIndex(args: UpdateStatusListIndexArgs, context: IRequiredContext): Promise<StatusListResult> {
-    const { statusListCredential, value, expiresAt, keyRef } = args
+    const { statusListCredential, value, keyRef } = args
+    const expiresAt = ensureDate(oauthStatusList.expiresAt)
     if (typeof statusListCredential !== 'string') {
       return Promise.reject('statusListCredential in neither JWT nor CWT')
     }
@@ -106,7 +108,8 @@ export class OAuthStatusListImplementation implements IStatusList {
       throw new Error('OAuthStatusList options are required for type OAuthStatusList')
     }
     const { proofFormat, oauthStatusList, keyRef } = args
-    const { bitsPerStatus, expiresAt } = oauthStatusList
+    const { bitsPerStatus } = oauthStatusList
+    const expiresAt = ensureDate(oauthStatusList.expiresAt)
 
     const { issuer, id } = getAssertedValues(args)
     const issuerString = typeof issuer === 'string' ? issuer : issuer.id

package/src/utils.ts

@@ -94,3 +94,35 @@ export function determineProofFormat(credential: StatusListCredential): Credenti
       throw Error('Cannot determine credential payload type')
   }
 }
+
+/**
+ * Ensures a value is converted to a Date object if it's a valid date string,
+ * otherwise returns the original value or undefined
+ *
+ * @param value - The value to convert to Date (can be Date, string, or undefined)
+ * @returns Date object, undefined, or the original value if conversion fails
+ */
+export function ensureDate(value: Date | string | undefined): Date | undefined {
+  if (value === undefined || value === null) {
+    return undefined
+  }
+
+  if (value instanceof Date) {
+    return value
+  }
+
+  if (typeof value === 'string') {
+    if (value.trim() === '') {
+      return undefined
+    }
+
+    const date = new Date(value)
+    // Check if the date is valid
+    if (isNaN(date.getTime())) {
+      return undefined
+    }
+    return date
+  }
+
+  return undefined
+}