Bug 2053447: Part 5 - Update for enterprise policies.r=mkaply

Update to support the DisableLaunchOnLogin enterprise policy

Differential Revision: https://phabricator.services.mozilla.com/D316049

Author: iain-mozilla

browser/components/enterprisepolicies/Policies.sys.mjs

@@ -29,7 +29,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   SearchService: "moz-src:///toolkit/components/search/SearchService.sys.mjs",
   QuickSuggest: "moz-src:///browser/components/urlbar/QuickSuggest.sys.mjs",
   WebsiteFilter: "resource:///modules/policies/WebsiteFilter.sys.mjs",
-  WindowsLaunchOnLogin: "resource://gre/modules/WindowsLaunchOnLogin.sys.mjs",
+  LaunchOnLogin: "resource://gre/modules/LaunchOnLogin.sys.mjs",
 
   PoliciesUtils: "resource://gre/modules/PoliciesHelpers.sys.mjs",
   addAllowDenyPermissions: "resource://gre/modules/PoliciesHelpers.sys.mjs",
@@ -1221,15 +1221,15 @@ export var Policies = {
 
   DisableLaunchOnLogin: {
     onBeforeAddons(manager, param) {
-      if (!param || AppConstants.platform !== "win") {
+      if (!param) {
         return;
       }
       manager.disallowFeature("launchOnLogin");
       lazy.PoliciesUtils.setAndLockPref(
         "browser.startup.windowsLaunchOnLogin.enabled",
         false
       );
-      lazy.WindowsLaunchOnLogin.removeLaunchOnLogin();
+      lazy.LaunchOnLogin.disable();
     },
   },
 

browser/components/enterprisepolicies/tests/browser/browser_policy_disable_launch_on_login.js

@@ -4,7 +4,9 @@
 "use strict";
 
 ChromeUtils.defineESModuleGetters(this, {
-  WindowsLaunchOnLogin: "resource://gre/modules/WindowsLaunchOnLogin.sys.mjs",
+  LaunchOnLogin: "resource://gre/modules/LaunchOnLogin.sys.mjs",
+  WindowsLaunchOnLogin:
+    "resource://gre/modules/launchonlogin/WindowsLaunchOnLogin.sys.mjs",
 });
 
 const { MockRegistry } = ChromeUtils.importESModule(
@@ -47,7 +49,7 @@ async function hasRegistryKey() {
 add_task(async function test_disable_launch_on_login() {
   // Simulate the user having previously enabled launch on login.
   if (!isMSIX) {
-    await WindowsLaunchOnLogin.createLaunchOnLogin();
+    await LaunchOnLogin.enable();
     ok(await hasRegistryKey(), "Registry key exists before the policy applies");
   }
 
@@ -70,10 +72,10 @@ add_task(async function test_disable_launch_on_login() {
       "Waiting for the launch on login registry key to be removed"
     );
 
-    await WindowsLaunchOnLogin.createLaunchOnLogin();
+    await LaunchOnLogin.enable();
     ok(
       !(await hasRegistryKey()),
-      "createLaunchOnLogin is blocked while the policy is active"
+      "LaunchOnLogin.enable is blocked while the policy is active"
     );
   }
 

toolkit/modules/launchonlogin/LaunchOnLogin.sys.mjs

@@ -49,6 +49,10 @@ export var LaunchOnLogin = {
    *          Whether LaunchOnLogin was enabled.
    */
   async enable() {
+    if (Services.policies && !Services.policies.isAllowed("launchOnLogin")) {
+      return Promise.resolve(false);
+    }
+
     return await lazy.gImpl.createLaunchOnLogin();
   },
 
@@ -69,6 +73,10 @@ export var LaunchOnLogin = {
    *          Whether LaunchOnLogin is allowed.
    */
   async isAllowed() {
+    if (Services.policies && !Services.policies.isAllowed("launchOnLogin")) {
+      return Promise.resolve(false);
+    }
+
     return await lazy.gImpl.getLaunchOnLoginApproved();
   },
 
@@ -79,6 +87,10 @@ export var LaunchOnLogin = {
    *          Whether LaunchOnLogin is allowed.
    */
   async isEnabled() {
+    if (Services.policies && !Services.policies.isAllowed("launchOnLogin")) {
+      return Promise.resolve(false);
+    }
+
     return await lazy.gImpl.getLaunchOnLoginEnabled();
   },
 
@@ -102,6 +114,9 @@ export var LaunchOnLogin = {
       );
     }
 
+    if (Services.policies && !Services.policies.isAllowed("launchOnLogin")) {
+      details.isAllowedByPolicy = false;
+    }
     return details;
   },
 };

toolkit/modules/launchonlogin/UnsupportedLaunchOnLogin.sys.mjs

@@ -4,22 +4,26 @@
 
 export var UnsupportedLaunchOnLogin = {
   async createLaunchOnLogin() {
-    return await Promise.reject(new Error("unsupported"));
+    return await Promise.resolve(false);
   },
 
   async removeLaunchOnLogin() {
-    return await Promise.reject(new Error("unsupported"));
+    return await Promise.resolve(true);
   },
 
   async getLaunchOnLoginApproved() {
-    return await Promise.reject(new Error("unsupported"));
+    return await Promise.resolve(false);
   },
 
   async getLaunchOnLoginEnabled() {
-    return await Promise.reject(new Error("unsupported"));
+    return await Promise.resolve(false);
   },
 
   async getLaunchOnLoginEnablementDetails() {
-    return await Promise.reject(new Error("unsupported"));
+    return await Promise.resolve({
+      isEnabled: false,
+      isSupported: false,
+      isAllowedByPolicy: false,
+    });
   },
 };

toolkit/modules/launchonlogin/WindowsLaunchOnLogin.sys.mjs

@@ -76,9 +76,6 @@ export var WindowsLaunchOnLogin = {
    * restrictions on writing to the registry in MSIX.
    */
   async createLaunchOnLogin() {
-    if (Services.policies && !Services.policies.isAllowed("launchOnLogin")) {
-      return;
-    }
     if (Services.sysinfo.getProperty("hasWinPackageId")) {
       await this.enableLaunchOnLoginMSIX();
     } else {