Merge pull request #744 from techmatters/CHI-3069-set_delegate_url_ev…

…erywhere CHI-3069: Use flex configuration for twilio lambda URL - small change, merging without review
techmatters · Jan 17, 2025 · 4d1e48d · 4d1e48d
2 parents c08a32d + b67544e
commit 4d1e48d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/actions/custom-actions/aselo_development_custom/action.yml b/.github/actions/custom-actions/aselo_development_custom/action.yml
@@ -230,9 +230,4 @@ runs:
 
     - name: Add MODICA_TEST_SEND_MESSAGE_URL
       run: echo "MODICA_TEST_SEND_MESSAGE_URL=${{ env.MODICA_TEST_SEND_MESSAGE_URL }}" >> .env
-      shell: bash
-
-
-    - name: Add DELEGATE_WEBHOOK_URL
-      run: echo "DELEGATE_WEBHOOK_URL=https://hrm-development.tl.techmatters.org/lambda/twilio/account-scoped" >> .env
       shell: bash
diff --git a/functions/webhooks/taskrouterCallback.protected.ts b/functions/webhooks/taskrouterCallback.protected.ts
@@ -56,8 +56,13 @@ const runTaskrouterListeners = async (
 ) => {
   const listeners = getListeners();
   let delegatePromise: Promise<any> = Promise.resolve();
-  if (context.DELEGATE_WEBHOOK_URL) {
-    const delegateUrl = `${context.DELEGATE_WEBHOOK_URL}/${context.ACCOUNT_SID}${context.PATH}`;
+  const serviceConfig = await context.getTwilioClient().flexApi.configuration.get().fetch();
+  const {
+    feature_flags: { enable_task_router_event_delegation: enableTaskRouterEventDelegation },
+    hrm_base_url: hrmBaseUrl,
+  } = serviceConfig.attributes;
+  if (enableTaskRouterEventDelegation) {
+    const delegateUrl = `${hrmBaseUrl}/lambda/twilio/account-scoped/${context.ACCOUNT_SID}${context.PATH}`;
     const forwardedHeaderEntries = Object.entries(request.headers).filter(
       ([key]) => key.toLowerCase().startsWith('x-') || key.toLowerCase().startsWith('t-'),
     );