Merge pull request #16 from samagra-comms/main

KDwevedi · web-flow · commit 6647ef653c26 · 2023-12-07T15:33:42.000+05:30
Deploying latest changes to dev
diff --git a/.gitignore b/.gitignore
@@ -35,4 +35,5 @@ lerna-debug.log*
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
-!.vscode/extensions.json
+!.vscode/extensions.json
+.prettierrc
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "@nestjs/config": "^3.1.1",
     "@nestjs/core": "^10.0.0",
     "@nestjs/platform-express": "^10.0.0",
-    "@samagra-x/gupshup-whatsapp-adapter": "^1.0.0",
+    "@samagra-x/gupshup-whatsapp-adapter": "1.0.2",
     "@samagra-x/xmessage": "^1.0.1",
     "@supabase/supabase-js": "^2.38.5",
     "axios": "^1.6.2",
diff --git a/src/message/controllers/inbound/gupshup.whatsapp.controller.ts b/src/message/controllers/inbound/gupshup.whatsapp.controller.ts
@@ -1,15 +1,15 @@
 import { Controller, Get, Post, Body, Logger } from '@nestjs/common';
 import { GSWhatsAppMessage } from '@samagra-x/gupshup-whatsapp-adapter';
 import { ConfigService } from '@nestjs/config';
-import { InboundService } from '../services/inbound/inbound.service';
+import { GupshupWhatsappInboundService } from '../../services/inbound/gupshup.whatsapp.service';
 
 @Controller('/inbound/gupshup/whatsapp')
