fix: added validityInfo for credential validity check

Signed-off-by: Rinkal Bhojani <[email protected]>

Author: RinkalBhojani

apps/api-gateway/src/oid4vc-issuance/dtos/issuer-sessions.dto.ts

@@ -21,6 +21,7 @@ import {
 } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
+import { dateToSeconds } from '@credebl/common/date-only';
 
 /* ========= disclosureFrame custom validator ========= */
 function isDisclosureFrameValue(v: unknown): boolean {
@@ -117,6 +118,24 @@ function ExactlyOneOf(keys: string[], options?: ValidationOptions) {
   return Validate(ExactlyOneOfConstraint, keys, options);
 }
 
+export class ValidityInfo {
+  @ApiProperty({
+    example: '2025-04-23T14:34:09.188Z',
+    required: true
+  })
+  @IsString()
+  @IsNotEmpty()
+  validFrom: Date;
+
+  @ApiProperty({
+    example: '2026-05-03T14:34:09.188Z',
+    required: true
+  })
+  @IsString()
+  @IsNotEmpty()
+  validUntil: Date;
+}
+
 /* ========= Request DTOs ========= */
 export class CredentialRequestDto {
   @ApiProperty({
@@ -137,13 +156,20 @@ export class CredentialRequestDto {
   payload!: Record<string, unknown>;
 
   @ApiPropertyOptional({
-    description: 'Selective disclosure: claim -> boolean (or nested map)',
-    example: { name: true, DOB: true, additionalProp3: false },
+    example: { validFrom: '2025-04-23T14:34:09.188Z', validUntil: '2026-05-03T14:34:09.188Z' },
     required: false
   })
   @IsOptional()
-  @IsDisclosureFrame()
-  disclosureFrame?: Record<string, boolean | Record<string, boolean>>;
+  validityInfo?: ValidityInfo;
+
+  // @ApiPropertyOptional({
+  //   description: 'Selective disclosure: claim -> boolean (or nested map)',
+  //   example: { name: true, DOB: true, additionalProp3: false },
+  //   required: false
+  // })
+  // @IsOptional()
+  // @IsDisclosureFrame()
+  // disclosureFrame?: Record<string, boolean | Record<string, boolean>>;
 }
 
 export class CreateOidcCredentialOfferDto {
@@ -257,20 +283,33 @@ export class CredentialDto {
 
   @ApiProperty({
     description: 'Credential payload (namespace data, validity info, etc.)',
-    example: {
-      namespaces: {
-        'org.iso.23220.photoID.1': {
-          birth_date: '1970-02-14',
-          family_name: 'Müller-Lüdenscheid',
-          given_name: 'Ford Praxibetel',
-          document_number: 'LA001801M'
+    example: [
+      {
+        namespaces: {
+          'org.iso.23220.photoID.1': {
+            birth_date: '1970-02-14',
+            family_name: 'Müller-Lüdenscheid',
+            given_name: 'Ford Praxibetel',
+            document_number: 'LA001801M'
+          }
+        },
+        validityInfo: {
+          validFrom: '2025-04-23T14:34:09.188Z',
+          validUntil: '2026-05-03T14:34:09.188Z'
         }
       },
-      validityInfo: {
-        validFrom: '2025-04-23T14:34:09.188Z',
-        validUntil: '2026-05-03T14:34:09.188Z'
+      {
+        full_name: 'Garry',
+        address: {
+          street_address: 'M.G. Road',
+          locality: 'Pune',
+          country: 'India'
+        },
+        iat: 1698151532,
+        nbf: dateToSeconds(new Date()),
+        exp: dateToSeconds(new Date(Date.now() + 5 * 365 * 24 * 60 * 60 * 1000))
       }
-    }
+    ]
   })
   @ValidateNested()
   payload: object;

apps/oid4vc-issuance/interfaces/oid4vc-issuer-sessions.interfaces.ts

@@ -30,19 +30,19 @@ export enum AuthenticationType {
 export type DisclosureFrame = Record<string, boolean | Record<string, boolean>>;
 
 export interface CredentialPayload {
-  validityInfo: {
-    validFrom: Date;
-    validUntil: Date;
-  };
   [key: string]: unknown; // extensible for mDoc or other formats
 }
 
 export interface CredentialRequest {
-  credentialSupportedId?: string;
+  // credentialSupportedId?: string;
   templateId: string;
-  format: CredentialFormat; // "vc+sd-jwt" | "mso_mdoc"
+  // format: CredentialFormat; // "vc+sd-jwt" | "mso_mdoc"
   payload: CredentialPayload; // user-supplied payload (without vct)
-  disclosureFrame?: DisclosureFrame; // only relevant for vc+sd-jwt
+  // disclosureFrame?: DisclosureFrame; // only relevant for vc+sd-jwt
+  validityInfo?: {
+    validFrom: Date;
+    validUntil: Date;
+  };
 }
 
 export interface CreateOidcCredentialOffer {

apps/oid4vc-issuance/interfaces/oid4vc-template.interfaces.ts

@@ -43,7 +43,7 @@ export interface ClaimDisplay {
 }
 
 export interface Claim {
-  path: string[];
+  path?: string[];
   display?: ClaimDisplay[];
   mandatory?: boolean;
 }