namespace changes

Signed-off-by: Krishna Waske <[email protected]>

Author: GHkrishna

apps/api-gateway/src/agent-service/dto/create-schema.dto.ts

@@ -2,26 +2,29 @@ import { ApiProperty } from '@nestjs/swagger';
 import { IsString, IsNotEmpty, IsArray } from 'class-validator';
 
 export class CreateTenantSchemaDto {
-    @ApiProperty()
-    @IsString({ message: 'tenantId must be a string' }) @IsNotEmpty({ message: 'please provide valid tenantId' })
-    tenantId: string;
-    
-    @ApiProperty()
-    @IsString({ message: 'schema version must be a string' }) @IsNotEmpty({ message: 'please provide valid schema version' })
-    schemaVersion: string;
+  @ApiProperty()
+  @IsString({ message: 'tenantId must be a string' })
+  @IsNotEmpty({ message: 'please provide valid tenantId' })
+  tenantId: string;
 
-    @ApiProperty()
-    @IsString({ message: 'schema name must be a string' }) @IsNotEmpty({ message: 'please provide valid schema name' })
-    schemaName: string;
+  @ApiProperty()
+  @IsString({ message: 'schema version must be a string' })
+  @IsNotEmpty({ message: 'please provide valid schema version' })
+  schemaVersion: string;
 
-    @ApiProperty()
-    @IsArray({ message: 'attributes must be an array' })
-    @IsString({ each: true })
-    @IsNotEmpty({ message: 'please provide valid attributes' })
-    attributes: string[];
+  @ApiProperty()
+  @IsString({ message: 'schema name must be a string' })
+  @IsNotEmpty({ message: 'please provide valid schema name' })
+  schemaName: string;
 
-    @ApiProperty()
-  
-    @IsNotEmpty({ message: 'please provide orgId' })
-    orgId: string;
-}
+  @ApiProperty()
+  @IsArray({ message: 'attributes must be an array' })
+  @IsString({ each: true })
+  // TODO: IsNotEmpty won't work for array. Must use @ArrayNotEmpty() instead
+  @IsNotEmpty({ message: 'please provide valid attributes' })
+  attributes: string[];
+
+  @ApiProperty()
+  @IsNotEmpty({ message: 'please provide orgId' })
+  orgId: string;
+}

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

@@ -22,10 +22,20 @@ export class CredentialAttributeDto {
   @IsBoolean()
   mandatory?: boolean;
 
+  // TODO: Check how do we handle claims with only path rpoperty like email, etc.
   @ApiProperty({ description: 'Type of the attribute value (string, number, date, etc.)' })
   @IsString()
   value_type: string;
 
+  @ApiProperty({
+    type: [String],
+    description:
+      'Claims path pointer as per the draft 15 - https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0-ID2.html#name-claims-path-pointer'
+  })
+  @IsArray()
+  @IsString({ each: true })
+  path: string[];
+
   @ApiProperty({ type: [DisplayDto], required: false, description: 'Localized display values' })
   @IsOptional()
   @ValidateNested({ each: true })
@@ -163,7 +173,7 @@ export class CreateCredentialTemplateDto {
     description: 'Attributes included in the credential template'
   })
   @IsObject()
