[SM-330] Disable managed environments for safari (#3953)

bitwarden · Nov 15, 2022 · 7fca2d7 · 7fca2d7
1 parent 635973d
commit 7fca2d7
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/apps/browser/src/services/browser-environment.service.ts b/apps/browser/src/services/browser-environment.service.ts
@@ -20,6 +20,10 @@ export class BrowserEnvironmentService extends EnvironmentService {
   }
 
   async settingsHaveChanged() {
+    if (!(await this.hasManagedEnvironment())) {
+      return false;
+    }
+
     const env = await this.getManagedEnvironment();
 
     return (
@@ -37,6 +41,10 @@ export class BrowserEnvironmentService extends EnvironmentService {
     return devFlagEnabled("managedEnvironment")
       ? new Promise((resolve) => resolve(devFlagValue("managedEnvironment")))
       : new Promise((resolve, reject) => {
+          if (chrome.storage.managed == null) {
+            return resolve(null);
+          }
+
           chrome.storage.managed.get("environment", (result) => {
             if (chrome.runtime.lastError) {
               return reject(chrome.runtime.lastError);