add actionButtonPath to OSVersionRequirement (#321)

macadmins · Feb 22, 2022 · bf04912 · bf04912
1 parent e7c5f55
commit bf04912
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/Example Assets/com.github.macadmins.Nudge.json b/Example Assets/com.github.macadmins.Nudge.json
@@ -29,6 +29,7 @@
           "aboutUpdateURL": "https://support.apple.com/de-de/HT211896"
         }
       ],
+      "actionButtonPath": "munki://updates",
       "majorUpgradeAppPath": "/Applications/Install macOS Big Sur.app",
       "requiredInstallationDate": "2021-08-28T00:00:00Z",
       "requiredMinimumOSVersion": "11.5.2",

diff --git a/Example Assets/com.github.macadmins.Nudge.mobileconfig b/Example Assets/com.github.macadmins.Nudge.mobileconfig
@@ -66,6 +66,8 @@
                 <string>https://support.apple.com/de-de/HT211896</string>
               </dict>
             </array>
+            <key>actionButtonPath</key>
+            <string>munki://updates</string>
             <key>majorUpgradeAppPath</key>
             <string>/Applications/Install macOS Big Sur.app</string>
             <key>requiredInstallationDate</key>

diff --git a/Nudge/Preferences/DefaultPreferencesNudge.swift b/Nudge/Preferences/DefaultPreferencesNudge.swift
@@ -11,6 +11,9 @@ import Foundation
 let currentOSVersion = OSVersion(ProcessInfo().operatingSystemVersion).description
 var fetchMajorUpgradeSuccessful = false
 
+// Features can be placed in multiple primary keys
+let actionButtonPath = osVersionRequirementsProfile?.actionButtonPath ?? osVersionRequirementsJSON?.actionButtonPath ?? userInterfaceProfile?["actionButtonPath"] as? String ?? userInterfaceJSON?.actionButtonPath ?? nil
+
 // optionalFeatures
 let optionalFeaturesProfile = getOptionalFeaturesProfile()
 let optionalFeaturesJSON = getOptionalFeaturesJSON()
@@ -54,7 +57,6 @@ let userInterfaceProfile = getUserInterfaceProfile()
 let userInterfaceJSON = getUserInterfaceJSON()
 let userInterfaceUpdateElementsProfile = getUserInterfaceUpdateElementsProfile()
 let userInterfaceUpdateElementsJSON = getUserInterfaceUpdateElementsJSON()
-let actionButtonPath = userInterfaceProfile?["actionButtonPath"] as? String ?? userInterfaceJSON?.actionButtonPath ?? nil
 let fallbackLanguage = userInterfaceProfile?["fallbackLanguage"] as? String ?? userInterfaceJSON?.fallbackLanguage ?? "en"
 let forceFallbackLanguage = userInterfaceProfile?["forceFallbackLanguage"] as? Bool ?? userInterfaceJSON?.forceFallbackLanguage ?? false
 let iconDarkPath = userInterfaceProfile?["iconDarkPath"] as? String ?? userInterfaceJSON?.iconDarkPath ?? ""

diff --git a/Nudge/Preferences/PreferencesStructure.swift b/Nudge/Preferences/PreferencesStructure.swift
@@ -115,6 +115,7 @@ extension OptionalFeatures {
 struct OSVersionRequirement: Codable {
     var aboutUpdateURL: String?
     var aboutUpdateURLs: [AboutUpdateURL]?
+    var actionButtonPath: String?
     var majorUpgradeAppPath: String?
     var requiredInstallationDate: Date?
     var requiredMinimumOSVersion: String?
@@ -144,6 +145,7 @@ extension OSVersionRequirement {
         }
         self.aboutUpdateURL = fromDictionary["aboutUpdateURL"] as? String
         self.aboutUpdateURLs = generatedAboutUpdateURLs
+        self.actionButtonPath = fromDictionary["actionButtonPath"] as? String
         self.majorUpgradeAppPath = fromDictionary["majorUpgradeAppPath"] as? String
         self.requiredMinimumOSVersion = fromDictionary["requiredMinimumOSVersion"] as? String
         self.targetedOSVersionsRule = fromDictionary["targetedOSVersionsRule"] as? String
@@ -167,6 +169,7 @@ extension OSVersionRequirement {
     func with(
         aboutUpdateURL: String?? = nil,
         aboutUpdateURLs: [AboutUpdateURL]?? = nil,
+        actionButtonPath: String?? = nil,
         majorUpgradeAppPath: String?? = nil,
         requiredInstallationDate: Date?? = nil,
         requiredMinimumOSVersion: String?? = nil,
@@ -175,6 +178,7 @@ extension OSVersionRequirement {
         return OSVersionRequirement(
             aboutUpdateURL: aboutUpdateURL ?? self.aboutUpdateURL,
             aboutUpdateURLs: aboutUpdateURLs ?? self.aboutUpdateURLs,
+            actionButtonPath: actionButtonPath ?? self.actionButtonPath,
             majorUpgradeAppPath: majorUpgradeAppPath ?? self.majorUpgradeAppPath,
             requiredInstallationDate: requiredInstallationDate ?? self.requiredInstallationDate,
             requiredMinimumOSVersion: requiredMinimumOSVersion ?? self.requiredMinimumOSVersion,