move 'match all' logic to matchRequestProps logic

AdguardTeam · Nov 1, 2022 · 545d6b3 · 545d6b3
1 parent 88e0d03
commit 545d6b3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/src/helpers/match-request-props.js b/src/helpers/match-request-props.js
@@ -13,6 +13,10 @@ import {
  * @returns {boolean}
  */
 export const matchRequestProps = (propsToMatch, requestData) => {
+    if (propsToMatch === '' || propsToMatch === '*') {
+        return true;
+    }
+
     let isMatched;
 
     const parsedData = parseMatchProps(propsToMatch);

diff --git a/src/scriptlets/prevent-fetch.js b/src/scriptlets/prevent-fetch.js
@@ -120,9 +120,6 @@ export function preventFetch(source, propsToMatch, responseBody = 'emptyObj', re
             // log if no propsToMatch given
             const logMessage = `log: fetch( ${objectToString(fetchData)} )`;
             hit(source, logMessage);
-        } else if (propsToMatch === '' || propsToMatch === getWildcardSymbol()) {
-            // prevent all fetch calls
-            shouldPrevent = true;
         } else {
             shouldPrevent = matchRequestProps(propsToMatch);
         }

diff --git a/src/scriptlets/prevent-xhr.js b/src/scriptlets/prevent-xhr.js
@@ -110,9 +110,6 @@ export function preventXHR(source, propsToMatch, customResponseText) {
             // Log if no propsToMatch given
             const logMessage = `log: xhr( ${objectToString(xhrData)} )`;
             hit(source, logMessage);
-        } else if (propsToMatch === '' || propsToMatch === getWildcardSymbol()) {
-            // Prevent all fetch calls
-            shouldPrevent = true;
         } else {
             shouldPrevent = matchRequestProps(propsToMatch);
         }

diff --git a/src/scriptlets/trusted-replace-fetch-response.js b/src/scriptlets/trusted-replace-fetch-response.js
@@ -105,9 +105,6 @@ export function trustedReplaceFetchResponse(source, pattern = '', replacement =
             const logMessage = `log: fetch( ${objectToString(fetchData)} )`;
             log(source, logMessage);
             hit(source);
-        } else if (propsToMatch === '' || propsToMatch === getWildcardSymbol()) {
-            // match all fetch calls
-            shouldReplace = true;
         } else {
             shouldReplace = matchRequestProps(propsToMatch, fetchData);
         }