From 86418e445b555879448fb1745151931c8e153d67 Mon Sep 17 00:00:00 2001
From: Michal Checinski <mchecinski@bitwarden.com>
Date: Wed, 18 Sep 2024 15:18:14 +0200
Subject: [PATCH] Use Bitwarden Desktop App Store 2021 to sign desktop and
 autofill extension

---
 .github/workflows/build-desktop.yml    | 20 ++++++++++----------
 apps/desktop/macos/production.xcconfig |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index 40578013c15..76cbb2b7fd6 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -1089,24 +1089,24 @@ jobs:
         run: |
           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 \
-          #   --output none
+          az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
+            --name bitwarden_desktop_appstore.provisionprofile \
+            --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
 
-          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_appstore.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_appstore.provisionprofile \
+          #   --output none
 
       - name: Set up provisioning profiles
         run: |
-          AUTOFILL_PROFILE_PATH=$HOME/secrets/Bitwarden_Desktop_App_Store_2024_w_autofill.provisionprofile
+          AUTOFILL_PROFILE_PATH=$HOME/secrets/bitwarden_desktop_appstore.provisionprofile
           PROFILES_DIR_PATH=$HOME/Library/MobileDevice/Provisioning\ Profiles
 
           mkdir -p "$PROFILES_DIR_PATH"
@@ -1116,7 +1116,7 @@ jobs:
 
       - name: Set up provisioning profiles
         run: |
-          cp $HOME/secrets/Bitwarden_Desktop_App_Store_2024_w_autofill.provisionprofile \
+          cp $HOME/secrets/bitwarden_desktop_appstore.provisionprofile \
             $GITHUB_WORKSPACE/apps/desktop/bitwarden_desktop_appstore.provisionprofile
 
       - name: Get certificates
diff --git a/apps/desktop/macos/production.xcconfig b/apps/desktop/macos/production.xcconfig
index 9411de6dd4d..8ac32132055 100644
--- a/apps/desktop/macos/production.xcconfig
+++ b/apps/desktop/macos/production.xcconfig
@@ -8,4 +8,4 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 CODE_SIGN_IDENTITY[sdk=macosx*] = 3rd Party Mac Developer Application
-PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] = Bitwarden Desktop App Store 2024 w autofill
+PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] = Bitwarden Desktop App Store 2021