-  attributes: Record<string, CredentialAttributeDto>;
+  attributes: CredentialAttributeDto[];
 
   @ApiProperty({
     type: Object,

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

@@ -1,26 +1,27 @@
 /* eslint-disable camelcase */
-import { ApiExtraModels, ApiProperty, ApiPropertyOptional, getSchemaPath } from '@nestjs/swagger';
+import { ApiExtraModels, ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import {
   IsString,
   IsOptional,
   IsBoolean,
   IsArray,
   ValidateNested,
-  IsObject,
   IsUrl,
   IsNotEmpty,
   IsDefined,
   IsInt
 } from 'class-validator';
-import { plainToInstance, Transform, Type } from 'class-transformer';
+import { Type } from 'class-transformer';
 
 export class ClaimDto {
   @ApiProperty({
-    description: 'The unique key for the claim (e.g. email, name)',
-    example: 'email'
+    description: 'The path for nested claims',
+    example: ['address', 'street_number'],
+    type: [String]
   })
-  @IsString()
-  key: string;
+  @Type(() => String)
+  @IsArray()
+  path: string[];
 
   @ApiProperty({
     description: 'The display label for the claim',
@@ -85,6 +86,7 @@ export class DisplayDto {
   logo?: LogoDto;
 }
 
+// TODO: Check where it is used, coz no reference found
 @ApiExtraModels(ClaimDto)
 export class CredentialConfigurationDto {
   @ApiProperty({
@@ -110,25 +112,25 @@ export class CredentialConfigurationDto {
   @IsString()
   scope: string;
 
-  // @ApiProperty({
-  //   description: 'List of claims supported in this credential',
-  //   type: [ClaimDto],
-  // })
-  // @IsArray()
-  // @ValidateNested({ each: true })
-  // @Type(() => ClaimDto)
-  // claims: ClaimDto[]
   @ApiProperty({
-    description: 'Claims supported by this credential',
-    type: 'object',
-    additionalProperties: { $ref: getSchemaPath(ClaimDto) }
+    description: 'List of claims supported in this credential',
+    type: [ClaimDto]
   })
-  @IsObject()
+  @IsArray()
   @ValidateNested({ each: true })
-  @Transform(({ value }) =>
-    Object.fromEntries(Object.entries(value || {}).map(([k, v]) => [k, plainToInstance(ClaimDto, v)]))
-  )
-  claims: Record<string, ClaimDto>;
+  @Type(() => ClaimDto)
+  claims: ClaimDto[];
+  // @ApiProperty({
+  //   description: 'Claims supported by this credential',
+  //   type: 'object',
+  //   additionalProperties: { $ref: getSchemaPath(ClaimDto) }
+  // })
+  // @IsObject()
+  // @ValidateNested({ each: true })
+  // @Transform(({ value }) =>
+  //   Object.fromEntries(Object.entries(value || {}).map(([k, v]) => [k, plainToInstance(ClaimDto, v)]))
+  // )
+  // claims: Record<string, ClaimDto>;
 
   @ApiProperty({ type: [String] })
   @IsArray()
@@ -217,7 +219,7 @@ export enum AccessTokenSignerKeyType {
   ED25519 = 'ed25519'
 }
 
-@ApiExtraModels(CredentialConfigurationDto)
+// @ApiExtraModels(CredentialConfigurationDto)
 export class IssuerCreationDto {
   @ApiProperty({
     description: 'Name of the issuer',

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

@@ -18,9 +18,9 @@ export interface OrgAgent {
 }
 
 export interface Claim {
-  key: string;
-  label: string;
-  required: boolean;
+  path: string[];
+  label?: string;
+  required?: boolean;
 }
 
 export interface Logo {
@@ -40,7 +40,7 @@ export interface CredentialConfiguration {
   vct?: string;
   doctype?: string;
   scope: string;
-  claims: Record<string, Claim>;
+  claims: Claim[];
   credential_signing_alg_values_supported: string[];
   cryptographic_binding_methods_supported: string[];
   display: Display[];
@@ -61,7 +61,7 @@ export interface IssuerCreation {
   accessTokenSignerKeyType?: AccessTokenSignerKeyType;
   display: Display[];
   dpopSigningAlgValuesSupported?: string[];
-  credentialConfigurationsSupported?: Record<string, CredentialConfiguration>;
+  // credentialConfigurationsSupported?: Record<string, CredentialConfiguration>;   // Not used
   authorizationServerConfigs: AuthorizationServerConfig;
   batchCredentialIssuanceSize: number;
 }

apps/oid4vc-issuance/libs/helpers/issuer.metadata.ts

@@ -22,27 +22,25 @@ type Appearance = {
   display: CredentialDisplayItem[];
 };
 
+type Claim = {
+  mandatory?: boolean;
+  // value_type: string;
+  path: string[];
+  display?: AttributeDisplay[];
+};
+
 type CredentialConfig = {
   format: string;
   vct?: string;
   scope: string;
   doctype?: string;
-  claims: Record<
-    string,
-    {
-      mandatory?: boolean;
-      value_type: string;
-      display?: AttributeDisplay[];
-    }
-  >;
+  claims: Claim[];
   credential_signing_alg_values_supported: string[];
   cryptographic_binding_methods_supported: string[];
   display: { name: string; description?: string; locale?: string }[];
 };
 
-type CredentialConfigurationsSupported = {
-  credentialConfigurationsSupported: Record<string, CredentialConfig>;
-};
+type CredentialConfigurationsSupported = CredentialConfig[];
 
 // ---- Static Lists (as requested) ----
 const STATIC_CREDENTIAL_ALGS = ['ES256', 'EdDSA'] as const;
@@ -101,8 +99,7 @@ export function buildCredentialConfigurationsSupported(
   }
 ): CredentialConfigurationsSupported {
   const defaultFormat = opts?.format ?? 'vc+sd-jwt';
-  const credentialConfigurationsSupported: Record<string, CredentialConfig> = {};
-
+  const credentialConfigurationsSupported: CredentialConfigurationsSupported = [];
   for (const t of templates) {
     const attrs = coerceJsonObject<unknown>(t.attributes);
     const app = coerceJsonObject<unknown>(t.appearance);
@@ -120,8 +117,8 @@ export function buildCredentialConfigurationsSupported(
     const isMdoc = 'mso_mdoc' === rowFormat;
     const suffix = isMdoc ? 'mdoc' : 'sdjwt';
 
-    // key (allow override)
-    const key = 'function' === typeof opts?.keyResolver ? opts.keyResolver(t) : `${t.name}-${suffix}`;
+    // key: keep your keyResolver override; otherwise include suffix
+    // const key = 'function' === typeof opts?.keyResolver ? opts.keyResolver(t) : `${t.name}-${suffix}`;
 
     // Resolve doctype/vct:
     // - For mdoc: try opts.doctype -> t.doctype -> fallback to t.name (or throw if you prefer)
@@ -143,20 +140,15 @@ export function buildCredentialConfigurationsSupported(
     // Choose scope base: prefer opts.scopeVct, otherwise for mdoc use doctype, else vct
     const scopeBase = opts?.scopeVct ?? (isMdoc ? rowDoctype : rowVct);
     const scope = `openid4vc:credential:${scopeBase}-${suffix}`;
-
-    const claims = Object.fromEntries(
-      Object.entries(attrs).map(([claimName, def]) => {
-        const d = def as AttributeDef;
-        return [
-          claimName,
-          {
-            value_type: d.value_type,
-            mandatory: d.mandatory ?? false,
-            display: Array.isArray(d.display) ? d.display.map((x) => ({ name: x.name, locale: x.locale })) : undefined
-          }
-        ];
-      })
-    );
+    const claims = Object.entries(attrs).map(([claimName, def]) => {
+      const d = def as AttributeDef;
+      return {
+        path: [claimName],
+        // value_type: d.value_type,    // Didn't find this in draft 15
+        mandatory: d.mandatory ?? false, // always include, default to false
+        display: Array.isArray(d.display) ? d.display.map((x) => ({ name: x.name, locale: x.locale })) : undefined
+      };
+    });
 
     const display =
       app.display?.map((d) => ({
@@ -165,18 +157,19 @@ export function buildCredentialConfigurationsSupported(
         locale: d.locale
       })) ?? [];
 
-    credentialConfigurationsSupported[key] = {
+    // assemble per-template config
+    credentialConfigurationsSupported.push({
       format: rowFormat,
       scope,
       claims,
       credential_signing_alg_values_supported: [...STATIC_CREDENTIAL_ALGS],
       cryptographic_binding_methods_supported: [...STATIC_BINDING_METHODS],
       display,
       ...(isMdoc ? { doctype: rowDoctype as string } : { vct: rowVct })
-    };
+    });
   }
 
-  return { credentialConfigurationsSupported };
+  return credentialConfigurationsSupported;
 }
 
 // Default DPoP list for issuer-level metadata (match your example)
@@ -241,7 +234,7 @@ export function buildIssuerPayload(
   return {
     display,
     dpopSigningAlgValuesSupported: opts?.dpopAlgs ?? [...ISSUER_DPOP_ALGS_DEFAULT],
-    credentialConfigurationsSupported: credentialConfigurations.credentialConfigurationsSupported ?? {},
+    credentialConfigurationsSupported: credentialConfigurations ?? [],
     batchCredentialIssuance: {
       batchSize: oidcIssuer?.batchCredentialIssuanceSize ?? batchCredentialIssuanceDefault
     }