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

 merge: DEV to QA

Author: tipusinghaw

.env.demo

@@ -128,3 +128,5 @@ AGENT_PROTOCOL=http
 OOB_BATCH_SIZE=10
 MAX_ORG_LIMIT=10
 FIDO_API_ENDPOINT=http://localhost:8000
+
+IS_ECOSYSTEM_ENABLE=false

.env.sample

@@ -153,4 +153,6 @@ SCHEMA_FILE_SERVER_TOKEN=xxxxxxxx // Please provide schema file server token for
 
 FILEUPLOAD_CACHE_TTL= //Provide file upload cache ttl
 
-FIELD_UPLOAD_SIZE= //Provide field upload size
+FIELD_UPLOAD_SIZE= //Provide field upload size
+
+IS_ECOSYSTEM_ENABLE= //Set this flag to `true` to enable the ecosystem, or `false` to disable it.

apps/agent-service/src/repositories/agent-service.repository.ts

@@ -121,7 +121,7 @@ export class AgentServiceRepository {
         try {
 
             const agentDetails =
-                await this.prisma.org_agents.findFirstOrThrow({   
+                await this.prisma.org_agents.findFirst({   
                     where: {
                         orgId
                     }

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

@@ -106,7 +106,7 @@ export class AuthzController {
   async login(@Body() loginUserDto: LoginUserDto, @Res() res: Response): Promise<Response> {
 
     if (loginUserDto.email) {
-      const userData = await this.authzService.login(loginUserDto.email, loginUserDto.password, loginUserDto.isPasskey);
+      const userData = await this.authzService.login(loginUserDto.email, loginUserDto.password);
 
       const finalResponse: IResponseType = {
         statusCode: HttpStatus.OK,
@@ -146,7 +146,6 @@ export class AuthzController {
   })
   @ApiResponse({ status: HttpStatus.OK, description: 'Success', type: ApiResponseDto })
   async forgotPassword(@Body() forgotPasswordDto: ForgotPasswordDto, @Res() res: Response): Promise<Response> {
-
       const userData = await this.authzService.forgotPassword(forgotPasswordDto);
       const finalResponse: IResponseType = {
         statusCode: HttpStatus.OK,

apps/api-gateway/src/authz/dtos/forgot-password.dto.ts

@@ -1,6 +1,6 @@
-import { IsEmail, IsNotEmpty, IsString } from 'class-validator';
+import { IsEmail, IsNotEmpty, IsOptional, IsString, IsUrl } from 'class-validator';
 
-import { ApiProperty } from '@nestjs/swagger';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
 import {  trim } from '@credebl/common/cast.helper';
 
@@ -11,4 +11,28 @@ export class ForgotPasswordDto {
     @IsString({ message: 'Email should be a string' })
     @Transform(({ value }) => trim(value))
     email: string;
+
+    @ApiPropertyOptional({ example: 'https://example.com/logo.png' })
+    @Transform(({ value }) => trim(value))
+    @IsOptional()
+    @IsUrl({
+    // eslint-disable-next-line camelcase 
+        require_protocol: true,
+    // eslint-disable-next-line camelcase
+      require_tld: true
+    },
+    { message: 'brandLogoUrl should be a valid URL' })
+    brandLogoUrl?: string;
+
+    @ApiPropertyOptional({ example: 'MyPlatform' })
+    @Transform(({ value }) => trim(value))
+    @IsOptional()
+    @IsString({ message: 'platformName should be string' })
+    platformName?: string;
+
+    @ApiPropertyOptional({ example: 'https://0.0.0.0:5000' })
+    @Transform(({ value }) => trim(value))
+    @IsOptional()
+    @IsString({ message: 'endpoint should be string' })
+    endpoint?: string;
 }

apps/api-gateway/src/user/dto/login-user.dto.ts

@@ -1,4 +1,4 @@
-import { IsBoolean, IsEmail, IsNotEmpty, IsOptional, IsString, ValidateIf } from 'class-validator';
+import { IsEmail, IsNotEmpty, IsString } from 'class-validator';
 
 import { ApiProperty } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
@@ -12,14 +12,9 @@ export class LoginUserDto {
     @Transform(({ value }) => trim(value))
     email: string;
 
-    @ValidateIf((obj) => false === obj.isPasskey)
     @ApiProperty()
     @Transform(({ value }) => trim(value))
     @IsNotEmpty({ message: 'Password is required.' })
-    password?: string;
+    password: string;
 
-    @ApiProperty({ example: 'false' })
-    @IsOptional()
-    @IsBoolean({ message: 'isPasskey should be boolean' })
-    isPasskey: boolean;
 }

apps/api-gateway/src/user/dto/share-certificate.dto.ts

@@ -49,7 +49,6 @@ import { OrgRolesGuard } from '../authz/guards/org-roles.guard';
 import { OrgRoles } from 'libs/org-roles/enums';
 import { AwsService } from '@credebl/aws/aws.service';
 import { PaginationDto } from '@credebl/common/dtos/pagination.dto';
-import { CreateCertificateDto } from './dto/share-certificate.dto';
 import { UserAccessGuard } from '../authz/guards/user-access-guard';
 
 @UseFilters(CustomExceptionFilter)
@@ -266,23 +265,6 @@ export class UserController {
 
     return res.status(HttpStatus.OK).json(finalResponse);
   }
-  /**
-   * @param credentialId
-   * @returns User credentials
-   */
-  @Get('/user-credentials/:credentialId')
-  @ApiOperation({ summary: 'Get user credentials by Id', description: 'Get user credentials by Id' })
-  @ApiResponse({ status: HttpStatus.OK, description: 'Success', type: ApiResponseDto })
-  async getUserCredentialsById(@Param('credentialId') credentialId: string, @Res() res: Response): Promise<Response> {
-    const getUserCrdentialsById = await this.userService.getUserCredentialsById(credentialId);
-
-    const finalResponse: IResponse = {
-      statusCode: HttpStatus.OK,
-      message: ResponseMessages.user.success.userCredentials,
-      data: getUserCrdentialsById
-    };
-    return res.status(HttpStatus.OK).json(finalResponse);
-  }
 
   /**
 *
@@ -311,34 +293,7 @@ export class UserController {
     };
     return res.status(HttpStatus.CREATED).json(finalResponse);
   }
-  /** 
-   * @Body shareUserCredentials
-   * @returns User certificate URL
-   */
-  @Post('/certificate')
-  @ApiOperation({
-    summary: 'Share user certificate',
-    description: 'Share user certificate'
-  })
-  @ApiResponse({ status: HttpStatus.OK, description: 'Success', type: ApiResponseDto })
-  async shareUserCertificate(
-    @Body() shareUserCredentials: CreateCertificateDto,
-    @Res() res: Response
-  ): Promise<Response> {  
-    const schemaIdParts = shareUserCredentials.schemaId.split(':');
-    // eslint-disable-next-line prefer-destructuring
-    const title = schemaIdParts[2];
-
-   const imageBuffer = await this.userService.shareUserCertificate(shareUserCredentials);
-      const finalResponse: IResponse = {
-        statusCode: HttpStatus.CREATED,
-        message: ResponseMessages.user.success.shareUserCertificate || ResponseMessages.user.success.degreeCertificate,
-        label: title,
-        data: imageBuffer
-      };
-      return res.status(HttpStatus.CREATED).json(finalResponse);
-  }
-
+  
   /**
    * @Body updateUserProfileDto
    * @returns User details

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

@@ -11,7 +11,6 @@ import { IUsersActivity } from 'libs/user-activity/interface';
 import { IUserInvitations } from '@credebl/common/interfaces/user.interface';
 import { user } from '@prisma/client';
 import { PaginationDto } from '@credebl/common/dtos/pagination.dto';
-import { CreateCertificateDto } from './dto/share-certificate.dto';
 
 @Injectable()
 export class UserService extends BaseService {
@@ -29,12 +28,6 @@ export class UserService extends BaseService {
   return this.sendNatsMessage(this.serviceProxy, 'get-user-public-profile', payload);
   }
 
-
-  async getUserCredentialsById(credentialId: string): Promise<object> {
-    const payload = { credentialId };
-    return this.sendNatsMessage(this.serviceProxy, 'get-user-credentials-by-id', payload);
-  }
-
   async updateUserProfile(updateUserProfileDto: UpdateUserProfileDto): Promise<user> {
     const payload = { updateUserProfileDto };
     return this.sendNatsMessage(this.serviceProxy, 'update-user-profile', payload);
@@ -64,12 +57,6 @@ export class UserService extends BaseService {
     return this.sendNatsMessage(this.serviceProxy, 'accept-reject-invitations', payload);
   }
 
-  async shareUserCertificate(
-    shareUserCredentials: CreateCertificateDto
-  ): Promise<Buffer> {
-      return this.sendNatsMessage(this.serviceProxy, 'share-user-certificate', shareUserCredentials);
-  }
-
   async get(
     paginationDto:PaginationDto
   ): Promise<object> {

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

@@ -470,7 +470,7 @@ export class OrganizationService {
     try {
       const updatedOrglogo = orgLogo.split(',')[1];
       const imgData = Buffer.from(updatedOrglogo, 'base64');
-      const logoUrl = await this.awsService.uploadUserCertificate(
+      const logoUrl = await this.awsService.uploadFileToS3Bucket(
         imgData,
         'png',
         'orgLogo',
@@ -591,7 +591,7 @@ export class OrganizationService {
   /**
    * @returns Get created organizations details
    */
-
+  
   async getOrganizations(
     userId: string,
     pageNumber: number,
@@ -623,26 +623,38 @@ export class OrganizationService {
         userId
       );
 
-      let orgIds;
-      if (0 > getOrgs?.organizations?.length) {
-        orgIds = getOrgs?.organizations?.map(item => item.id);
+      const { organizations } = getOrgs;
+      
+      if (0 === organizations?.length) {
+        throw new NotFoundException(ResponseMessages.organisation.error.organizationNotFound);
       }
-       
-      const orgEcosystemDetails = await this._getOrgEcosystems(orgIds);
-      if (!orgEcosystemDetails || !Array.isArray(orgEcosystemDetails) || 0 === orgEcosystemDetails.length) {
-        throw new NotFoundException(ResponseMessages.ecosystem.error.ecosystemDetailsNotFound);
+
+      let orgIds;
+      let updatedOrgs;
+
+      if ('true' === process.env.IS_ECOSYSTEM_ENABLE) {
+          orgIds = organizations?.map(item => item.id);
+        
+        const orgEcosystemDetails = await this._getOrgEcosystems(orgIds);
+        if (!orgEcosystemDetails || !Array.isArray(orgEcosystemDetails) || 0 === orgEcosystemDetails.length) {
+          throw new NotFoundException(ResponseMessages.ecosystem.error.ecosystemDetailsNotFound);
+        }
+    
+        updatedOrgs = getOrgs.organizations.map(org => {
+          const matchingEcosystems = orgEcosystemDetails
+            .filter(ecosystem => ecosystem.orgId === org.id)
+            .map(ecosystem => ({ ecosystemId: ecosystem.ecosystemId }));
+          return {
+            ...org,
+            ecosystemOrgs: 0 < matchingEcosystems.length ? matchingEcosystems : []
+          };
+        });
+      } else {
+        updatedOrgs = getOrgs?.organizations?.map(org => ({
+          ...org
+        }));
       }
-  
-      const updatedOrgs = getOrgs.organizations.map(org => {
-        const matchingEcosystems = orgEcosystemDetails
-          .filter(ecosystem => ecosystem.orgId === org.id)
-          .map(ecosystem => ({ ecosystemId: ecosystem.ecosystemId }));
-        return {
-          ...org,
-          ecosystemOrgs: 0 < matchingEcosystems.length ? matchingEcosystems : []
-        };
-      });
-  
+      
       return {
         totalCount: getOrgs.totalCount,
         totalPages: getOrgs.totalPages,