chore: appply PR suggestions

twilio · Jan 20, 2025 · cb82ff9 · cb82ff9
1 parent 4c908e6
commit cb82ff9
Showing 1 changed file with 38 additions and 25 deletions.
diff --git a/src/webhooks/webhooks.ts b/src/webhooks/webhooks.ts
@@ -200,31 +200,44 @@ export function validateRequest(
    *  and with and without the legacy querystring (special chars are encoded when using `new URL()`)
    *  since signature generation on the back end is inconsistent
    */
-  return (
-    validateSignatureWithUrl(
-      authToken,
-      twilioHeader,
-      removePort(urlObject),
-      params
-    ) ||
-    validateSignatureWithUrl(
-      authToken,
-      twilioHeader,
-      addPort(urlObject),
-      params
-    ) ||
-    validateSignatureWithUrl(
-      authToken,
-      twilioHeader,
-      withLegacyQuerystring(removePort(urlObject)),
-      params
-    ) ||
-    validateSignatureWithUrl(
-      authToken,
-      twilioHeader,
-      withLegacyQuerystring(addPort(urlObject)),
-      params
-    )
+  const signatureWithoutPort = validateSignatureWithUrl(
+    authToken,
+    twilioHeader,
+    removePort(urlObject),
+    params
+  );
+
+  if (signatureWithoutPort) {
+    return true;
+  }
+
+  const signatureWithPort = validateSignatureWithUrl(
+    authToken,
+    twilioHeader,
+    addPort(urlObject),
+    params
+  );
+
+  if (signatureWithPort) {
+    return true;
+  }
+
+  const signatureWithLegacyQuerystring = validateSignatureWithUrl(
+    authToken,
+    twilioHeader,
+    withLegacyQuerystring(removePort(urlObject)),
+    params
+  );
+
+  if (signatureWithLegacyQuerystring) {
+    return true;
+  }
+
+  return validateSignatureWithUrl(
+    authToken,
+    twilioHeader,
+    withLegacyQuerystring(addPort(urlObject)),
+    params
   );
 }