SidharthPrabhu/RITz-WhatsApp-Bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge development branch via Dashboard

Browse Source
This commit is contained in:
RIT Services
2026-08-29 08:43:39 +00:00
parent ecf00728ba f03a90d9d9
commit bff5ed067b
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/rit/whatsapp/controller/WebhookController.java
View File

@@ -24,6 +24,9 @@ public class WebhookController {
@Value("${whatsapp.phone-number-id:}") @Value("${whatsapp.phone-number-id:}")
private String configuredPhoneId; private String configuredPhoneId;
@Value("${whatsapp.dev-webhook-forward-url:}")
private String devWebhookUrl;
private final WhatsAppMessageService messageService; private final WhatsAppMessageService messageService;
private final SessionService sessionService; private final SessionService sessionService;
private final StudentMenuHandler studentMenuHandler; private final StudentMenuHandler studentMenuHandler;
@@ -81,8 +84,22 @@ public class WebhookController {
String incomingPhoneId = metadataNode.get("phone_number_id").asText(); String incomingPhoneId = metadataNode.get("phone_number_id").asText();
if (configuredPhoneId != null && !configuredPhoneId.trim().isEmpty() if (configuredPhoneId != null && !configuredPhoneId.trim().isEmpty()
&& !incomingPhoneId.trim().equals(configuredPhoneId.trim())) { && !incomingPhoneId.trim().equals(configuredPhoneId.trim())) {
System.out.println("Incoming phone ID " + incomingPhoneId + " does not match configured ID " + configuredPhoneId + ". Ignoring webhook payload."); if (devWebhookUrl != null && !devWebhookUrl.trim().isEmpty()) {
return ResponseEntity.ok("EVENT_IGNORED"); System.out.println("Incoming phone ID " + incomingPhoneId + " does not match configured ID " + configuredPhoneId + ". Forwarding to " + devWebhookUrl);
try {
org.springframework.web.client.RestTemplate tempTemplate = new org.springframework.web.client.RestTemplate();
org.springframework.http.HttpHeaders headers = new org.springframework.http.HttpHeaders();
headers.setContentType(org.springframework.http.MediaType.APPLICATION_JSON);
org.springframework.http.HttpEntity<String> entity = new org.springframework.http.HttpEntity<>(payload, headers);
tempTemplate.postForEntity(devWebhookUrl, entity, String.class);
} catch (Exception forwardEx) {
System.err.println("Failed to forward webhook to dev bot: " + forwardEx.getMessage());
}
return ResponseEntity.ok("EVENT_FORWARDED");
} else {
System.out.println("Incoming phone ID " + incomingPhoneId + " does not match configured ID " + configuredPhoneId + ". Ignoring webhook payload.");
return ResponseEntity.ok("EVENT_IGNORED");
}
} }
} }
} }