-export class MessageController {
+export class GupshupWhatsappInboundController {
     constructor(
         private configService: ConfigService,
-        private readonly inboundService: InboundService
+        private readonly inboundService: GupshupWhatsappInboundService
     ) {}
-    private readonly logger = new Logger(MessageController.name);
+    private readonly logger = new Logger(GupshupWhatsappInboundController.name);
 
     @Get('/health')
     async verifyEndpointIsActive(): Promise<string> {
@@ -19,6 +19,7 @@ export class MessageController {
     @Post()
     async handleIncomingMessageData(@Body() requestData: GSWhatsAppMessage): Promise<any> {
 		if ("mobile" in requestData){
+            this.logger.log(requestData)
 			await this.inboundService.handleIncomingGsWhatsappMessage(requestData);
 		}
     }
diff --git a/src/message/controllers/outbound/outbound.controller.ts b/src/message/controllers/outbound/outbound.controller.ts
@@ -8,7 +8,7 @@ export class OutboundMessageController {
 
     @Post()
     async handleIncomingXMessage(@Body() orchestratorRequest: XMessage): Promise<any> {
-        await this.outboundService.handleOrchestratorResponse(orchestratorRequest)
+        // await this.outboundService.handleOrchestratorResponse(orchestratorRequest)
     }
     
 }
diff --git a/src/message/message.module.ts b/src/message/message.module.ts
@@ -1,15 +1,17 @@
 import { Module } from '@nestjs/common';
-import { MessageController } from './controllers/inbound.message.controller';
-import { InboundService } from './services/inbound/inbound.service';
+import { GupshupWhatsappInboundController } from './controllers/inbound/gupshup.whatsapp.controller';
+import { GupshupWhatsappInboundService } from './services/inbound/gupshup.whatsapp.service';
 import { ConfigModule } from '@nestjs/config';
 import { OutboundService } from './services/outbound/outbound.service';
+import { CredentialService } from './services/credentials/credentials.service';
 
 @Module({
   imports: [ConfigModule.forRoot()],
-  controllers: [MessageController],
+  controllers: [GupshupWhatsappInboundController],
   providers: [ 
-    InboundService,
-    OutboundService
+    GupshupWhatsappInboundService,
+    OutboundService,
+    CredentialService
   ],
 })
 export class MessageModule {}
diff --git a/src/message/services/credentials/credentials.service.ts b/src/message/services/credentials/credentials.service.ts
@@ -0,0 +1,21 @@
+import { Injectable, Logger } from '@nestjs/common';
+import axios from 'axios';
+
+
+@Injectable()
+export class CredentialService {
+    private readonly logger = new Logger(CredentialService.name);
+    async getCredentialsFromVault(
+        baseUrl: string,
+        secretPath: string,
+        headers: Record<string, string>
+    ) {
+        const webClient = axios.create({
+            baseURL: baseUrl,
+            headers: headers
+        });
+
+        const response = await webClient.get(`${secretPath}`);
+        return response.data
+    }
+}
diff --git a/src/message/services/inbound/gupshup.whatsapp.service.ts b/src/message/services/inbound/gupshup.whatsapp.service.ts
@@ -11,14 +11,16 @@ import { v4 as uuid4 } from 'uuid';
 
 import { OutboundService } from '../outbound/outbound.service';
 import { XMessage, MessageType, MessageState } from '@samagra-x/xmessage';
+import { CredentialService } from '../credentials/credentials.service';
 
 @Injectable()
-export class InboundService {
+export class GupshupWhatsappInboundService {
     constructor(
         private configService: ConfigService,
-        private readonly outboundService: OutboundService
+        private readonly outboundService: OutboundService,
+        private readonly credentialService: CredentialService
     ) {}
-    private readonly logger = new Logger(InboundService.name);
+    private readonly logger = new Logger(GupshupWhatsappInboundService.name);
 
     convertApiResponseToXMessage(data: any, phoneNumber): XMessage {
         return {
@@ -35,23 +37,52 @@ export class InboundService {
         };
     }
 
+    async getAdapterCredentials(number: string) {
+        if (number.endsWith('88')) {
+            const vaultResponse = await this.credentialService.getCredentialsFromVault(
+                this.configService.get<string>('VAULT_SERVICE_URL'),
+                '/admin/secret/gupshupWhatsappVariable',
+                {
+                    ownerId: '8f7ee860-0163-4229-9d2a-01cef53145ba',
+                    ownerOrgId: 'org1',
+                    'admin-token': this.configService.get<string>('VAULT_SERVICE_TOKEN')
+                }
+            );
+
+            const credentials = vaultResponse['result']['gupshupWhatsappVariable'];
+            return credentials;
+        } else if (number.endsWith('87')) {
+            const vaultResponse = await this.credentialService.getCredentialsFromVault(
+                this.configService.get<string>('VAULT_SERVICE_URL'),
+                '/admin/secret/gupshupWhatsappVariable2',
+                {
+                    ownerId: '8f7ee860-0163-4229-9d2a-01cef53145ba',
+                    ownerOrgId: 'org1',
+                    'admin-token': this.configService.get<string>('VAULT_SERVICE_TOKEN')
+                }
+            );
+
+            const credentials = vaultResponse['result']['gupshupWhatsappVariable2'];
+            return credentials;
+        } else {
+            //throw error
+            return;
+        }
+    }
+
     async handleIncomingGsWhatsappMessage(whatsappMessage: GSWhatsAppMessage) {
-        gupshupWhatsappAdapterServiceConfig.setConfig({
-            baseUrl: this.configService.get<string>('BASE_URL'),
-            adminToken: this.configService.get<string>('ADAPTER_ADMIN_TOKEN'),
-            vaultServiceToken: this.configService.get<string>('VAULT_SERVICE_TOKEN'),
-            vaultServiceUrl: this.configService.get<string>('VAULT_SERVICE_URL'),
-            gupshupUrl: this.configService.get<string>('GUPSHUP_API_ENDPOINT')
-        });
+        const adapterCredentials = await this.getAdapterCredentials(whatsappMessage.waNumber);
         try {
-            if ("interactive" in whatsappMessage) {
-                const interactiveInteraction = JSON.parse(whatsappMessage.interactive)
-                if (interactiveInteraction.type = 'button_reply') {
+            //Handle Feedback First
+            if ('interactive' in whatsappMessage) {
+                const interactiveInteraction = JSON.parse(whatsappMessage.interactive);
+                if ((interactiveInteraction.type = 'button_reply')) {
                     //handle feedback
-                    this.logger.log("Feedback is not being handled right now!")
-                    return
+                    this.logger.log('Feedback is not being handled right now!');
+                    return;
                 }
             }
+
             const xMessagePayload = await convertMessageToXMsg(whatsappMessage);
             xMessagePayload.from.userID = uuid4();
             xMessagePayload.to.userID = uuid4();
@@ -65,7 +96,9 @@ export class InboundService {
             });
 
             const xResponse = this.convertApiResponseToXMessage(resp.data, whatsappMessage.mobile.substring(2));
-            const sentResp = await this.outboundService.handleOrchestratorResponse(xResponse);
+            this.logger.log("OrchestratorResponse", xResponse)
+            const sentResp = await this.outboundService.handleOrchestratorResponse(xResponse, adapterCredentials);
+            this.logger.log("OutboundResponse",sentResp)
         } catch (error) {
             const errorResponse = this.convertApiResponseToXMessage(
                 {
@@ -81,7 +114,8 @@ export class InboundService {
                 },
                 whatsappMessage.mobile.substring(2)
             );
-            await this.outboundService.handleOrchestratorResponse(errorResponse);
+            const sentResp = await this.outboundService.handleOrchestratorResponse(errorResponse, adapterCredentials);
+            this.logger.log("OutboundErrorResponse",sentResp)
         }
     }
 }
diff --git a/src/message/services/outbound/outbound.service.ts b/src/message/services/outbound/outbound.service.ts
@@ -1,43 +1,22 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { convertXMessageToMsg, gupshupWhatsappAdapterServiceConfig } from '@samagra-x/gupshup-whatsapp-adapter';
 import { ConfigService } from '@nestjs/config';
-import { StylingTag, XMessage } from '@samagra-x/xmessage';
+import { MessageState, XMessage } from '@samagra-x/xmessage';
+
+import { CredentialService } from '../credentials/credentials.service';
 
 @Injectable()
 export class OutboundService {
     constructor(private configService: ConfigService) {}
     private readonly logger = new Logger(OutboundService.name);
 
-    async handleOrchestratorResponse(orchestratorRequest: XMessage) {
+    async handleOrchestratorResponse(orchestratorRequest: XMessage, credentials) {
         gupshupWhatsappAdapterServiceConfig.setConfig({
-            adapter: '7b0cf232-38a2-4f9b-8070-9b988ff94c2c',
-            baseUrl: this.configService.get<string>('BASE_URL'),
-            adminToken: this.configService.get<string>('ADAPTER_ADMIN_TOKEN'),
-            vaultServiceToken: this.configService.get<string>('VAULT_SERVICE_TOKEN'),
-            vaultServiceUrl: this.configService.get<string>('VAULT_SERVICE_URL'),
-            gupshupUrl: this.configService.get<string>('GUPSHUP_API_ENDPOINT')
+            adapterCredentials: credentials
         });
-
-        orchestratorRequest.payload.buttonChoices = [
-            {
-                backmenu: true,
-                key: 'positive',
-                text: '👍'
-            },
-            {
-                backmenu: true,
-                key: 'negative',
-                text: '👎'
-            }
-        ];
-        orchestratorRequest.payload.stylingTag = StylingTag.QUICKREPLYBTN;
-
-        if ("text" in orchestratorRequest.payload) {
-            orchestratorRequest.payload.text = orchestratorRequest.payload.text.substring(0,1023)
-            console.log(orchestratorRequest.payload.text.length)
-        }
-
         const adapterResponse = await convertXMessageToMsg(orchestratorRequest);
-        //throw if Not Sent
+        if (adapterResponse.messageState = MessageState.NOT_SENT) {
+            throw new Error("Message Not Sent")
+        }
     }
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export class OutboundMessageController {`
`8`	`8`
`9`	`9`	`@Post()`
`10`	`10`	`async handleIncomingXMessage(@Body() orchestratorRequest: XMessage): Promise<any> {`
`11`		`- await this.outboundService.handleOrchestratorResponse(orchestratorRequest)`
	`11`	`+ // await this.outboundService.handleOrchestratorResponse(orchestratorRequest)`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`}`