From 00f0e2e5eb0762acc176b10288aa86b7ae2df3cd Mon Sep 17 00:00:00 2001
From: Dante Catalfamo <43040593+dantecatalfamo@users.noreply.github.com>
Date: Mon, 18 Nov 2024 10:15:08 -0500
Subject: [PATCH] Update cloudflare warp uninstall script again (#23874)

#22773

Missed calling this shell script mentioned on the cloudflare website
https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/warp/remove-warp/
---
 server/mdm/maintainedapps/apps.json                            | 3 ++-
 .../testdata/scripts/cloudflare-warp_uninstall.golden.sh       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/mdm/maintainedapps/apps.json b/server/mdm/maintainedapps/apps.json
index ce8eaf816e..f832c15858 100644
--- a/server/mdm/maintainedapps/apps.json
+++ b/server/mdm/maintainedapps/apps.json
@@ -30,7 +30,8 @@
 	{
 		"identifier": "cloudflare-warp",
 		"bundle_identifier": "com.cloudflare.1dot1dot1dot1.macos",
-		"installer_format": "pkg"
+		"installer_format": "pkg",
+		"post_uninstall_scripts": ["/Applications/Cloudflare\\ WARP.app/Contents/Resources/uninstall.sh"]
 	},
 	{
 		"identifier": "docker",
diff --git a/server/mdm/maintainedapps/testdata/scripts/cloudflare-warp_uninstall.golden.sh b/server/mdm/maintainedapps/testdata/scripts/cloudflare-warp_uninstall.golden.sh
index 838490f85e..d118bf83e5 100644
--- a/server/mdm/maintainedapps/testdata/scripts/cloudflare-warp_uninstall.golden.sh
+++ b/server/mdm/maintainedapps/testdata/scripts/cloudflare-warp_uninstall.golden.sh
@@ -113,6 +113,7 @@ remove_launchctl_service 'com.cloudflare.1dot1dot1dot1.macos.loginlauncherapp'
 remove_launchctl_service 'com.cloudflare.1dot1dot1dot1.macos.warp.daemon'
 quit_application 'com.cloudflare.1dot1dot1dot1.macos'
 sudo pkgutil --forget 'com.cloudflare.1dot1dot1dot1.macos'
+/Applications/Cloudflare\ WARP.app/Contents/Resources/uninstall.sh
 trash $LOGGED_IN_USER '~/Library/Application Scripts/com.cloudflare.1dot1dot1dot1.macos.loginlauncherapp'
 trash $LOGGED_IN_USER '~/Library/Application Support/com.cloudflare.1dot1dot1dot1.macos'
 trash $LOGGED_IN_USER '~/Library/Caches/com.cloudflare.1dot1dot1dot1.macos'