From dac7f8e1b3293dbcee01b6bd1ab72a464edb737d Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Fri, 20 Jan 2023 15:02:08 +0200
Subject: [PATCH] Add Bundle ID in entitlements files through app config script

---
 .gitignore                                                  | 4 +++-
 ...ugProfile.entitlements => DebugProfileBase.entitlements} | 2 +-
 .../{Release.entitlements => ReleaseBase.entitlements}      | 2 +-
 scripts/macos/app_config.sh                                 | 6 ++++++
 4 files changed, 11 insertions(+), 3 deletions(-)
 rename macos/Runner/{DebugProfile.entitlements => DebugProfileBase.entitlements} (88%)
 rename macos/Runner/{Release.entitlements => ReleaseBase.entitlements} (85%)

diff --git a/.gitignore b/.gitignore
index a21f2e052..9fb7fd204 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,4 +137,6 @@ assets/images/app_logo.png
 /android/app/src/main/AndroidManifest.xml
 
 
-macos/Runner/Info.plist
\ No newline at end of file
+macos/Runner/Info.plist
+macos/Runner/DebugProfile.entitlements
+macos/Runner/Release.entitlements
\ No newline at end of file
diff --git a/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfileBase.entitlements
similarity index 88%
rename from macos/Runner/DebugProfile.entitlements
rename to macos/Runner/DebugProfileBase.entitlements
index d160d6159..c1b4345fe 100644
--- a/macos/Runner/DebugProfile.entitlements
+++ b/macos/Runner/DebugProfileBase.entitlements
@@ -10,7 +10,7 @@
 	<true/>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.cakewallet.macos</string>
+		<string>$(AppIdentifierPrefix)${BUNDLE_ID}</string>
 	</array>
 	<key>com.apple.security.network.client</key>
     <true/>
diff --git a/macos/Runner/Release.entitlements b/macos/Runner/ReleaseBase.entitlements
similarity index 85%
rename from macos/Runner/Release.entitlements
rename to macos/Runner/ReleaseBase.entitlements
index b8b66be7d..aef6ac342 100644
--- a/macos/Runner/Release.entitlements
+++ b/macos/Runner/ReleaseBase.entitlements
@@ -6,7 +6,7 @@
 	<true/>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.cakewallet.macos</string>
+		<string>$(AppIdentifierPrefix)${BUNDLE_ID}</string>
 	</array>
 	<key>com.apple.security.network.client</key>
     <true/>
diff --git a/scripts/macos/app_config.sh b/scripts/macos/app_config.sh
index 4798b7ac9..231945659 100755
--- a/scripts/macos/app_config.sh
+++ b/scripts/macos/app_config.sh
@@ -13,6 +13,12 @@ cp -rf ./macos/Runner/InfoBase.plist ./macos/Runner/Info.plist
 /usr/libexec/PlistBuddy -c "Set :CFBundleIdentifier ${APP_MACOS_BUNDLE_ID}" ./macos/Runner/Info.plist
 /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString ${APP_MACOS_VERSION}" ./macos/Runner/Info.plist
 /usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${APP_MACOS_BUILD_NUMBER}" ./macos/Runner/Info.plist
+
+# Fill entitlements Bundle ID
+cp -rf ./macos/Runner/DebugProfileBase.entitlements ./macos/Runner/DebugProfile.entitlements
+cp -rf ./macos/Runner/ReleaseBase.entitlements ./macos/Runner/Release.entitlements
+sed -i '' "s/\${BUNDLE_ID}/${APP_MACOS_BUNDLE_ID}/g" ./macos/Runner/DebugProfile.entitlements
+sed -i '' "s/\${BUNDLE_ID}/${APP_MACOS_BUNDLE_ID}/g" ./macos/Runner/Release.entitlements
 CONFIG_ARGS=""
 
 case $APP_MACOS_TYPE in