From b4aea0516935afa6bec9c3fee4a911ffca0841dc Mon Sep 17 00:00:00 2001
From: Andreas Coroiu <acoroiu@bitwarden.com>
Date: Thu, 14 Nov 2024 11:42:10 +0100
Subject: [PATCH] revert: recent changes to build-desktop.yml and entitlements
 (#11991)

* Revert workflow changes in "[PM-9022] scaffold the extension and build pipeline (#9948)"

This reverts commit 62112b99a9e59bd5b7de81e2987bb1568430f38d.

* fix: comment out autofill entitlement
---
 .github/workflows/build-desktop.yml           | 20 +++++--------------
 apps/desktop/resources/entitlements.mac.plist |  2 ++
 .../resources/entitlements.mas.inherit.plist  |  2 ++
 apps/desktop/resources/entitlements.mas.plist |  2 ++
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index 15ef7946101..d21f4ac65bc 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -1177,21 +1177,6 @@ jobs:
             --file $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
             --output none
 
-          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-            --name bitwarden_desktop_autofill_app_store_2024.provisionprofile \
-            --file $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \
-            --output none
-
-      - name: Set up provisioning profiles
-        run: |
-          AUTOFILL_PROFILE_PATH=$HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile
-          PROFILES_DIR_PATH=$HOME/Library/MobileDevice/Provisioning\ Profiles
-
-          mkdir -p "$PROFILES_DIR_PATH"
-
-          AUTOFILL_UUID=$(grep UUID -A1 -a $AUTOFILL_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}")
-          cp $AUTOFILL_PROFILE_PATH "$PROFILES_DIR_PATH/$AUTOFILL_UUID.provisionprofile"
-
       - name: Get certificates
         run: |
           mkdir -p $HOME/certificates
@@ -1243,6 +1228,11 @@ jobs:
 
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain
 
+      - name: Set up provisioning profiles
+        run: |
+          cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
+            $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile
+
       - name: Increment version
         shell: pwsh
         env:
diff --git a/apps/desktop/resources/entitlements.mac.plist b/apps/desktop/resources/entitlements.mac.plist
index 915232b83f6..34c561bd03f 100644
--- a/apps/desktop/resources/entitlements.mac.plist
+++ b/apps/desktop/resources/entitlements.mac.plist
@@ -8,7 +8,9 @@
 	<true/>
 	<key>com.apple.security.cs.disable-library-validation</key>
 	<true/>
+	<!--
 	<key>com.apple.developer.authentication-services.autofill-credential-provider</key>
 	<true/>
+	-->
 </dict>
 </plist>
diff --git a/apps/desktop/resources/entitlements.mas.inherit.plist b/apps/desktop/resources/entitlements.mas.inherit.plist
index 3634c84f81a..7e1674a8f16 100644
--- a/apps/desktop/resources/entitlements.mas.inherit.plist
+++ b/apps/desktop/resources/entitlements.mas.inherit.plist
@@ -10,7 +10,9 @@
 	<true/>
 	<key>com.apple.security.cs.disable-library-validation</key>
 	<true/>
+	<!--
 	<key>com.apple.developer.authentication-services.autofill-credential-provider</key>
 	<true/>
+	-->
 </dict>
 </plist>
diff --git a/apps/desktop/resources/entitlements.mas.plist b/apps/desktop/resources/entitlements.mas.plist
index 9ab2d3824a8..07cbd0efbab 100644
--- a/apps/desktop/resources/entitlements.mas.plist
+++ b/apps/desktop/resources/entitlements.mas.plist
@@ -16,8 +16,10 @@
 	<true/>
 	<key>com.apple.security.files.user-selected.read-write</key>
 	<true/>
+	<!--
 	<key>com.apple.developer.authentication-services.autofill-credential-provider</key>
 	<true/>
+	-->
 	<key>com.apple.security.temporary-exception.files.home-relative-path.read-write</key>
 	<array>
 		<string>/Library/Application Support/Mozilla/NativeMessagingHosts/</string>