From 156e98ea5d477995df2b3328401031895b1932f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20=C3=85berg?= <anders@andersaberg.com>
Date: Wed, 22 Jan 2025 20:16:54 +0100
Subject: [PATCH] test 1

---
 .github/workflows/build-desktop.yml | 35 ++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index d62ea5cf1b0..e4aaa7aa538 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -1278,8 +1278,13 @@ jobs:
           mkdir -p $HOME/secrets
 
           az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-            --name bitwarden_desktop_appstore.provisionprofile \
-            --file $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
+            --name bitwarden_desktop_autofill_app_store_2024.provisionprofile \
+            --file $HOME/secrets/bitwarden_desktop_autofill_app_store_2024.provisionprofile \
+            --output none
+            
+          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+            --name Bitwarden_Desktop_App_Store_2024_w_autofill.provisionprofile \
+            --file $HOME/secrets/Bitwarden_Desktop_App_Store_2024_w_autofill.provisionprofile \
             --output none
 
       - name: Get certificates
@@ -1335,7 +1340,21 @@ jobs:
 
       - name: Set up provisioning profiles
         run: |
-          cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
+          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"
+          
+          desktop_profile_path="$HOME/secrets/Bitwarden_Desktop_App_Store_2024_w_autofill.provisionprofile"
+          
+          DESKTOP_UUID=$(grep UUID -A1 -a $desktop_profile_path | grep -io "[-A-F0-9]\{36\}")
+          
+          cp $desktop_profile_path "$PROFILES_DIR_PATH/$DESKTOP_UUID.provisionprofile"
+          
+          cp $HOME/secrets/Bitwarden_Desktop_App_Store_2024_w_autofill \
             $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile
 
       - name: Increment version
@@ -1419,6 +1438,16 @@ jobs:
           APP_STORE_CONNECT_AUTH_KEY_PATH: ~/private_keys/AuthKey_6TV9MKN3GP.p8
         run: npm run pack:mac:masdev:with-extension
 
+      - name: Resign
+        run: |
+          codesign -dvvv "./dist/mas-dev-universal/Bitwarden.app" 2>&1 | grep -iE "TeamIdentifier|flags|Format|Identifier|Authority"
+          
+          codesign -dvvv "./dist/mas-dev-universal/Bitwarden.app/Contents/PlugIns/autofill-extension.appex" 2>&1 | grep -iE "TeamIdentifier|flags|Format|Identifier|Authority"
+
+          security find-identity -v -p codesigning          
+          
+          codesign --entitlements resources/entitlements.mas.plist --deep --verbose --force --sign "Developer ID Application: 8bit Solutions LLC (LTZ2PFU5D6)" dist/mas-dev-universal/Bitwarden.app
+
       - name: Zip masdev asset
         run: |
           cd dist/mas-dev-universal