Merge pull request #1094 from credebl/develop-dco-fixed

Sync changes from DEV to QA.

Author: pranalidhanavade

.env.demo

@@ -126,6 +126,7 @@ AFJ_AGENT_ENDPOINT_PATH=/agent-provisioning/AFJ/endpoints/
 
 AGENT_PROTOCOL=http
 OOB_BATCH_SIZE=10
+PROOF_REQ_CONN_LIMIT=10
 MAX_ORG_LIMIT=10
 FIDO_API_ENDPOINT=http://localhost:8000
 
@@ -135,4 +136,8 @@ ELK_LOG=true // ELK flag
 LOG_LEVEL=debug // ELK log level
 ELK_LOG_PATH = "http://localhost:9200/" // ELK log path
 ELK_USERNAME=elastic // ELK user username
-ELK_PASSWORD=xxxxxx // ELK user password
+ELK_PASSWORD=xxxxxx // ELK user password
+
+ORGANIZATION=credebl
+CONTEXT=platform
+APP=api

.env.sample

@@ -98,6 +98,7 @@ PLATFORM_ID=
 PLATFORM_PROFILE_MODE= // Please provide your environment name
 
 OOB_BATCH_SIZE=10
+PROOF_REQ_CONN_LIMIT=10
 
 AFJ_AGENT_ENDPOINT_PATH=/apps/agent-provisioning/AFJ/endpoints/
 DATABASE_URL="postgresql://postgres:xxxxxx@localhost:5432/postgres?schema=public"    #Provide supabase postgres URL and Use the correct user/pwd, IP Address
@@ -162,3 +163,7 @@ LOG_LEVEL=debug // ELK log level
 ELK_LOG_PATH = "http://localhost:9200/" // ELK log path
 ELK_USERNAME=elastic // ELK user username
 ELK_PASSWORD=xxxxxx // ELK user password
+
+ORGANIZATION=credebl
+CONTEXT=platform
+APP=api

apps/api-gateway/common/exception-handler.ts

@@ -24,16 +24,21 @@ export class CustomExceptionFilter extends BaseExceptionFilter {
     }
     if (exception instanceof HttpException) {
       status = exception.getStatus();
+      
     }
 
-    let exceptionResponse: ExceptionResponse;
+    let exceptionResponse: ExceptionResponse = {} as ExceptionResponse;
+    const exceptionResponseData = exception.getResponse ? exception.getResponse() : exception;
 
-    if (exception['response']) {
-      exceptionResponse = exception['response'];
+    if ('string' === typeof exceptionResponseData) {
+      exceptionResponse.message = exceptionResponseData;
     } else {
-      exceptionResponse = exception as unknown as ExceptionResponse;
+      exceptionResponse = exceptionResponseData as unknown as ExceptionResponse;
     }
 
+    if (exceptionResponse.message && exceptionResponse.message.includes(ResponseMessages.nats.error.noSubscribers)) {
+      exceptionResponse.message = ResponseMessages.nats.error.noSubscribers;
+    }
     errorResponse = {
       statusCode: exceptionResponse.statusCode ? exceptionResponse.statusCode : status,
       message: exceptionResponse.message
@@ -43,7 +48,6 @@ export class CustomExceptionFilter extends BaseExceptionFilter {
         ? exceptionResponse.error
         : ResponseMessages.errorMessages.serverError
     };
-
     response.status(errorResponse.statusCode).json(errorResponse);
   }
 }

apps/api-gateway/src/agent-service/agent-service.controller.ts

@@ -41,7 +41,7 @@ import { CustomExceptionFilter } from 'apps/api-gateway/common/exception-handler
 import { Roles } from '../authz/decorators/roles.decorator';
 import { OrgRoles } from 'libs/org-roles/enums';
 import { OrgRolesGuard } from '../authz/guards/org-roles.guard';
-import { validateDid } from '@credebl/common/did.validator';
+import { Validator } from '@credebl/common/validator';
 import { CreateWalletDto } from './dto/create-wallet.dto';
 import { CreateNewDidDto } from './dto/create-new-did.dto';
 import { AgentSpinupValidator, TrimStringParamPipe } from '@credebl/common/cast.helper';
