Merge pull request #4111 from techmatters/CHI-3792-fix_url_in_webhook_validation

stephenhand · web-flow · commit 999ebc2df0ff · 2026-03-27T09:25:29.000Z
CHI-3792: Fix URL encoding approach for webhook validation
diff --git a/lambdas/account-scoped/src/customChannels/configuration.ts b/lambdas/account-scoped/src/customChannels/configuration.ts
@@ -46,7 +46,7 @@ const LEGACY_FACEBOOK_PAGE_ACCESS_TOKEN_PARAMETERS: Record<
   },
   nz: {
     staging: 'FACEBOOK_PAGE_ACCESS_TOKEN_453194187877367_NZ-Staging',
-    production: 'FACEBOOK_PAGE_ACCESS_TOKEN_103538615719253_Te-Gu-o---L-nea-de-ayuda',
+    production: 'FACEBOOK_PAGE_ACCESS_TOKEN_134818612864_Youthline',
   },
   th: {
     staging: 'FACEBOOK_PAGE_ACCESS_TOKEN_100136349533502_Childline-TH-Staging',
diff --git a/lambdas/account-scoped/src/validation/twilioWebhook.ts b/lambdas/account-scoped/src/validation/twilioWebhook.ts
@@ -38,7 +38,9 @@ export const validateWebhookRequest: HttpRequestPipelineStep = async (
   const queryString = Object.entries(query)
     .map(
       ([key, value]) =>
-        `${encodeURIComponent(key)}=${encodeURIComponent(value?.toString() ?? 'undefined')}`,
+        // The ALB sends these values raw, not URL decoded, so they can be used 'as is'
+        // If we switch to an API Gateway or a function URL (?), we need to encode the key and value with encodeURIComponent
+        `${key}=${value?.toString() ?? 'undefined'}`,
     )
     .join('&');
   const urlForValidation =
diff --git a/lambdas/testPages/modicaToFlex.html b/lambdas/testPages/modicaToFlex.html
@@ -14,7 +14,7 @@
   along with this program.  If not, see https://www.gnu.org/licenses/.
 -->
 <!DOCTYPE html>
-<html>
+<html lang="en-US">
 <head>
   <meta charset="UTF-8">
   <title>Modica to Flex test page</title>
@@ -25,7 +25,7 @@
   </style>
 </head>
 <body>
-<div style="font-family: courier" id="message-history">
+<div style="font-family: courier,serif" id="message-history">
 </div>
 <form name="modica-message-input" onsubmit="sendMessage(event); return false;">
   <select name="destination-drop-down">
@@ -35,12 +35,12 @@
     <option value="+15375688305">AS_STG</option>
     <option value="+12165428033">AS_PROD</option>
   </select>
-  <label for="message-sender-textbox">Sender Number</label> <input type="number" name="message-sender-textbox" value="1111111"/>
+  <label for="message-sender-textbox">Sender Number</label> <input type="text" id="message-sender-textbox" name="message-sender-textbox" value="1111111"/>
   <br/>
   <textarea name="message-input-box"></textarea>
   <input type="submit" name="message-input-send" />
 </form>
-<pre style="font-family: courier" id="message-response">
+<pre style="font-family: courier,serif" id="message-response">
 </pre>
 
 <script>
@@ -63,7 +63,7 @@
         const response = await fetch(WEBHOOK_URL, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ destination, source, content, useTestApi: true, testSessionId: 'JSFIDDLE' }),
+          body: JSON.stringify({ destination, source, content, useTestApi: true, testSessionId: 'TESTPAGE' }),
         });
         messageHistoryElement.append(messageElement);
         messageResponseElement.innerText = `status: ${response.status} [${response.statusText}]
