Merge pull request #66 from macadmins/MDview

v2.2.0

Author: almenscorner

CHANGELOG.md

@@ -4,6 +4,107 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.0] - 2025-01-07
+### Changed
+- A slight background has been added increasing visaibility of the text.
+- Main window is now slightly resizeable to allow for window to be resized to a smaller size.
+- Last reboot time is now monitored and updated every 5 minutes. Displaying in minutes, hours or days depending on the time since last reboot.
+- Battery temperature will adapt to the configured measurement system in macOS and show temp in either Celsius or Fahrenheit.
+- Storage API has been changed for a more accurate reading of actual storage used.
+- "Is Admin" will now display "yes" or "no" localized instead of enabled or disabled.
+- In addition to only checking if Company Portal exists when dynamically setting the `Mode` to use, the server url will now also be checked. If the server url contains "i.manage.microsoft.com", the MDM will be set to Intune. This is because Company Portal can validly exist on a device without the device being managed by Intune.
+- Button labels on actions can now be set to a custom value. This allows for admins to set custom labels for actions that are displayed in the `Self Service` page. Example configuration:
+```xml
+<dict>
+    <key>Command</key>
+    <string>open https://github.com/macadmins/supportcompanion</string>
+    <key>Description</key>
+    <string/>
+    <key>Icon</key>
+    <string>heart.fill</string>
+    <key>Name</key>
+    <string>Open Intranet</string>
+    <key>ButtonLabel</key>
+    <string>Open</string>
+</dict>
+```
+
+### Fixed
+- Artifacts were being left behind on the desktop window when IP address was updated.
+
+### Added
+- The configured logo will now be displayed in the tray menu as well. Can be hidden by setting `ShowLogoInTrayMenu` to `false` in the configuration.
+- A new option to show the desktop information window "frosted". This allows for a frosted glass effect on the desktop information window. Example configuration:
+```xml
+<key>DesktopInfoBackgroundFrosted</key>
+<true/>
+```
+- A new option to show a custom view in the navigation bar based on a Markdown file. This allows for creating a custom view with custom information relevant to your organization. Example configuration:
+```xml
+<key>MarkdownFilePath</key>
+<string>/path/to/custom/view.md</string>
+<key>MarkdownMenuLabel</key>
+<string>Custom View</string>
+<key>MarkdownMenuIcon</key>
+<string>doc.text</string>
+```
+- A new option to show custom cards in the navigation bar. This allows for displaying large numbers of cards without cluttering the home view, by moving them to their own view. Example configuration:
+```xml
+<key>CustomCardsMenuLabel</key>
+<string>Custom Cards</string>
+<key>CustomCardsMenuIcon</key>
+<string>doc.text</string>
+<key>CustomCardPath</key>
+<string>/path/to/custom/cards.json</string>
+```
+- A new option to trigger actions using the CLI. This allows for triggering actions using the CLI instead of the UI. This can be useful for automating actions or triggering actions from a script. By default, actions configured as privileged will require authentication. This can be disabled by setting `RequirePrivilegedActionAuthentication` to `false`. Example usage:
+```bash
+/Applications/SupportCompanion.app/Contents/Resources/SupportCompanionCLI action "Restart clipboard"
+```
+- Additional arguments to the CLI to allow for getting additional information that is displayed in the app. Example usage:
+```bash
+/Applications/SupportCompanion.app/Contents/Resources/SupportCompanionCLI battery
+```
+Example output:
+```plaintext
+🔋 Battery Information
+-----------------------
+Health:          93% 🔋
+Cycle Count:     37
+Temperature:     36.7°C 🌡️
+Charging Status: Not Charging
+Time Remaining:  N/A
+```
+- A new feature that allows for user elevation of standard users to admin users. This feature is useful for instances where a user needs to perform an action that requires admin rights. The user can request elevation by clicking the `Elevate` button in the tray menu or Identity menu. The admin can configure wether a reason is required, how long the reason must be and if the reason should be sent via a webhook to a specified URL or saved to disk. Example configuration:
+```xml
+<key>EnableElevation</key>
+<true/>
+<key>RequireResonForElevation</key>
+<true/>
+<key>ReasonMinLength</key>
+<integer>20</integer>
+<key>MaxElevationTime</key>
+<integer>60</integer>
+<key>ElevationWebhookUrl</key>
+<string>https://webhook.url</string>
+<key>ShowElevateTrayCard</key>
+<true/>
+<key>ElevationSeverity</key>
+<integer>6</integer>
+```
+
+Example of JSON payload sent to webhook:
+```json
+{
+  "severity" : 6,
+  "date" : "2024-12-16T11:21:01Z",
+  "host" : "Tobias's MacBook",
+  "user" : "tobias",
+  "serial" : "H123456789",
+  "reason" : "Awesome dev stuff"
+}
+```
+
 ## [2.1.0] - 2024-12-11
 ### Changed
 - The tray menu has been changed to a custom menu that is an extension of the apps main UI. This allows for a more consistent look and feel between the tray menu and the main app. The tray menu now displays the same information as the main app, including device information, storage information and patching progress as well as actions. If you have custom actions configured using `Actions`, the first 6 actions will be displayed in the tray menu. If you have more than 6 actions, the rest can be run from the Self Service section in the main app.

