Merge pull request #22 from samagra-comms/main

Outbound Controller

Author: KDwevedi

package.json

@@ -20,6 +20,7 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
+    "@nestjs/axios": "^3.0.1",
     "@nestjs/common": "^10.0.0",
     "@nestjs/config": "^3.1.1",
     "@nestjs/core": "^10.0.0",

src/message/controllers/outbound/outbound.controller.ts

@@ -8,7 +8,16 @@ export class OutboundMessageController {
 
     @Post()
     async handleIncomingXMessage(@Body() orchestratorRequest: XMessage): Promise<any> {
-        // await this.outboundService.handleOrchestratorResponse(orchestratorRequest)
+
+        if (orchestratorRequest.from.bot) {
+            if ( 'botMobileNumber' in orchestratorRequest.from.meta) {
+                const botMobileNumber = orchestratorRequest.from.meta.botMobileNumber as string
+                const credentials = await this.outboundService.getAdapterCredentials(botMobileNumber)
+                await this.outboundService.handleOrchestratorResponse(orchestratorRequest, credentials)
+            }
+        }
+
+        
     }
 
 }

src/message/message.module.ts

@@ -4,14 +4,11 @@ import { GupshupWhatsappInboundService } from './services/inbound/gupshup.whatsa
 import { ConfigModule } from '@nestjs/config';
 import { OutboundService } from './services/outbound/outbound.service';
 import { CredentialService } from './services/credentials/credentials.service';
+import { OutboundMessageController } from './controllers/outbound/outbound.controller';
 
 @Module({
-  imports: [ConfigModule.forRoot()],
-  controllers: [GupshupWhatsappInboundController],
-  providers: [ 
-    GupshupWhatsappInboundService,
-    OutboundService,
-    CredentialService
-  ],
+    imports: [ConfigModule.forRoot()],
+    controllers: [GupshupWhatsappInboundController, OutboundMessageController],
+    providers: [GupshupWhatsappInboundService, OutboundService, CredentialService]
 })
-export class MessageModule {}
+export class MessageModule {}

src/message/services/inbound/gupshup.whatsapp.service.ts

@@ -1,10 +1,5 @@
 import { Injectable, Logger } from '@nestjs/common';
-import {
-    GSWhatsAppMessage,
-    convertMessageToXMsg,
-    convertXMessageToMsg,
-    gupshupWhatsappAdapterServiceConfig
-} from '@samagra-x/gupshup-whatsapp-adapter';
+import { GSWhatsAppMessage, convertMessageToXMsg } from '@samagra-x/gupshup-whatsapp-adapter';
 import { ConfigService } from '@nestjs/config';
 import axios from 'axios';
 import { v4 as uuid4 } from 'uuid';
@@ -83,23 +78,33 @@ export class GupshupWhatsappInboundService {
                 }
             }
 
-            const xMessagePayload = await convertMessageToXMsg(whatsappMessage);
+            const xMessagePayload: XMessage = await convertMessageToXMsg(whatsappMessage);
+            if (xMessagePayload.messageType != MessageType.TEXT) {
+                throw new Error("Media Type Not Supported");
+            }
+
+            this.logger.log("Converted Message:", xMessagePayload)
             xMessagePayload.from.userID = uuid4();
             xMessagePayload.to.userID = uuid4();
             xMessagePayload.messageId.Id = uuid4();
 
+            xMessagePayload.to.bot = true;
+            xMessagePayload.to.meta = xMessagePayload.to.meta || new Map<string, string>();
+            xMessagePayload.to.meta.set('botMobileNumber', whatsappMessage.waNumber);
+            console.log(xMessagePayload)
+
             const orchestratorServiceUrl = this.configService.get<string>('ORCHESTRATOR_API_ENDPOINT');
             const resp = await axios.post(orchestratorServiceUrl, xMessagePayload, {
                 headers: {
                     'Content-Type': 'application/json'
                 }
             });
-
-            const xResponse = this.convertApiResponseToXMessage(resp.data, whatsappMessage.mobile.substring(2));
-            this.logger.log("OrchestratorResponse", xResponse)
-            const sentResp = await this.outboundService.handleOrchestratorResponse(xResponse, adapterCredentials);
-            this.logger.log("OutboundResponse",sentResp)
+            this.logger.log('OrchestratorResponse', resp)
         } catch (error) {
+            let errorText = 'Something went wrong. Please try again later'
+            if ( error == 'Error: Media Type Not Supported') {
+                errorText = `Sorry, I can only respond to text-based questions at the moment. Please type your question using regular text characters, and I'll be happy to help!\n\nThank you for your understanding!`
+            }
             const errorResponse = this.convertApiResponseToXMessage(
                 {
                     adapterId: '7b0cf232-38a2-4f9b-8070-9b988ff94c2c',
@@ -110,12 +115,12 @@ export class GupshupWhatsappInboundService {
                     providerURI: 'gupshup',
                     timestamp: Date.now(),
                     messageState: MessageState.REPLIED,
-                    payload: { text: 'Something went wrong. Please try again later.' }
+                    payload: { text: errorText }
                 },
                 whatsappMessage.mobile.substring(2)
             );
             const sentResp = await this.outboundService.handleOrchestratorResponse(errorResponse, adapterCredentials);
-            this.logger.log("OutboundErrorResponse",sentResp)
+            this.logger.log('OutboundErrorResponse', error);
         }
     }
 }

src/message/services/outbound/outbound.service.ts

@@ -7,16 +7,52 @@ import { CredentialService } from '../credentials/credentials.service';
 
 @Injectable()
 export class OutboundService {
-    constructor(private configService: ConfigService) {}
+    constructor(
+        private configService: ConfigService,
+        private readonly credentialService: CredentialService
+    ) {}
     private readonly logger = new Logger(OutboundService.name);
 
+    async getAdapterCredentials(number: string) {
+        console.log(number)
+        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 new Error("unknown whatsapp number")
+        }
+    }
+
     async handleOrchestratorResponse(orchestratorRequest: XMessage, credentials) {
         gupshupWhatsappAdapterServiceConfig.setConfig({
             adapterCredentials: credentials
         });
         const adapterResponse = await convertXMessageToMsg(orchestratorRequest);
         if (adapterResponse.messageState == MessageState.NOT_SENT) {
-            throw new Error("Message Not Sent")
+            throw new Error('Message Not Sent');
         }
     }
 }

yarn.lock

@@ -790,6 +790,11 @@
   resolved "https://registry.yarnpkg.com/@lukeed/csprng/-/csprng-1.1.0.tgz#1e3e4bd05c1cc7a0b2ddbd8a03f39f6e4b5e6cfe"
   integrity sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==
 
+"@nestjs/axios@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@nestjs/axios/-/axios-3.0.1.tgz#b006f81dd54a49def92cfaf9a8970434567e75ce"
+  integrity sha512-VlOZhAGDmOoFdsmewn8AyClAdGpKXQQaY1+3PGB+g6ceurGIdTxZgRX3VXc1T6Zs60PedWjg3A82TDOB05mrzQ==
+
 "@nestjs/cli@^10.0.0":
   version "10.2.1"
   resolved "https://registry.yarnpkg.com/@nestjs/cli/-/cli-10.2.1.tgz#a1d32c28e188f0fb4c3f54235c55745de4c6dd7f"