Fix condition for inject file

vvmgev · Sep 6, 2023 · 6ddf303 · 6ddf303
1 parent 6d1d7a1
commit 6ddf303
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/serviceWorker/serviceWorker.ts b/src/serviceWorker/serviceWorker.ts
@@ -117,7 +117,7 @@ class ServiceWorker extends BaseService {
     const isUrlExluded: boolean = EXCLUDED_URLS.some(url => tab.url?.startsWith(url));
     const filters = [{key: 'pageType', value: PageType.MODIFY_REQUEST_BODY}, {key: 'enabled', value: true}];
     const rules: IRuleMetaData[] = await StorageService.getFilteredRules(filters);
-    if (!BSService.isSupportScripting() && isUrlExluded && rules.length) return;
+    if (!BSService.isSupportScripting() || isUrlExluded || !rules.length) return;
     InjectCodeService.injectContentScript(tabId, rules);
   };
 

diff --git a/src/services/InjectCodeService.ts b/src/services/InjectCodeService.ts
@@ -168,7 +168,7 @@ class InjectCodeService extends BaseService {
       target : {tabId},
       // this code runs in the browser tab
       func: (rules: IRuleMetaData[], NAMESPACE: string, runtimeId: string) => {
-        window[NAMESPACE].rules = rules.filter(rule => rule.enabled);
+        window[NAMESPACE].rules = rules;
         window[NAMESPACE].runtimeId = runtimeId;
         window[NAMESPACE].start();
       },