fix: refactored code

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

Author: RinkalBhojani

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

@@ -71,16 +71,3 @@ export function extractCredentialConfigurationIds(payload: Partial<OidcIssueCred
   const cfg = payload?.credentialOfferPayload?.credential_configuration_ids;
   return Array.isArray(cfg) ? cfg : [];
 }
-
-export function sanitizeOidcIssueCredentialDto(
-  payload: Partial<OidcIssueCredentialDto>
-): Partial<OidcIssueCredentialDto> {
-  const ids = extractCredentialConfigurationIds(payload);
-  return {
-    ...payload,
-    credentialOfferPayload: {
-      // eslint-disable-next-line camelcase
-      credential_configuration_ids: ids
-    }
-  };
-}

apps/api-gateway/src/oid4vc-issuance/oid4vc-issuance.controller.ts

@@ -46,7 +46,7 @@ import { CustomExceptionFilter } from 'apps/api-gateway/common/exception-handler
 import { user } from '@prisma/client';
 import { IssuerCreationDto, IssuerUpdationDto } from './dtos/oid4vc-issuer.dto';
 import { CreateCredentialTemplateDto, UpdateCredentialTemplateDto } from './dtos/oid4vc-issuer-template.dto';
-import { OidcIssueCredentialDto, sanitizeOidcIssueCredentialDto } from './dtos/oid4vc-credential-wh.dto';
+import { OidcIssueCredentialDto } from './dtos/oid4vc-credential-wh.dto';
 import { Oid4vcIssuanceService } from './oid4vc-issuance.service';
 import {
   CreateCredentialOfferD2ADto,
@@ -428,7 +428,7 @@ export class Oid4vcIssuanceController {
     @User() user: user,
     @Res() res: Response
   ): Promise<Response> {
-    await this.oid4vcIssuanceService.deleteTemplate(user, orgId, templateId);
+    await this.oid4vcIssuanceService.deleteTemplate(user, orgId, templateId, issuerId);
     const finalResponse: IResponse = {
       statusCode: HttpStatus.OK,
       message: ResponseMessages.oidcTemplate.success.delete
@@ -636,7 +636,7 @@ export class Oid4vcIssuanceController {
     if (id && 'default' === oidcIssueCredentialDto.contextCorrelationId) {
       oidcIssueCredentialDto.orgId = id;
     }
-    // const sanitized = sanitizeOidcIssueCredentialDto(oidcIssueCredentialDto);
+
     const getCredentialDetails = await this.oid4vcIssuanceService.oidcIssueCredentialWebhook(
       oidcIssueCredentialDto,
       id
@@ -653,9 +653,8 @@ export class Oid4vcIssuanceController {
       .catch((error) => {
         this.logger.debug(`error in getting webhook url ::: ${JSON.stringify(error)}`);
       });
-    console.log(`webhookUrl `, webhookUrl);
     if (webhookUrl) {
-      console.log(`Org webhook found `, JSON.stringify(webhookUrl), JSON.stringify(oidcIssueCredentialDto));
+      this.logger.log(`Posting response to the webhook url`);
       const plainIssuanceDto = JSON.parse(JSON.stringify(oidcIssueCredentialDto));
 
       await this.oid4vcIssuanceService._postWebhookResponse(webhookUrl, { data: plainIssuanceDto }).catch((error) => {

apps/api-gateway/src/oid4vc-issuance/oid4vc-issuance.service.ts

@@ -53,8 +53,8 @@ export class Oid4vcIssuanceService extends BaseService {
     return this.natsClient.sendNatsMessage(this.issuanceProxy, 'oid4vc-delete-issuer', payload);
   }
 
-  async deleteTemplate(userDetails: user, orgId: string, templateId: string): Promise<object> {
-    const payload = { templateId, orgId, userDetails };
+  async deleteTemplate(userDetails: user, orgId: string, templateId: string, issuerId: string): Promise<object> {
+    const payload = { templateId, orgId, userDetails, issuerId };
     return this.natsClient.sendNatsMessage(this.issuanceProxy, 'oid4vc-template-delete', payload);
   }
 

apps/api-gateway/src/oid4vc-verification/oid4vc-verification.controller.ts

@@ -71,7 +71,7 @@ export class Oid4vcVerificationController {
     summary: 'Create OID4VP verifier',
     description: 'Creates a new OID4VP verifier for the specified organization.'
   })
-  @ApiResponse({ status: HttpStatus.OK, description: 'Verifier created successfully.', type: ApiResponseDto })
+  @ApiResponse({ status: HttpStatus.CREATED, description: 'Verifier created successfully.', type: ApiResponseDto })
   @ApiBearerAuth()
   @Roles(OrgRoles.OWNER)
   @UseGuards(AuthGuard('jwt'), OrgRolesGuard)
@@ -151,7 +151,7 @@ export class Oid4vcVerificationController {
       message: ResponseMessages.oid4vp.success.update,
       data: updateVerifierRes
     };
-    return res.status(HttpStatus.CREATED).json(finalResponse);
+    return res.status(HttpStatus.OK).json(finalResponse);
   }
 
   @Get('/orgs/:orgId/oid4vp/verifier')
@@ -242,7 +242,7 @@ export class Oid4vcVerificationController {
     this.logger.debug(`[deleteVerifierDetails] Deleted verifier: ${verifierId}`);
     const finalResponse: IResponse = {
       statusCode: HttpStatus.OK,
-      message: ResponseMessages.oid4vp.success.fetch,
+      message: ResponseMessages.oid4vp.success.delete,
       data: verifierDetails
     };
     return res.status(HttpStatus.OK).json(finalResponse);

apps/api-gateway/src/x509/dtos/x509.dto.ts

@@ -306,7 +306,7 @@ export class BasicX509CreateCertificateConfig {
 
   @ApiPropertyOptional({ type: () => AuthorityAndSubjectKeyDto })
   @IsOptional()
-  @ValidateNested({ each: true })
+  @ValidateNested()
   @Type(() => AuthorityAndSubjectKeyDto)
   subjectKey?: AuthorityAndSubjectKeyDto;
 }

apps/api-gateway/src/x509/x509.service.ts

@@ -33,7 +33,6 @@ export class X509Service extends BaseService {
     reqUser: user
   ): Promise<X509CertificateRecord> {
     this.logger.log(`Start creating x509 certficate`);
-    this.logger.debug(`payload : `, createDto, reqUser);
     const payload = { options: createDto, user: reqUser, orgId };
     return this.natsClient.sendNatsMessage(this.serviceProxy, 'create-x509-certificate', payload);
   }

apps/oid4vc-issuance/libs/helpers/credential-sessions.builder.ts

@@ -282,9 +282,22 @@ function buildSdJwtCredential(
   const templateSignerOption: SignerOption = signerOptions.find(
     (x) => templateRecord.signerOption.toLowerCase() === x.method
   );
+  if (!templateSignerOption) {
+    throw new UnprocessableEntityException(
+      `Signer option "${templateRecord.signerOption}" is not configured for template ${templateRecord.id}`
+    );
+  }
 
   if (templateRecord.signerOption === SignerMethodOption.X5C && credentialRequest.validityInfo) {
-    const certificateDetail = activeCertificateDetails.find((x) => x.certificateBase64 === templateSignerOption.x5c[0]);
+    if (!activeCertificateDetails?.length) {
+      throw new UnprocessableEntityException('Active x.509 certificate details are required for x5c signer templates.');
+    }
+    const certificateDetail = activeCertificateDetails.find(
+      (x) => x.certificateBase64 === templateSignerOption.x5c?.[0]
+    );
+    if (!certificateDetail) {
+      throw new UnprocessableEntityException('No active x.509 certificate matches the configured signer option.');
+    }
 
     const validationResult = validateCredentialDatesInCertificateWindow(
       credentialRequest.validityInfo,
@@ -349,7 +362,17 @@ function buildMdocCredential(
   ) {
     throw new UnprocessableEntityException(`${ResponseMessages.oidcIssuerSession.error.missingValidityInfo}`);
   }
+
+  if (!signerOptions?.length || !signerOptions[0].x5c?.length) {
+    throw new UnprocessableEntityException('An x5c signer configuration is required for mdoc credentials.');
+  }
+  if (!activeCertificateDetails?.length) {
+    throw new UnprocessableEntityException('Active x.509 certificate details are required for mdoc credentials.');
+  }
   const certificateDetail = activeCertificateDetails.find((x) => x.certificateBase64 === signerOptions[0].x5c[0]);
+  if (!certificateDetail) {
+    throw new UnprocessableEntityException('No active x.509 certificate matches the configured signer option.');
+  }
   const validationResult = validateCredentialDatesInCertificateWindow(
     credentialRequest.validityInfo,
     certificateDetail

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

@@ -174,7 +174,7 @@ export function buildIssuerPayload(
   return {
     display,
     dpopSigningAlgValuesSupported: opts?.dpopAlgs ?? [...ISSUER_DPOP_ALGS_DEFAULT],
-    credentialConfigurationsSupported: credentialConfigurations.credentialConfigurationsSupported ?? [],
+    credentialConfigurationsSupported: credentialConfigurations.credentialConfigurationsSupported ?? {},
     batchCredentialIssuance: {
       batchSize: oidcIssuer?.batchCredentialIssuanceSize ?? batchCredentialIssuanceDefault
     }

apps/oid4vc-issuance/src/oid4vc-issuance.service.ts

@@ -200,7 +200,7 @@ export class Oid4vcIssuanceService {
   async oidcIssuerGetById(id: string, orgId: string): Promise<IssuerResponse> {
     try {
       const getIssuerDetails = await this.oid4vcIssuanceRepository.getOidcIssuerDetailsById(id);
-      if (!getIssuerDetails && getIssuerDetails.publicIssuerId) {
+      if (!getIssuerDetails && !getIssuerDetails.publicIssuerId) {
         throw new NotFoundException(ResponseMessages.oidcIssuer.error.notFound);
       }
       const agentDetails = await this.oid4vcIssuanceRepository.getAgentEndPoint(orgId);
@@ -533,6 +533,9 @@ export class Oid4vcIssuanceService {
       }
 
       const agentDetails = await this.oid4vcIssuanceRepository.getAgentEndPoint(orgId);
+      if (!agentDetails) {
+        throw new NotFoundException(ResponseMessages.issuance.error.agentEndPointNotFound);
+      }
       //TDOD: signerOption should be under credentials change this with x509 support
 
       //TDOD: signerOption should be under credentials change this with x509 support

apps/oid4vc-verification/src/oid4vc-verification.service.ts

@@ -283,7 +283,7 @@ export class Oid4vpVerificationService extends BaseService {
     }
   }
 
-  async getVerifierSession(orgId: string, query?: VerificationSessionQuery): Promise<object> {
+  async getVerifierSession(orgId: string, query: VerificationSessionQuery): Promise<object> {
     this.logger.debug(`[getVerifierSession] called for orgId=${orgId}, potentially with a query`);
     try {
       const agentDetails = await this.oid4vpRepository.getAgentEndPoint(orgId);