Merge pull request #593 from credebl/feat-reuseConnection

feat: Add reuse connection
credebl · Mar 13, 2024 · 79d7ae1 · 79d7ae1
2 parents fc60add + 888b281
commit 79d7ae1
Show file tree

Hide file tree

Showing 17 changed files with 111 additions and 23 deletions.
diff --git a/apps/api-gateway/src/connection/connection.service.ts b/apps/api-gateway/src/connection/connection.service.ts
@@ -40,7 +40,8 @@ export class ConnectionService extends BaseService {
         goal: connectionDto.goal,
         handshake: connectionDto.handshake,
         handshakeProtocols: connectionDto.handshakeProtocols,
-        user
+        user,
+        recipientKey:connectionDto.recipientKey
       };
 
       return this.sendNatsMessage(this.connectionServiceProxy, 'create-connection', connectionDetails);

diff --git a/apps/api-gateway/src/connection/dtos/connection.dto.ts b/apps/api-gateway/src/connection/dtos/connection.dto.ts
@@ -60,6 +60,12 @@ export class CreateConnectionDto {
     handshakeProtocols: string[];
 
     orgId: string;
+
+    @ApiPropertyOptional()
+    @IsString()
+    @IsOptional()
+    @IsNotEmpty({ message: 'Please provide recipientKey' })
+    recipientKey: string;
 }
 
 export class ConnectionDto {

diff --git a/apps/api-gateway/src/issuance/dtos/issuance.dto.ts b/apps/api-gateway/src/issuance/dtos/issuance.dto.ts
@@ -191,6 +191,12 @@ class CredentialsIssuanceDto {
     @IsOptional()
     credentialType:IssueCredentialType;
 
+    @ApiPropertyOptional({ default: true })
+    @IsOptional()
+    @IsNotEmpty({ message: 'please provide valid value for reuseConnection' })
+    @IsBoolean({ message: 'reuseConnection must be a boolean' })
+    reuseConnection?: boolean;
+
     orgId: string;
 }
 

diff --git a/apps/api-gateway/src/issuance/issuance.service.ts b/apps/api-gateway/src/issuance/issuance.service.ts
@@ -31,10 +31,10 @@ export class IssuanceService extends BaseService {
     }> {
         let payload;
         if (IssueCredentialType.INDY === issueCredentialDto.credentialType) {
-            payload = { attributes: issueCredentialDto.attributes, comment: issueCredentialDto.comment, credentialDefinitionId: issueCredentialDto.credentialDefinitionId, orgId: issueCredentialDto.orgId, protocolVersion: issueCredentialDto.protocolVersion, goalCode: issueCredentialDto.goalCode, parentThreadId: issueCredentialDto.parentThreadId, willConfirm: issueCredentialDto.willConfirm, label: issueCredentialDto.label, autoAcceptCredential: issueCredentialDto.autoAcceptCredential, credentialType: issueCredentialDto.credentialType, isShortenUrl: issueCredentialDto.isShortenUrl };
+            payload = { attributes: issueCredentialDto.attributes, comment: issueCredentialDto.comment, credentialDefinitionId: issueCredentialDto.credentialDefinitionId, orgId: issueCredentialDto.orgId, protocolVersion: issueCredentialDto.protocolVersion, goalCode: issueCredentialDto.goalCode, parentThreadId: issueCredentialDto.parentThreadId, willConfirm: issueCredentialDto.willConfirm, label: issueCredentialDto.label, autoAcceptCredential: issueCredentialDto.autoAcceptCredential, credentialType: issueCredentialDto.credentialType, isShortenUrl: issueCredentialDto.isShortenUrl, reuseConnection : issueCredentialDto.reuseConnection };
         }
         if (IssueCredentialType.JSONLD === issueCredentialDto.credentialType) {
-            payload = { credential: issueCredentialDto.credential, options: issueCredentialDto.options, comment: issueCredentialDto.comment, orgId: issueCredentialDto.orgId, protocolVersion: issueCredentialDto.protocolVersion, goalCode: issueCredentialDto.goalCode, parentThreadId: issueCredentialDto.parentThreadId, willConfirm: issueCredentialDto.willConfirm, label: issueCredentialDto.label, autoAcceptCredential: issueCredentialDto.autoAcceptCredential, credentialType: issueCredentialDto.credentialType, isShortenUrl: issueCredentialDto.isShortenUrl };
+            payload = { credential: issueCredentialDto.credential, options: issueCredentialDto.options, comment: issueCredentialDto.comment, orgId: issueCredentialDto.orgId, protocolVersion: issueCredentialDto.protocolVersion, goalCode: issueCredentialDto.goalCode, parentThreadId: issueCredentialDto.parentThreadId, willConfirm: issueCredentialDto.willConfirm, label: issueCredentialDto.label, autoAcceptCredential: issueCredentialDto.autoAcceptCredential, credentialType: issueCredentialDto.credentialType, isShortenUrl: issueCredentialDto.isShortenUrl, reuseConnection : issueCredentialDto.reuseConnection };
         }
 
         return this.sendNats(this.issuanceProxy, 'send-credential-create-offer-oob', payload);

diff --git a/apps/api-gateway/src/verification/dto/request-proof.dto.ts b/apps/api-gateway/src/verification/dto/request-proof.dto.ts
@@ -332,5 +332,12 @@ export class SendProofRequestPayload {
     @IsOptional()
     @IsNotEmpty({message:'Please provide the flag for shorten url.'})
     isShortenUrl?: boolean;
+
+    @ApiPropertyOptional({ default: true })
+    @IsOptional()
+    @IsNotEmpty({ message: 'please provide valid value for reuseConnection' })
+    @IsBoolean({ message: 'reuseConnection must be a boolean' })
+    reuseConnection?: boolean;
+
 }
 
diff --git a/apps/connection/src/connection.repository.ts b/apps/connection/src/connection.repository.ts
@@ -48,7 +48,8 @@ export class ConnectionRepository {
   async saveAgentConnectionInvitations(
     connectionInvitation: string,
     agentId: string,
-    orgId: string
+    orgId: string,
+    recipientKey: string
     // eslint-disable-next-line camelcase
   ): Promise<agent_invitations> {
     try {
@@ -57,7 +58,8 @@ export class ConnectionRepository {
           orgId: String(orgId),
           agentId,
           connectionInvitation,
-          multiUse: true
+          multiUse: true,
+          recipientKey
         }
       });
       return agentDetails;

diff --git a/apps/connection/src/connection.service.ts b/apps/connection/src/connection.service.ts
@@ -51,7 +51,8 @@ export class ConnectionService {
       goal,
       goalCode,
       handshake,
-      handshakeProtocols
+      handshakeProtocols,
+      recipientKey
     } = payload;
     try {
       const agentDetails = await this.connectionRepository.getAgentEndPoint(orgId);
@@ -72,7 +73,8 @@ export class ConnectionService {
         goal: goal || undefined,
         goalCode: goalCode || undefined,
         handshake: handshake || undefined,
-        handshakeProtocols: handshakeProtocols || undefined
+        handshakeProtocols: handshakeProtocols || undefined,
+        recipientKey:recipientKey || undefined
       };
 
       const orgAgentType = await this.connectionRepository.getOrgAgentType(agentDetails?.orgAgentTypeId);
@@ -83,18 +85,19 @@ export class ConnectionService {
         apiKey = await this._getOrgAgentApiKey(orgId);
       }
       const createConnectionInvitation = await this._createConnectionInvitation(connectionPayload, url, apiKey);
+
       const connectionInvitationUrl: string = createConnectionInvitation?.message?.invitationUrl;
       const shortenedUrl: string = await this.storeConnectionObjectAndReturnUrl(
         connectionInvitationUrl,
         connectionPayload.multiUseInvitation
       );
-
+      const  recipientsKey = createConnectionInvitation?.message?.recipientKey || recipientKey;
       const saveConnectionDetails = await this.connectionRepository.saveAgentConnectionInvitations(
         shortenedUrl,
         agentId,
-        orgId
+        orgId,
+        recipientsKey
       );
-
       const connectionDetailRecords: ConnectionResponseDetail = {
         id: saveConnectionDetails.id,
         orgId: saveConnectionDetails.orgId,
@@ -105,7 +108,8 @@ export class ConnectionService {
         createdBy: saveConnectionDetails.createdBy,
         lastChangedDateTime: saveConnectionDetails.lastChangedDateTime,
         lastChangedBy: saveConnectionDetails.lastChangedBy,
-        recordId: createConnectionInvitation.message.outOfBandRecord.id
+        recordId: createConnectionInvitation.message.outOfBandRecord.id,
+        recipientKey:saveConnectionDetails.recipientKey
       };
       return connectionDetailRecords;
     } catch (error) {

diff --git a/apps/connection/src/interfaces/connection.interfaces.ts b/apps/connection/src/interfaces/connection.interfaces.ts
@@ -15,6 +15,7 @@ export interface IConnection {
   handshake: string;
   handshakeProtocols: string[];
   orgId: string;
+  recipientKey?: string;
 }
 export interface IUserRequestInterface {
   userId: string;
@@ -264,4 +265,5 @@ export interface ConnectionResponseDetail {
   lastChangedDateTime: Date;
   lastChangedBy: number;
   recordId: string;
+  recipientKey:string;
 }
diff --git a/apps/issuance/src/issuance.repository.ts b/apps/issuance/src/issuance.repository.ts
@@ -3,6 +3,7 @@ import { Injectable, InternalServerErrorException, Logger, NotFoundException } f
 import { PrismaService } from '@credebl/prisma-service';
 // eslint-disable-next-line camelcase
 import {
+  agent_invitations,
   credentials,
   file_data,
   file_upload,
@@ -70,6 +71,23 @@ export class IssuanceRepository {
     }
   }
 
+
+  async getRecipientKeyByOrgId(orgId: string): Promise<agent_invitations[]> {
+    try {
+      return this.prisma.agent_invitations.findMany({
+        where: {
+          orgId
+        },
+        orderBy: {
+          createDateTime: 'asc' 
+        }
+      });
+    } catch (error) {
+      this.logger.error(`Error in getRecipientKey in issuance repository: ${error.message}`);
+      throw error;
+    }
+  }
+
   async getAllIssuedCredentials(
     user: IUserRequest,
     orgId: string,

diff --git a/apps/issuance/src/issuance.service.ts b/apps/issuance/src/issuance.service.ts
@@ -32,7 +32,7 @@ import { io } from 'socket.io-client';
 import { IIssuedCredentialSearchParams, IssueCredentialType } from 'apps/api-gateway/src/issuance/interfaces';
 import { IIssuedCredential } from '@credebl/common/interfaces/issuance.interface';
 import { OOBIssueCredentialDto } from 'apps/api-gateway/src/issuance/dtos/issuance.dto';
-import { organisation } from '@prisma/client';
+import { agent_invitations, organisation } from '@prisma/client';
 
 
 @Injectable()
@@ -150,7 +150,7 @@ export class IssuanceService {
   async sendCredentialOutOfBand(payload: OOBIssueCredentialDto): Promise<{ response: object }> {
     try {
 
-      const { orgId, credentialDefinitionId, comment, attributes, protocolVersion, credential, options, credentialType, isShortenUrl } = payload;
+      const { orgId, credentialDefinitionId, comment, attributes, protocolVersion, credential, options, credentialType, isShortenUrl, reuseConnection } = payload;
       if (credentialType === IssueCredentialType.INDY) {
         const schemadetailsResponse: SchemaDetails = await this.issuanceRepository.getCredentialDefinitionDetails(
           credentialDefinitionId
@@ -181,8 +181,14 @@ export class IssuanceService {
       }
 
       const agentDetails = await this.issuanceRepository.getAgentEndPoint(orgId);
-      // eslint-disable-next-line camelcase
-
+      let recipientKey: string | undefined;
+      if (true === reuseConnection) {
+        const data: agent_invitations[] = await this.issuanceRepository.getRecipientKeyByOrgId(orgId);
+         if (data && 0 < data.length) {
+          const [firstElement] = data;
+          recipientKey = firstElement?.recipientKey ?? undefined;
+      }
+      }
       const { agentEndPoint, organisation } = agentDetails;
 
       if (!agentDetails) {
@@ -217,7 +223,8 @@ export class IssuanceService {
           willConfirm: payload.willConfirm || undefined,
           imageUrl: organisation?.logoUrl || payload?.imageUrl || undefined,
           label: organisation?.name,
-          comment: comment || ''
+          comment: comment || '',
+          recipientKey:recipientKey || undefined
         };
 
       }
@@ -237,7 +244,8 @@ export class IssuanceService {
           willConfirm: payload.willConfirm || undefined,
           imageUrl: organisation?.logoUrl || payload?.imageUrl || undefined,
           label: organisation?.name,
-          comment: comment || ''
+          comment: comment || '',
+          recipientKey:recipientKey || undefined
         };
       }
       const credentialCreateOfferDetails = await this._outOfBandCredentialOffer(issueData, url, apiKey);

diff --git a/apps/verification/src/interfaces/verification.interface.ts b/apps/verification/src/interfaces/verification.interface.ts
@@ -145,8 +145,10 @@ export interface ISendProofRequestPayload {
     willConfirm?: boolean;
     imageUrl?: string;
     isShortenUrl?: boolean;
-     type?:string;
-     presentationDefinition?:IProofRequestPresentationDefinition;
+    type?:string;
+    presentationDefinition?:IProofRequestPresentationDefinition;
+    reuseConnection?: boolean;
+    recipientKey?:string;
 }
 
 export interface IWSendProofRequestPayload {

diff --git a/apps/verification/src/repositories/verification.repository.ts b/apps/verification/src/repositories/verification.repository.ts
@@ -2,7 +2,7 @@ import { ResponseMessages } from '@credebl/common/response-messages';
 import { PrismaService } from '@credebl/prisma-service';
 import { Injectable, Logger, NotFoundException } from '@nestjs/common';
 // eslint-disable-next-line camelcase
-import { org_agents, organisation, platform_config, presentations } from '@prisma/client';
+import { agent_invitations, org_agents, organisation, platform_config, presentations } from '@prisma/client';
 import { IProofPresentation } from '../interfaces/verification.interface';
 import { IProofRequestSearchCriteria } from '../interfaces/verification.interface';
 import { IUserRequest } from '@credebl/user-request/user-request.interface';
@@ -185,4 +185,21 @@ export class VerificationRepository {
       throw error;
     }
   }
+
+  // eslint-disable-next-line camelcase
+  async getRecipientKeyByOrgId(orgId: string): Promise<agent_invitations[]> {
+    try {
+      return this.prisma.agent_invitations.findMany({
+        where: {
+          orgId
+        },
+        orderBy: {
+          createDateTime: 'asc' // or 'desc' for descending order
+        }
+      });
+    } catch (error) {
+      this.logger.error(`Error in getRecipientKey in verification repository: ${error.message}`);
+      throw error;
+    }
+  }
 }
diff --git a/apps/verification/src/verification.service.ts b/apps/verification/src/verification.service.ts
@@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
 import { IGetAllProofPresentations, IProofRequestSearchCriteria, IGetProofPresentationById, IProofPresentation, IProofRequestPayload, IRequestProof, ISendProofRequestPayload, IVerifyPresentation, IVerifiedProofData, IPresentationExchangeProofRequestPayload} from './interfaces/verification.interface';
 import { VerificationRepository } from './repositories/verification.repository';
 import { CommonConstants } from '@credebl/common/common.constant';
-import { org_agents, organisation, presentations } from '@prisma/client';
+import { agent_invitations, org_agents, organisation, presentations } from '@prisma/client';
 import { OrgAgentType } from '@credebl/enum/enum';
 import { ResponseMessages } from '@credebl/common/response-messages';
 import * as QRCode from 'qrcode';
@@ -358,13 +358,22 @@ export class VerificationService {
         apiKey = await this._getOrgAgentApiKey(user.orgId);
       }
 
-      const { isShortenUrl, type, ...updateOutOfBandRequestProof } = outOfBandRequestProof;
+      const { isShortenUrl, type, reuseConnection, ...updateOutOfBandRequestProof } = outOfBandRequestProof;
+      let recipientKey: string | undefined;
+      if (true === reuseConnection) {
+        const data: agent_invitations[] = await this.verificationRepository.getRecipientKeyByOrgId(user.orgId);
+         if (data && 0 < data.length) {
+          const [firstElement] = data;
+          recipientKey = firstElement?.recipientKey ?? undefined;
+      }
+      }
       outOfBandRequestProof.autoAcceptProof = outOfBandRequestProof.autoAcceptProof || 'always';
 
       let payload: IProofRequestPayload | IPresentationExchangeProofRequestPayload;
 
       if (ProofRequestType.INDY === type) {
         updateOutOfBandRequestProof.protocolVersion = updateOutOfBandRequestProof.protocolVersion || 'v1';
+        updateOutOfBandRequestProof.recipientKey = recipientKey || undefined;
         payload   = {
         apiKey,
         url,
@@ -389,7 +398,8 @@ export class VerificationService {
                 }
               }
             },
-            autoAcceptProof:outOfBandRequestProof.autoAcceptProof || 'always'
+            autoAcceptProof:outOfBandRequestProof.autoAcceptProof || 'always',
+            recipientKey:recipientKey || undefined
           }
         };
       }

diff --git a/libs/common/src/interfaces/agent-service.interface.ts b/libs/common/src/interfaces/agent-service.interface.ts
@@ -10,6 +10,7 @@ export interface InvitationMessage {
         routingKeys: string[];
       };
       outOfBandRecord: OutOfBandRecord;
+      recipientKey?:string
     };
   }
 

diff --git a/libs/common/src/interfaces/connection.interface.ts b/libs/common/src/interfaces/connection.interface.ts
@@ -30,5 +30,6 @@ export interface IConnectionsListCount {
     createdBy: number;
     lastChangedDateTime: Date;
     lastChangedBy: number;
+    recipientKey?:string;
 }
 
diff --git a/...service/prisma/migrations/20240312064123_agent_invitation_add_recipient_key/migration.sql b/...service/prisma/migrations/20240312064123_agent_invitation_add_recipient_key/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "agent_invitations" ADD COLUMN     "recipientKey" TEXT;
diff --git a/libs/prisma-service/prisma/schema.prisma b/libs/prisma-service/prisma/schema.prisma
@@ -293,6 +293,7 @@ model agent_invitations {
   lastChangedBy        Int          @default(1)
   org_agents           org_agents   @relation(fields: [agentId], references: [id])
   organisation         organisation @relation(fields: [orgId], references: [id])
+  recipientKey         String? 
 }
 
 model connections {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ export interface InvitationMessage { @@
             routingKeys: string[];
           };
           outOfBandRecord: OutOfBandRecord;
+          recipientKey?:string
         };
       }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "agent_invitations" ADD COLUMN "recipientKey" TEXT;