@@ -223,7 +223,7 @@ export class AgentController {
     @User() user: user,
     @Res() res: Response
   ): Promise<Response> {
-    await validateDid(createDidDto);
+    Validator.validateDid(createDidDto);
 
     if (createDidDto.seed && seedLength !== createDidDto.seed.length) {
       this.logger.error(`seed must be at most 32 characters.`);

apps/api-gateway/src/cloud-wallet/cloud-wallet.controller.ts

@@ -14,7 +14,7 @@ import { AuthGuard } from '@nestjs/passport';
 import { User } from '../authz/decorators/user.decorator';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { user } from '@prisma/client';
-import { validateDid } from '@credebl/common/did.validator';
+import { Validator } from '@credebl/common/validator';
 import { CommonConstants } from '@credebl/common/common.constant';
 import { UserRoleGuard } from '../authz/guards/user-role.guard';
 import { AcceptProofRequestDto } from './dtos/accept-proof-request.dto';
@@ -267,7 +267,7 @@ export class CloudWalletController {
     @User() user: user,
     @Res() res: Response
   ): Promise<Response> {
-    await validateDid(createDidDto);
+    Validator.validateDid(createDidDto);
     const {email, id} = user;
     createDidDto.email = email;
     createDidDto.userId = id;

apps/api-gateway/src/main.ts

@@ -2,7 +2,7 @@ import * as dotenv from 'dotenv';
 import * as express from 'express';
 
 import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
-import { Logger, ValidationPipe } from '@nestjs/common';
+import { Logger, ValidationPipe, VERSION_NEUTRAL, VersioningType } from '@nestjs/common';
 
 import { AppModule } from './app.module';
 import { HttpAdapterHost, NestFactory } from '@nestjs/core';
@@ -13,6 +13,7 @@ import { getNatsOptions } from '@credebl/common/nats.config';
 import helmet from 'helmet';
 import { CommonConstants } from '@credebl/common/common.constant';
 import NestjsLoggerServiceAdapter from '@credebl/logger/nestjsLoggerServiceAdapter';
+import { NatsInterceptor } from '../../../libs/interceptors/nats.interceptor';
 dotenv.config();
 
 async function bootstrap(): Promise<void> {
@@ -57,6 +58,11 @@ async function bootstrap(): Promise<void> {
     .addServer(`${process.env.API_GATEWAY_PROTOCOL}://${process.env.API_GATEWAY_HOST}`)
     .build();
 
+    app.enableVersioning({
+      type: VersioningType.URI,
+      defaultVersion: ['1']
+    });
+
   const document = SwaggerModule.createDocument(app, options);
   SwaggerModule.setup('api', app, document);
   const httpAdapter = app.get(HttpAdapterHost);
@@ -70,6 +76,11 @@ async function bootstrap(): Promise<void> {
     });
   }
 
+  app.enableVersioning({
+    type: VersioningType.URI,
+    defaultVersion: ['1', VERSION_NEUTRAL]
+  });
+
   app.use(express.static('uploadedFiles/holder-profile'));
   app.use(express.static('uploadedFiles/org-logo'));
   app.use(express.static('uploadedFiles/tenant-logo'));
@@ -85,6 +96,7 @@ async function bootstrap(): Promise<void> {
       xssFilter: true
     })
   );
+  app.useGlobalInterceptors(new NatsInterceptor());
   await app.listen(process.env.API_GATEWAY_PORT, `${process.env.API_GATEWAY_HOST}`);
   Logger.log(`API Gateway is listening on port ${process.env.API_GATEWAY_PORT}`);
 }

apps/api-gateway/src/user/user.controller.ts

@@ -253,7 +253,7 @@ export class UserController {
    * @returns User's email exist status
    */
   @Get('/:email')
-  @ApiOperation({ summary: 'Check if user exist', description: 'check user existence' })
+  @ApiOperation({ summary: 'Check user registration and email verification status', description: 'Check user registration and email verification status' })
   async checkUserExist(@Param() emailParam: EmailValidator, @Res() res: Response): Promise<Response> {
     const userDetails = await this.userService.checkUserExist(emailParam.email);