From bac18243b15ab8d504a4589e9705fb39892dcd64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20=C3=85berg?= <anders@andersaberg.com>
Date: Thu, 23 Jan 2025 21:36:54 +0100
Subject: [PATCH] Revert "experiment with entitlements and signing the
 framework"

This reverts commit 41e304f431164f243188952e64728aaec6d5231e.
---
 .github/workflows/build-desktop.yml           |  9 ++++++---
 apps/desktop/resources/entitlements.mac.plist | 14 ++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index 041da184389..eb850e37f46 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -1441,9 +1441,12 @@ jobs:
 
       - name: Resign
         run: |
-          # Resign the Electron Framework
-          codesign --force --deep --options=runtime --sign "Developer ID Application: 8bit Solutions LLC (LTZ2PFU5D6)" --timestamp --generate-entitlement-der --preserve-metadata=identifier,flags Bitwarden.app/Contents/Frameworks/Electron\ Framework.framework
-          # Resign the bundle 
+          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 --options runtime --force --sign "Developer ID Application: 8bit Solutions LLC (LTZ2PFU5D6)" dist/mas-dev-universal/Bitwarden.app
 
       - name: Zip masdev asset
diff --git a/apps/desktop/resources/entitlements.mac.plist b/apps/desktop/resources/entitlements.mac.plist
index a4ebe9ac3cd..e273bcc7eca 100644
--- a/apps/desktop/resources/entitlements.mac.plist
+++ b/apps/desktop/resources/entitlements.mac.plist
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
-		<key>com.apple.security.cs.allow-jit</key>
-		<true />
-		<!--
+<dict>
+	<key>com.apple.security.cs.allow-jit</key>
+	<true/>
+	<!--
 	<key>com.apple.developer.authentication-services.autofill-credential-provider</key>
 	<true/>
 	-->
-		<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-		<true />
-	</dict>
-</plist>
\ No newline at end of file
+</dict>
+</plist>