Support Chrome schema & minor fixes

scripts/build.js

@@ -137,6 +137,12 @@ cpSync(
   resolve(options.outDir, 'rule_resources', 'engine-trackerdb.dat'),
 );
 
+// copy managed storage configuration
+if (manifest.storage?.managed_schema) {
+  const path = resolve(options.srcDir, manifest.storage.managed_schema);
+  cpSync(path, resolve(options.outDir, manifest.storage.managed_schema));
+}
+
 // copy declarative net request lists
 if (manifest.declarative_net_request?.rule_resources) {
   let rulesCount = 0;

src/managed_storage.json

@@ -0,0 +1,25 @@
+{
+  "type": "object",
+  "properties": {
+    "disableOnboarding": {
+      "title": "Disable onboarding process",
+      "description": "Automatically enable the extension without showing the onboarding process",
+      "type": "boolean"
+    },
+
+    "disableUserControl": {
+      "title": "Disable user control",
+      "description": "Prevents access to the settings page and hides UI elements that allow the user to interact with the extension",
+      "type": "boolean"
+    },
+
+    "trustedDomains": {
+      "title": "Trusted domains",
+      "description": "A list of domains that are trusted by default",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    }
+  }
+}

src/manifest.chromium.json

@@ -43,6 +43,9 @@
     "service_worker": "background/index.js",
     "type": "module"
   },
+  "storage": {
+    "managed_schema": "managed_storage.json"
+  },
   "declarative_net_request": {
     "rule_resources": [
       {

src/pages/onboarding/index.js

@@ -13,25 +13,33 @@ import { mount, html, store, router } from 'hybrids';
 
 import '/ui/index.js';
 import Options from '/store/options.js';
+import { GHOSTERY_DOMAIN } from '/utils/urls.js';
 
 import './elements.js';
 
 import Main from './views/main.js';
 import Success from './views/success.js';
 
-store.resolve(Options).then(({ onboarding }) => {
+store.resolve(Options).then(({ onboarding, terms, managed }) => {
+  // As the user can access settings page from browser native UI
+  // we must redirect to the Ghostery website if the user has already
+  // accepted the terms and conditions and the extension is managed
+  if (terms && managed) {
+    return window.location.replace(`https://www.${GHOSTERY_DOMAIN}`);
+  }
+
   store.set(Options, {
     onboarding: {
       shown: onboarding.shown + 1,
     },
   });
-});
 
-mount(document.body, {
-  stack: router([Main, Success]),
-  render: ({ stack }) => html`
-    <template layout="grid height::100%">
-      <onboarding-layout>${stack}</onboarding-layout>
-    </template>
-  `,
+  mount(document.body, {
+    stack: router([Main, Success]),
+    render: ({ stack }) => html`
+      <template layout="grid height::100%">
+        <onboarding-layout>${stack}</onboarding-layout>
+      </template>
+    `,
+  });
 });

src/store/options.js

@@ -220,7 +220,7 @@ async function applyManagedOptions(options) {
       options.onboarding = { shown: 1 };
     }
 
-    if (managed.disableSettings === true) {
+    if (managed.disableUserControl === true) {
       options.managed = true;
       options.sync = false;