refactor: Dev to main

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

@@ -165,10 +165,10 @@ export class ConnectionController {
     @ApiResponse({ status: 200, description: 'Success', type: AuthTokenResponse })
     async getConnectionWebhook(
         @Body() connectionDto: ConnectionDto,
-        @Param('id') id: number,
+        @Param('id') id: string,
         @Res() res: Response
     ): Promise<object> {
-        this.logger.debug(`connectionDto ::: ${JSON.stringify(connectionDto)}`);
+        this.logger.debug(`connectionDto ::: ${JSON.stringify(connectionDto)} ${id}`);
         const connectionData = await this.connectionService.getConnectionWebhook(connectionDto, id);
         const finalResponse: IResponseType = {
             statusCode: HttpStatus.CREATED,

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

@@ -28,7 +28,7 @@ export class ConnectionService extends BaseService {
         }
     }
 
-    getConnectionWebhook(connectionDto: ConnectionDto, id: number): Promise<{
+    getConnectionWebhook(connectionDto: ConnectionDto, id: string): Promise<{
         response: object;
     }> {
         const payload = { connectionId: connectionDto.id, state: connectionDto.state, orgDid: connectionDto.theirDid, theirLabel: connectionDto.theirLabel, autoAcceptConnection: connectionDto.autoAcceptConnection, outOfBandId: connectionDto.outOfBandId, createDateTime: connectionDto.createdAt, lastChangedDateTime: connectionDto.updatedAt, orgId: id };

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

@@ -50,7 +50,7 @@ export class IssuanceService extends BaseService {
     getIssueCredentialWebhook(issueCredentialDto: IssuanceDto, id: string): Promise<{
         response: object;
     }> {
-        const payload = { createDateTime: issueCredentialDto.createdAt, connectionId: issueCredentialDto.connectionId, threadId: issueCredentialDto.threadId, protocolVersion: issueCredentialDto.protocolVersion, credentialAttributes: issueCredentialDto.credentialAttributes, orgId: id };
+        const payload = { issueCredentialDto, id };
         return this.sendNats(this.issuanceProxy, 'webhook-get-issue-credential', payload);
     }
 

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

@@ -1,4 +1,4 @@
-import { Controller, Get, HttpStatus, Logger, Query, Res, UseFilters, UseGuards } from '@nestjs/common';
+import { Controller, Get, HttpStatus, Logger, Param, Query, Res, UseFilters, UseGuards } from '@nestjs/common';
 import { PlatformService } from './platform.service';
 import { ApiBearerAuth, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { ApiResponseDto } from '../dtos/apiResponse.dto';
@@ -71,5 +71,27 @@ export class PlatformController {
         };
         return res.status(HttpStatus.OK).json(finalResponse);
     }
+
+    @Get('/network/url/:indyNamespace')
+    @ApiTags('ledgers')
+    @ApiOperation({
+        summary: 'Get network url from platform.',
+        description: 'Get network url from platform.'
+    })
+    @UseGuards(AuthGuard('jwt'))
+    @ApiResponse({ status: 200, description: 'Success', type: ApiResponseDto })
+    async getNetwrkUrl(
+        @Param('indyNamespace') indyNamespace: string, 
+        @Res() res: Response
+    ): Promise<object> {
+        const networksResponse = await this.platformService.getNetworkUrl(indyNamespace);
+
+        const finalResponse: IResponseType = {
+            statusCode: HttpStatus.OK,
+            message: ResponseMessages.ledger.success.fetch,
+            data: networksResponse.response
+        };
+        return res.status(HttpStatus.OK).json(finalResponse);
+    }
 }
 

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

@@ -26,4 +26,13 @@ export class PlatformService extends BaseService {
         const payload = {};
         return this.sendNats(this.platformServiceProxy, 'get-all-ledgers', payload);
     }
+
+    async getNetworkUrl(indyNamespace: string): Promise<{
+        response: object;
+    }> {
+        const payload = {
+            indyNamespace
+        };
+        return this.sendNats(this.platformServiceProxy, 'get-network-url', payload);
+    }
 }

apps/connection/src/connection.repository.ts

@@ -96,18 +96,15 @@ export class ConnectionRepository {
     // eslint-disable-next-line camelcase
     async saveConnectionWebhook(createDateTime: string, lastChangedDateTime: string, connectionId: string, state: string, orgDid: string, theirLabel: string, autoAcceptConnection: boolean, outOfBandId: string, orgId: string): Promise<connections> {
         try {
+
             const agentDetails = await this.prisma.connections.upsert({
                 where: {
                     connectionId
                 },
                 update: {
                     lastChangedDateTime,
                     lastChangedBy: orgId,
-                    state,
-                    orgDid,
-                    theirLabel,
-                    autoAcceptConnection,
-                    outOfBandId
+                    state
                 },
                 create: {
                     createDateTime,
@@ -116,10 +113,6 @@ export class ConnectionRepository {
                     lastChangedBy: orgId,
                     connectionId,
                     state,
-                    orgDid,
-                    theirLabel,
-                    autoAcceptConnection,
-                    outOfBandId,
                     orgId
                 }
             });

apps/issuance/interfaces/issuance.interfaces.ts

@@ -37,6 +37,13 @@ export interface IIssuanceWebhookInterface {
     protocolVersion: string;
     credentialAttributes: ICredentialAttributesInterface[];
     orgId: string;
+    id: string;
+    state: string;
+}
+
+export interface IssueCredentialWebhookPayload {
+    issueCredentialDto: IIssuanceWebhookInterface;
+    id: string;
 }
 
 export interface ICredentialAttributesInterface {
@@ -87,10 +94,10 @@ export interface FileUpload {
     name?: string;
     upload_type?: string;
     status?: string;
-    orgId?:  string;
+    orgId?: string;
     createDateTime?: Date;
     lastChangedDateTime?: Date;
-  }
+}
 
 export interface FileUploadData {
     fileUpload: string;
@@ -104,7 +111,7 @@ export interface FileUploadData {
 }
 
 export interface ClientDetails {
-   
+
     clientId: string;
 
     userId?: string;

apps/issuance/src/issuance.controller.ts

@@ -1,6 +1,6 @@
 import { Controller, Logger } from '@nestjs/common';
 import { MessagePattern } from '@nestjs/microservices';
-import { ClientDetails, IIssuance, IIssuanceWebhookInterface, IIssueCredentials, IIssueCredentialsDefinitions, ImportFileDetails, OutOfBandCredentialOffer, PreviewRequest } from '../interfaces/issuance.interfaces';
+import { ClientDetails, IIssuance, IIssueCredentials, IIssueCredentialsDefinitions, ImportFileDetails, IssueCredentialWebhookPayload, OutOfBandCredentialOffer, PreviewRequest } from '../interfaces/issuance.interfaces';
 import { IssuanceService } from './issuance.service';
 
 @Controller()
@@ -36,10 +36,9 @@ export class IssuanceController {
 
 
   @MessagePattern({ cmd: 'webhook-get-issue-credential' })
-  async getIssueCredentialWebhook(payload: IIssuanceWebhookInterface): Promise<object> {
-    const { createDateTime, connectionId, threadId, protocolVersion, credentialAttributes, orgId } = payload;
-
-    return this.issuanceService.getIssueCredentialWebhook(createDateTime, connectionId, threadId, protocolVersion, credentialAttributes, orgId);
+  async getIssueCredentialWebhook(payload: IssueCredentialWebhookPayload): Promise<object> { 
+    const { issueCredentialDto, id } = payload;
+    return this.issuanceService.getIssueCredentialWebhook(issueCredentialDto, id);
   }
 
   @MessagePattern({ cmd: 'out-of-band-credential-offer' })

apps/issuance/src/issuance.repository.ts

@@ -4,7 +4,7 @@ import { PrismaService } from '@credebl/prisma-service';
 // eslint-disable-next-line camelcase
 import { agent_invitations, credentials, file_data, file_upload, org_agents, organisation, platform_config, shortening_url } from '@prisma/client';
 import { ResponseMessages } from '@credebl/common/response-messages';
-import { FileUploadData, PreviewRequest, SchemaDetails } from '../interfaces/issuance.interfaces';
+import { FileUploadData, IIssuanceWebhookInterface, PreviewRequest, SchemaDetails } from '../interfaces/issuance.interfaces';
 import { FileUploadStatus } from 'apps/api-gateway/src/enum';
 @Injectable()
 export class IssuanceRepository {
@@ -48,9 +48,10 @@ export class IssuanceRepository {
  * @returns Get saved credential details
  */
     // eslint-disable-next-line camelcase
-    async saveIssuedCredentialDetails(createDateTime: string, connectionId: string, threadId: string, protocolVersion: string, credentialAttributes: object[], orgId: string): Promise<credentials> {
+    async saveIssuedCredentialDetails(payload: IIssuanceWebhookInterface, orgId: string): Promise<credentials> {
         try {
 
+            const { connectionId, createDateTime, id, threadId, state } = payload;
             const credentialDetails = await this.prisma.credentials.upsert({
                 where: {
                     threadId
@@ -59,19 +60,17 @@ export class IssuanceRepository {
                     lastChangedBy: orgId,
                     createDateTime,
                     threadId,
-                    protocolVersion,
-                    credentialAttributes,
-                    orgId: String(orgId)
+                    state
                 },
                 create: {
                     createDateTime,
                     lastChangedBy: orgId,
                     createdBy: orgId,
                     connectionId,
+                    state,
                     threadId,
-                    protocolVersion,
-                    credentialAttributes,
-                    orgId: String(orgId)
+                    credentialExchangeId: id,
+                    orgId
                 }
             });
             return credentialDetails;
@@ -284,7 +283,7 @@ export class IssuanceRepository {
                 skip: (getAllfileDetails?.pageNumber - 1) * getAllfileDetails?.pageSize,
                 orderBy: {
                     createDateTime: 'desc'
-                  }
+                }
             });
 
             const fileListWithDetails = await Promise.all(
@@ -343,7 +342,7 @@ export class IssuanceRepository {
                 skip: (getAllfileDetails?.pageNumber - 1) * getAllfileDetails?.pageSize,
                 orderBy: {
                     createDateTime: 'desc'
-                  }
+                }
             });
             const fileCount = await this.prisma.file_data.count({
                 where: {
@@ -386,7 +385,7 @@ export class IssuanceRepository {
                 return this.prisma.file_data.update({
                     where: { id: jobId },
                     data: {
-                       credential_data: null
+                        credential_data: null
                     }
                 });
             }

apps/issuance/src/issuance.service.ts

@@ -8,7 +8,7 @@ import { CommonConstants } from '@credebl/common/common.constant';
 import { ResponseMessages } from '@credebl/common/response-messages';
 import { ClientProxy, RpcException } from '@nestjs/microservices';
 import { map } from 'rxjs';
-import { ClientDetails, FileUploadData, ICredentialAttributesInterface, ImportFileDetails, OutOfBandCredentialOfferPayload, PreviewRequest, SchemaDetails } from '../interfaces/issuance.interfaces';
+import { ClientDetails, FileUploadData, IIssuanceWebhookInterface, ImportFileDetails, OutOfBandCredentialOfferPayload, PreviewRequest, SchemaDetails } from '../interfaces/issuance.interfaces';
 import { OrgAgentType } from '@credebl/enum/enum';
 import { platform_config } from '@prisma/client';
 import * as QRCode from 'qrcode';
@@ -262,9 +262,9 @@ export class IssuanceService {
     }
   }
 
-  async getIssueCredentialWebhook(createDateTime: string, connectionId: string, threadId: string, protocolVersion: string, credentialAttributes: ICredentialAttributesInterface[], orgId: string): Promise<object> {
+  async getIssueCredentialWebhook(payload: IIssuanceWebhookInterface, id: string): Promise<object> {
     try {
-      const agentDetails = await this.issuanceRepository.saveIssuedCredentialDetails(createDateTime, connectionId, threadId, protocolVersion, credentialAttributes, orgId);
+      const agentDetails = await this.issuanceRepository.saveIssuedCredentialDetails(payload, id);
       return agentDetails;
     } catch (error) {
       this.logger.error(`[getIssueCredentialsbyCredentialRecordId] - error in get credentials : ${JSON.stringify(error)}`);
@@ -624,15 +624,15 @@ export class IssuanceService {
       }
 
       await this.validateFileHeaders(fileHeader, attributeNameArray);
-      await this.validateFileData(fileData);      
+      await this.validateFileData(fileData);
 
       const resData = {
         schemaLedgerId: credDefResponse.schemaLedgerId,
         credentialDefinitionId: importFileDetails.credDefId,
         fileData: parsedData,
         fileName: importFileDetails.fileName
       };
-      
+
       const newCacheKey = uuidv4();
 
       await this.cacheManager.set(newCacheKey, JSON.stringify(resData), 3600);