merge: DEV to QA (27-08-2024) (#945)

* refactor: applied validations on issuance date (#934) * fix: fetch schema details Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com> * fix: applied validations for issuance using connection Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com> --------- Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com> * fix: encrypt clientId and client secret Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com> * fix:collect reuse connection events Signed-off-by: pallavicoder <pallavi.ghule@ayanworks.com> * feat: reuse connection usinginvitation DID (#940) Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com> * fix: unable to use platform archieved schema Signed-off-by: Krishna Waske <krishna.waske@ayanworks.com> * fix: solved the clientId dcryption in verification email Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com> * feat: basic message (#848) * WIP : Implementation of basic message protocol wrapper Signed-off-by: Ankita Patidar <ankita.patidar@ayanworks.com> * feat: basic message Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com> * changed response message Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com> * fix: sonar lint Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com> * fix: seperated URL creation logic Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com> * fix: changed error message Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com> --------- Signed-off-by: Ankita Patidar <ankita.patidar@ayanworks.com> Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com> Co-authored-by: Ankita Patidar <ankita.patidar@ayanworks.com> * refactor: fetch proof details function (#943) * fix: fetch schema details Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com> * fix: applied validations for issuance using connection Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com> * fix: multiple schemas in verified proof details api Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com> * refactor: description Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com> --------- Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com> * fix: basic message url (#944) Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com> --------- Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com> Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com> Signed-off-by: pallavicoder <pallavi.ghule@ayanworks.com> Signed-off-by: tipusinghaw <tipu.singh@ayanworks.com> Signed-off-by: Krishna Waske <krishna.waske@ayanworks.com> Signed-off-by: Ankita Patidar <ankita.patidar@ayanworks.com> Co-authored-by: Ganesh Nawle <ganesh.nawle@ayanworks.com> Co-authored-by: KulkarniShashank <shashank.kulkarni@ayanworks.com> Co-authored-by: pallavicoder <pallavi.ghule@ayanworks.com> Co-authored-by: Shashank Kulkarni <44693969+KulkarniShashank@users.noreply.github.com> Co-authored-by: pallavighule <61926403+pallavighule@users.noreply.github.com> Co-authored-by: tipusinghaw <126460794+tipusinghaw@users.noreply.github.com> Co-authored-by: Krishna Waske <krishna.waske@ayanworks.com> Co-authored-by: Krishna <74084119+GHkrishna@users.noreply.github.com> Co-authored-by: Ankita Patidar <ankita.patidar@ayanworks.com> Signed-off-by: KulkarniShashank <shashank.kulkarni@ayanworks.com>
credebl · Sep 11, 2024 · 223c28a · 223c28a
1 parent 0f40bbe
commit 223c28a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/apps/api-gateway/src/connection/connection.service.ts b/apps/api-gateway/src/connection/connection.service.ts
@@ -24,6 +24,16 @@ export class ConnectionService extends BaseService {
     }
   }
 
+  sendBasicMessage(
+    basicMessageDto: BasicMessageDto
+  ): Promise<object> {
+    try {
+      return this.sendNatsMessage(this.connectionServiceProxy, 'send-basic-message', basicMessageDto);
+    } catch (error) {
+      throw new RpcException(error.response);
+    }
+  }
+
   getConnectionWebhook(
     connectionDto: ConnectionDto,
     orgId: string

diff --git a/apps/connection/src/connection.service.ts b/apps/connection/src/connection.service.ts
@@ -618,7 +618,8 @@ export class ConnectionService {
         orgId,
         routing,
         recipientKey,
-        invitationDid
+        invitationDid,
+        IsReuseConnection
       } = payload?.createOutOfBandConnectionInvitation;
 
       const agentDetails = await this.connectionRepository.getAgentEndPoint(
@@ -630,6 +631,21 @@ export class ConnectionService {
       if (!agentDetails) {
         throw new NotFoundException(ResponseMessages.connection.error.agentEndPointNotFound);
       }
+
+      let legacyinvitationDid;
+      if (IsReuseConnection) {
+        const data: agent_invitations[] = await this.connectionRepository.getInvitationDidByOrgId(orgId);
+           if (data && 0 < data.length) {
+            const [firstElement] = data;
+            legacyinvitationDid = firstElement?.invitationDid ?? undefined;
+
+            this.logger.log('legacyinvitationDid:', legacyinvitationDid);
+        }
+      }
+      const connectionInvitationDid = invitationDid ? invitationDid : legacyinvitationDid;
+
+      this.logger.log('connectionInvitationDid:', connectionInvitationDid);
+
 
       this.logger.log(`logoUrl:::, ${organisation.logoUrl}`);
       const connectionPayload = {
@@ -646,7 +662,7 @@ export class ConnectionService {
         routing: routing || undefined,
         messages: messages || undefined,
         recipientKey: recipientKey || undefined,
-        invitationDid: invitationDid || undefined
+        invitationDid: connectionInvitationDid || undefined
       };
 
       const createConnectionInvitationFlag = 'connection-invitation';

diff --git a/apps/user/src/user.service.ts b/apps/user/src/user.service.ts
@@ -127,7 +127,7 @@ export class UserService {
           throw new NotFoundException(ResponseMessages.user.error.redirectUrlNotFound);
         }
 
-        sendVerificationMail = await this.sendEmailForVerification(email, verifyCode, redirectUrl, decryptClientId, brandLogoUrl, platformName);
+        sendVerificationMail = await this.sendEmailForVerification(email, verifyCode, redirectUrl, clientId, brandLogoUrl, platformName);
       } catch (error) {
         throw new InternalServerErrorException(ResponseMessages.user.error.emailSend);
       }

diff --git a/apps/verification/src/verification.service.ts b/apps/verification/src/verification.service.ts
@@ -813,7 +813,6 @@ export class VerificationService {
           }
         });
       }
-
       // For Indy format
       if (getProofPresentationById?.response?.request?.indy) {
         const requestedAttributes = getProofPresentationById?.response?.request?.indy?.requested_attributes;
-Original file line number
+Diff line change
@@ Expand Up / @@ -813,7 +813,6 @@ export class VerificationService { @@
               }
             });
           }
           // For Indy format
           if (getProofPresentationById?.response?.request?.indy) {
             const requestedAttributes = getProofPresentationById?.response?.request?.indy?.requested_attributes;
@@ Expand Down @@