fix: parameter validations issues (#1126)

* fix: added api param validations

Signed-off-by: bhavanakarwade <[email protected]>

* fix: removed unnecessary validations

Signed-off-by: bhavanakarwade <[email protected]>

* fix:resolved validations issue

Signed-off-by: bhavanakarwade <[email protected]>

* added comment on function for understanding

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

Author: bhavanakarwade

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

@@ -217,7 +217,7 @@ export class ConnectionController {
     @ApiResponse({ status: HttpStatus.CREATED, description: 'Created', type: ApiResponseDto })
     async sendQuestion(
         @Param('orgId') orgId: string,
-        @Param('connectionId') connectionId: string,
+        @Param('connectionId', TrimStringParamPipe) connectionId: string,
         @Body() questionDto: QuestionDto,
         @User() reqUser: IUserRequestInterface,
         @Res() res: Response

apps/api-gateway/src/credential-definition/credential-definition.controller.ts

@@ -16,7 +16,7 @@ import { CreateCredentialDefinitionDto } from './dto/create-cred-defs.dto';
 import { OrgRoles } from 'libs/org-roles/enums';
 import { Roles } from '../authz/decorators/roles.decorator';
 import { CustomExceptionFilter } from 'apps/api-gateway/common/exception-handler';
-import { TrimStringParamPipe } from '@credebl/common/cast.helper';
+import { EmptyStringParamPipe, TrimStringParamPipe } from '@credebl/common/cast.helper';
 
 
 @ApiBearerAuth()
@@ -46,8 +46,8 @@ export class CredentialDefinitionController {
   @Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER, OrgRoles.VERIFIER, OrgRoles.MEMBER)
   @UseGuards(AuthGuard('jwt'), OrgRolesGuard)
   async getCredentialDefinitionById(
-    @Param('orgId', new ParseUUIDPipe({exceptionFactory: (): Error => { throw new BadRequestException(ResponseMessages.organisation.error.invalidOrgId); }})) orgId: string,
-    @Param('credDefId') credentialDefinitionId: string,
+    @Param('orgId') orgId: string,
+    @Param('credDefId', TrimStringParamPipe, EmptyStringParamPipe.forParam('credDefId')) credentialDefinitionId: string,
     @Res() res: Response
   ): Promise<Response> {
     const credentialsDefinitionDetails = await this.credentialDefinitionService.getCredentialDefinitionById(credentialDefinitionId, orgId);
@@ -77,6 +77,10 @@ export class CredentialDefinitionController {
     @Res() res: Response
   ): Promise<Response> {
 
+    if (!schemaId) {
+      throw new BadRequestException(ResponseMessages.schema.error.invalidSchemaId);
+    }
+
     const credentialsDefinitions = await this.credentialDefinitionService.getCredentialDefinitionBySchemaId(schemaId);
     const credDefResponse: IResponse = {
       statusCode: HttpStatus.OK,

apps/api-gateway/src/credential-definition/dto/get-all-platform-cred-defs.dto.ts

@@ -8,11 +8,11 @@ import { IsEnum, IsOptional, IsUUID } from 'class-validator';
 export class GetAllPlatformCredDefsDto extends PaginationDto {
 
     @ApiProperty({ example: '1a7eac11-ff05-40d7-8351-4d7467687cad'})
-    @Transform(({ value }) => trim(value))
     @ApiPropertyOptional()
+    @Transform(({ value }) => ('string' === typeof value && '' === value.trim() ? undefined : value.trim()))
     @IsOptional()
     @IsUUID('4', { message: 'Invalid format of ledgerId' })
-    ledgerId: string;
+    ledgerId?: string;
 
     @ApiProperty({
         required: false

apps/api-gateway/src/schema/dtos/get-all-schema.dto.ts

@@ -89,6 +89,7 @@ export class GetAllSchemaByPlatformDto {
 
     @ApiProperty({ example: '1a7eac11-ff05-40d7-8351-4d7467687cad'})
     @ApiPropertyOptional()
+    @Transform(({ value }) => ('string' === typeof value && '' === value.trim() ? undefined : value.trim()))
     @IsOptional()
     @IsUUID('4', { message: 'Invalid format of ledgerId' })
     ledgerId?: string;

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

@@ -51,13 +51,14 @@ export class SchemaController {
   @ApiResponse({ status: HttpStatus.OK, description: 'Success', type: ApiResponseDto })
   async getSchemaById(
     @Res() res: Response,
-    @Param('orgId', new ParseUUIDPipe({exceptionFactory: (): Error => { throw new BadRequestException(ResponseMessages.organisation.error.invalidOrgId); }})) orgId: string,    
+    @Param('orgId') orgId: string,    
     @Param('schemaId', TrimStringParamPipe) schemaId: string
   ): Promise<Response> {
 
     if (!schemaId) {
       throw new BadRequestException(ResponseMessages.schema.error.invalidSchemaId);
     }
+    
     const schemaDetails = await this.appService.getSchemaById(schemaId, orgId);
     const finalResponse: IResponse = {
       statusCode: HttpStatus.OK,
@@ -92,7 +93,7 @@ export class SchemaController {
   @UseGuards(AuthGuard('jwt'), OrgRolesGuard)
   async getcredDeffListBySchemaId(
     @Param('orgId', new ParseUUIDPipe({exceptionFactory: (): Error => { throw new BadRequestException(ResponseMessages.organisation.error.invalidOrgId); }})) orgId: string,    
-    @Param('schemaId') schemaId: string,
+    @Param('schemaId', TrimStringParamPipe) schemaId: string,
     @Query() getCredentialDefinitionBySchemaIdDto: GetCredentialDefinitionBySchemaIdDto,
     @Res() res: Response,
     @User() user: IUserRequestInterface): Promise<Response> {

apps/connection/src/connection.service.ts

@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
 import { CommonService } from '@credebl/common';
 import { CommonConstants } from '@credebl/common/common.constant';
-import { HttpException, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';
+import { HttpException, HttpStatus, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';
 import { ClientProxy, RpcException } from '@nestjs/microservices';
 import { from, map } from 'rxjs';
 import {
@@ -466,8 +466,16 @@ export class ConnectionService {
       const createConnectionInvitation = await this._receiveInvitationUrl(url, orgId, receiveInvitationUrl);
       return createConnectionInvitation.response;
     } catch (error) {
-      this.logger.error(`[receiveInvitationUrl] - error in receive invitation url : ${JSON.stringify(error)}`);
+      this.logger.error(`[receiveInvitationUrl] - error in receive invitation url : ${JSON.stringify(error, null, 2)}`);
 
+      const customErrorMessage = error?.status?.message?.error?.message;
+      if (customErrorMessage) {
+        throw new RpcException({
+          statusCode: HttpStatus.CONFLICT,
+          message: customErrorMessage,
+          error: ResponseMessages.errorMessages.conflict
+        });
+      } else 
       if (error?.response?.error?.reason) {
         throw new RpcException({
           message: ResponseMessages.connection.error.connectionNotFound,
@@ -487,9 +495,22 @@ export class ConnectionService {
   ): Promise<{
     response;
   }> {
+
     const pattern = { cmd: 'agent-receive-invitation-url' };
     const payload = { url, orgId, receiveInvitationUrl };
-    return this.natsCall(pattern, payload);
+
+    try {
+      return await this.natsCall(pattern, payload);
+    } catch (error) {
+      this.logger.error(`catch: ${JSON.stringify(error)}`);
+      throw new HttpException(
+        {
+          status: error.status,
+          error: error.message
+        },
+        error.status
+      );
+    }
   }
 
   async receiveInvitation(

libs/common/src/cast.helper.ts

@@ -156,6 +156,30 @@ export class TrimStringParamPipe implements PipeTransform {
   }
 }
 
+//TODO: Need to add this logic in `trimstringpipe`
+export class EmptyStringParamPipe implements PipeTransform {
+  private paramName: string;
+
+  static forParam(paramName: string): PipeTransform {
+    return new EmptyStringParamPipe(paramName);
+  }
+
+  private constructor(paramName: string) {
+    this.paramName = paramName;
+  }
+  
+  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/explicit-function-return-type
+  transform(value: string) {
+    const trimmedValue = value.trim();
+
+    if (!trimmedValue) {
+      throw new BadRequestException(`${this.paramName} is required`);
+    }
+
+    return plainToClass(String, trimmedValue);
+  }
+}
+
 // export const IsNotUUID = (validationOptions?: ValidationOptions): PropertyDecorator => (object: object, propertyName: string) => {
 //   registerDecorator({
 //     name: 'isNotUUID',

libs/common/src/response-messages/index.ts

@@ -151,7 +151,7 @@ export const ResponseMessages = {
       create: 'Schema created successfully.'
     },
     error: {
-      invalidSchemaId: 'Invalid schema Id provided.',
+      invalidSchemaId: 'Please provide valid schema Id',
       invalidData: 'Invalid data provided.',
       nameNotEmpty: 'Schema name is required',
       versionNotEmpty: 'Schema version is required',