fixes #1654 Whatsapp Clound Connector: fix dialog applicationId

Author: Germain Soumier

bot/connector-whatsapp-cloud/src/main/kotlin/WhatsAppConnectorCloudConnector.kt

@@ -41,11 +41,9 @@ import java.time.Duration
 
 class WhatsAppConnectorCloudConnector internal constructor(
     val connectorId: String,
-    private val applicationId: String,
     private val phoneNumberId: String,
     private val whatsAppBusinessAccountId: String,
     private val path: String,
-    private val appToken: String,
     private val token: String,
     private val verifyToken: String?,
     private val mode: String,
@@ -152,7 +150,7 @@ class WhatsAppConnectorCloudConnector internal constructor(
                     restrictedPhoneNumbers?.contains(it.from) ?: true
                 }.forEach { message: WhatsAppCloudMessage ->
                     executor.executeBlocking {
-                        val event = WebhookActionConverter.toEvent(message, applicationId)
+                        val event = WebhookActionConverter.toEvent(message, connectorId)
                         if (event != null) {
                             controller.handle(
                                 event,

bot/connector-whatsapp-cloud/src/main/kotlin/WhatsAppConnectorCloudProvider.kt

@@ -21,7 +21,6 @@ import ai.tock.shared.resourceAsString
 
 internal object WhatsAppConnectorCloudProvider : ConnectorProvider {
 
-    private const val APP_ID = "appId"
     internal const val WHATSAPP_PHONE_NUMBER_ID = "whatsAppPhoneNumberId"
     private const val WHATSAPP_BUSINESS_ACCOUNT_ID = "whatsAppBusinessAccountId"
     internal const val TOKEN = "token"
@@ -33,19 +32,16 @@ internal object WhatsAppConnectorCloudProvider : ConnectorProvider {
 
     override fun connector(connectorConfiguration: ConnectorConfiguration): Connector {
         with(connectorConfiguration){
-            val appId = parameters[APP_ID]?.takeIf { it.isNotBlank() } ?: connectorId
             return WhatsAppConnectorCloudConnector(
-                connectorId,
-                appId,
-                parameters.getValue(WHATSAPP_PHONE_NUMBER_ID),
-                parameters.getValue(WHATSAPP_BUSINESS_ACCOUNT_ID),
-                path,
-                "$appId|${parameters.getValue(SECRET)}",
-                parameters.getValue(TOKEN),
-                parameters[VERIFY_TOKEN],
-                parameters.getValue(MODE),
-                createCloudApiClient(this),
-                createRequestFilter(connectorConfiguration)
+                connectorId = connectorId,
+                phoneNumberId = parameters.getValue(WHATSAPP_PHONE_NUMBER_ID),
+                whatsAppBusinessAccountId = parameters.getValue(WHATSAPP_BUSINESS_ACCOUNT_ID),
+                path = path,
+                token = parameters.getValue(TOKEN),
+                verifyToken = parameters[VERIFY_TOKEN],
+                mode = parameters.getValue(MODE),
+                client = createCloudApiClient(this),
+                requestFilter = createRequestFilter(connectorConfiguration)
 
             )
         }
@@ -55,11 +51,6 @@ internal object WhatsAppConnectorCloudProvider : ConnectorProvider {
         ConnectorTypeConfiguration(
             whatsAppCloudConnectorType,
             listOf(
-                ConnectorTypeConfigurationField(
-                    "Application Id",
-                    APP_ID,
-                    true
-                ),
                 ConnectorTypeConfigurationField(
                     "WhatsApp Phone Number Id",
                     WHATSAPP_PHONE_NUMBER_ID,
@@ -85,11 +76,6 @@ internal object WhatsAppConnectorCloudProvider : ConnectorProvider {
                     MODE,
                     true
                 ),
-                ConnectorTypeConfigurationField(
-                    "Secret",
-                    SECRET,
-                    true
-                )
             ),
             resourceAsString("/whatsapp.svg")
         )