SupportCompanion.xcodeproj/project.pbxproj

@@ -10,6 +10,10 @@
 		F60FAB742CE8D40A00ECAC53 /* AlertToast in Frameworks */ = {isa = PBXBuildFile; productRef = F60FAB732CE8D40A00ECAC53 /* AlertToast */; };
 		F60FAB872CEA108A00ECAC53 /* SidebarConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = F60FAB862CEA108A00ECAC53 /* SidebarConfig.swift */; };
 		F64927372CF9EA8D00C34D90 /* com.github.macadmins.SupportCompanion.helper in CopyFiles */ = {isa = PBXBuildFile; fileRef = F6F8AE7D2CE345A8009B0A1F /* com.github.macadmins.SupportCompanion.helper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		F6575A992D117108007DBC83 /* ExecutionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6F8AE9C2CE34E54009B0A1F /* ExecutionService.swift */; };
+		F6575A9A2D117114007DBC83 /* HelperRemoteProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6F8AE9E2CE34E72009B0A1F /* HelperRemoteProvider.swift */; };
+		F6575A9D2D117141007DBC83 /* SupportCompanionErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6F8AE952CE34B81009B0A1F /* SupportCompanionErrors.swift */; };
+		F6575AA72D11827D007DBC83 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = F6575AA62D11827D007DBC83 /* MarkdownUI */; };
 		F6890EEB2CFF326D00244985 /* SupportCompanionCLI in CopyFiles */ = {isa = PBXBuildFile; fileRef = F6890EE22CFF308F00244985 /* SupportCompanionCLI */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		F6890EEC2CFF330D00244985 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6E4D1D42CE4CE1E003EB8C0 /* Preferences.swift */; };
 		F6890EED2CFF331400244985 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6A4E0F62CEC9DFC002B4D74 /* Constants.swift */; };
@@ -92,6 +96,13 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
+		F6298A4D2D14517E00D2EC6D /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
+			membershipExceptions = (
+				InfoValue.swift,
+			);
+			target = F6890EE12CFF308F00244985 /* SupportCompanionCLI */;
+		};
 		F64927362CF9D3FE00C34D90 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
@@ -118,17 +129,37 @@
 			);
 			target = F6F8AE7C2CE345A8009B0A1F /* com.github.macadmins.SupportCompanion.helper */;
 		};
+		F6575A9C2D117133007DBC83 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
+			membershipExceptions = (
+				HelperConstans.swift,
+				HelperProtocol.swift,
+				"OSStatus+Extensions.swift",
+				RemoteApplicationProtocol.swift,
+			);
+			target = F6890EE12CFF308F00244985 /* SupportCompanionCLI */;
+		};
 		F6890EEF2CFF332200244985 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				Action.swift,
+				KerberosSSO.swift,
+				PlatformSSO.swift,
+				UserInfo.swift,
 			);
 			target = F6890EE12CFF308F00244985 /* SupportCompanionCLI */;
 		};
 		F6890EF12CFF333C00244985 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
+				BatteryHelpers.swift,
+				DeviceInfoHelpers.swift,
+				IOKit.swift,
 				Logger.swift,
+				MDMHelpers.swift,
+				SSOInfoHelpers.swift,
+				StorageHelpers.swift,
+				UserHelpers.swift,
 			);
 			target = F6890EE12CFF308F00244985 /* SupportCompanionCLI */;
 		};
