Quit nudge when MDM profile is updated

macadmins · Aug 8, 2024 · f13a697 · f13a697
1 parent e19f199
commit f13a697
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Nudge/UI/Defaults.swift b/Nudge/UI/Defaults.swift
@@ -23,7 +23,7 @@ struct Globals {
     static let snc = NSWorkspace.shared.notificationCenter
     // Preferences
     static let configJSON = ConfigurationManager().getConfigurationAsJSON()
-    static var configProfile = ConfigurationManager().getConfigurationAsProfile()
+    static let configProfile = ConfigurationManager().getConfigurationAsProfile()
     static let nudgeDefaults = UserDefaults.standard
     static let nudgeJSONPreferences = NetworkFileManager().getNudgeJSONPreferences()
     // Device Properties

diff --git a/Nudge/UI/Main.swift b/Nudge/UI/Main.swift
@@ -739,8 +739,14 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         Globals.nc.addObserver(
             forName: UserDefaults.didChangeNotification,
             object: nil,
-            queue: .main) { [weak self] _ in
-                Globals.configProfile = ConfigurationManager().getConfigurationAsProfile()
+            queue: .main) { _ in
+                if ConfigurationManager().getConfigurationAsProfile() == Globals.configProfile {
+                    LogManager.debug("MDM Profile has been re-installed or updated but configuration is identical, no need to quit Nudge.", logger: sofaLog)
+                } else {
+                    LogManager.info("MDM Profile has been re-installed or updated. Quitting Nudge to allow LaunchAgent to re-initalize with new settings.", logger: sofaLog)
+                    nudgePrimaryState.shouldExit = true
+                    exit(2)
+                }
             }
     }
 

diff --git a/Nudge/Utilities/Utils.swift b/Nudge/Utilities/Utils.swift
@@ -1310,7 +1310,7 @@ struct SMAppManager {
             print(message)
             if let code = exitCode { exit(Int32(code)) }
         } else {
-            LogManager.info("\(message)", logger: uiLog)
+            LogManager.notice("\(message)", logger: uiLog)
         }
     }