Disable all features globally if we have the config before load (#156)

Author: jonathanKingston

Sources/ContentScopeScripts/dist/contentScope.js

@@ -749,6 +749,10 @@
       return preferences
   }
 
+  function isGloballyDisabled (args) {
+      return args.site.allowlisted || args.site.isBroken
+  }
+
   var contentScopeFeatures = (function (exports) {
   'use strict';
 
@@ -4458,7 +4462,7 @@
 
   function init () {
       const processedConfig = processConfig($CONTENT_SCOPE$, $USER_UNPROTECTED_DOMAINS$, $USER_PREFERENCES$);
-      if (processedConfig.site.allowlisted) {
+      if (isGloballyDisabled(processedConfig)) {
           return
       }
 

build/android/contentScope.js

@@ -1,10 +1,10 @@
 /* global contentScopeFeatures */
 
-import { processConfig } from './../src/utils'
+import { processConfig, isGloballyDisabled } from './../src/utils'
 
 function init () {
     const processedConfig = processConfig($CONTENT_SCOPE$, $USER_UNPROTECTED_DOMAINS$, $USER_PREFERENCES$)
-    if (processedConfig.site.allowlisted) {
+    if (isGloballyDisabled(processedConfig)) {
         return
     }
 

build/windows/contentScope.js

@@ -1,10 +1,10 @@
 /* global contentScopeFeatures */
 
-import { processConfig } from './../src/utils'
+import { processConfig, isGloballyDisabled } from './../src/utils'
 
 function init () {
     const processedConfig = processConfig($CONTENT_SCOPE$, $USER_UNPROTECTED_DOMAINS$, $USER_PREFERENCES$)
-    if (processedConfig.site.allowlisted) {
+    if (isGloballyDisabled(processedConfig)) {
         return
     }
 

inject/android.js

@@ -1,9 +1,12 @@
 /* global contentScopeFeatures */
 
-import { processConfig, windowsSpecificFeatures } from './../src/utils'
+import { processConfig, isGloballyDisabled, windowsSpecificFeatures } from './../src/utils'
 
 function init () {
     const processedConfig = processConfig($CONTENT_SCOPE$, $USER_UNPROTECTED_DOMAINS$, $USER_PREFERENCES$, windowsSpecificFeatures)
+    if (isGloballyDisabled(processedConfig)) {
+        return
+    }
 
     contentScopeFeatures.load()
 

inject/apple.js

@@ -478,6 +478,10 @@ export function processConfig (data, userList, preferences, platformSpecificFeat
     return preferences
 }
 
+export function isGloballyDisabled (args) {
+    return args.site.allowlisted || args.site.isBroken
+}
+
 export const windowsSpecificFeatures = ['windowsPermissionUsage']
 
 export function isWindowsSpecificFeature (featureName) {