@@ -164,12 +195,14 @@
 				BatteryInfoManager.swift,
 				CardGridViewModel.swift,
 				DeviceInfoManager.swift,
+				ElevationManager.swift,
 				EvergreenInfoManager.swift,
 				IdentityViewModel.swift,
 				JsonCardManager.swift,
 				MDMInfoManager.swift,
 				PendingIntuneUpdatesManager.swift,
 				PendingMunkiUpdatesManager.swift,
+				ReasonInputManager.swift,
 				SSOInfoManager.swift,
 				StorageInfoManager.swift,
 				SystemUpdatesManager.swift,
@@ -202,11 +235,11 @@
 		F6E4D2032CE5DF67003EB8C0 /* Extensions */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Extensions; sourceTree = "<group>"; };
 		F6E4D2662CE64E62003EB8C0 /* Controllers */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Controllers; sourceTree = "<group>"; };
 		F6E4D26B2CE6576B003EB8C0 /* Helpers */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F6A4E0E32CEBD770002B4D74 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, F6890EF12CFF333C00244985 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Helpers; sourceTree = "<group>"; };
-		F6E4D2812CE78164003EB8C0 /* Utilities */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Utilities; sourceTree = "<group>"; };
+		F6E4D2812CE78164003EB8C0 /* Utilities */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F6298A4D2D14517E00D2EC6D /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Utilities; sourceTree = "<group>"; };
 		F6E4D2842CE781B9003EB8C0 /* Components */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Components; sourceTree = "<group>"; };
 		F6E72E642CE3DEC300D78336 /* Models */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F6890EEF2CFF332200244985 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Models; sourceTree = "<group>"; };
 		F6EB39E72CE1EE2800517FCD /* ViewModels */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F6A4E0E52CEBD7D8002B4D74 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = ViewModels; sourceTree = "<group>"; };
-		F6F8AE7E2CE345A8009B0A1F /* Helper */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F6A4E0E82CEBD7F8002B4D74 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, F649281C2CFA02C000C34D90 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Helper; sourceTree = "<group>"; };
+		F6F8AE7E2CE345A8009B0A1F /* Helper */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (F6A4E0E82CEBD7F8002B4D74 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, F649281C2CFA02C000C34D90 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, F6575A9C2D117133007DBC83 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Helper; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -222,6 +255,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				F60FAB742CE8D40A00ECAC53 /* AlertToast in Frameworks */,
+				F6575AA72D11827D007DBC83 /* MarkdownUI in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -430,6 +464,7 @@
 			mainGroup = F6F3BEB02CE1E7BA0036ADB9;
 			packageReferences = (
 				F60FAB722CE8D40A00ECAC53 /* XCRemoteSwiftPackageReference "AlertToast" */,
+				F6575AA12D117F91007DBC83 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */,
 			);
 			productRefGroup = F6F3BEBA2CE1E7BA0036ADB9 /* Products */;
 			projectDirPath = "";
@@ -467,6 +502,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				F6890EEC2CFF330D00244985 /* Preferences.swift in Sources */,
+				F6575A9D2D117141007DBC83 /* SupportCompanionErrors.swift in Sources */,
+				F6575A992D117108007DBC83 /* ExecutionService.swift in Sources */,
+				F6575A9A2D117114007DBC83 /* HelperRemoteProvider.swift in Sources */,
 				F6890EED2CFF331400244985 /* Constants.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -506,7 +544,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = H92SB6Z7S4;
-				MACOSX_DEPLOYMENT_TARGET = 15.1;
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.macadmins.SupportCompanion.CLI;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -521,7 +559,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=macosx*]" = H92SB6Z7S4;
-				MACOSX_DEPLOYMENT_TARGET = 15.1;
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.macadmins.SupportCompanion.CLI;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -837,6 +875,14 @@
 				kind = branch;
 			};
 		};
+		F6575AA12D117F91007DBC83 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/gonzalezreal/swift-markdown-ui";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 2.4.1;
+			};
+		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -845,6 +891,11 @@
 			package = F60FAB722CE8D40A00ECAC53 /* XCRemoteSwiftPackageReference "AlertToast" */;
 			productName = AlertToast;
 		};
+		F6575AA62D11827D007DBC83 /* MarkdownUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = F6575AA12D117F91007DBC83 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */;
+			productName = MarkdownUI;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = F6F3BEB12CE1E7BA0036ADB9 /* Project object */;