From 41b52e900ccd0caeb16ea56bdfeb6fd5f8661820 Mon Sep 17 00:00:00 2001
From: Yaroslav Yashin <yaroslav.yashin@gmail.com>
Date: Mon, 24 Mar 2025 13:19:28 +0100
Subject: [PATCH] feat: update app identifiers and development team for iOS and
 macOS builds

---
 client/CMakeLists.txt                                       | 6 +++---
 client/cmake/ios.cmake                                      | 2 +-
 client/ios/app/main.entitlements                            | 4 ++--
 .../AmneziaVPNNetworkExtension.entitlements                 | 4 ++--
 client/ios/networkextension/CMakeLists.txt                  | 2 +-
 client/platforms/ios/Log.swift                              | 2 +-
 client/platforms/macos/macosutils.mm                        | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 72adaf25..d3ac89f6 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -148,13 +148,13 @@ if(APPLE)
     cmake_policy(SET CMP0114 NEW)
 
     if(NOT BUILD_OSX_APP_IDENTIFIER)
-        set(BUILD_OSX_APP_IDENTIFIER org.amnezia.AmneziaVPN CACHE STRING "OSX Application identifier")
+        set(BUILD_OSX_APP_IDENTIFIER org.amneziaUnipessoal.DefaultVPN CACHE STRING "OSX Application identifier")
     endif()
     if(NOT BUILD_IOS_APP_IDENTIFIER)
-        set(BUILD_IOS_APP_IDENTIFIER org.amnezia.AmneziaVPN CACHE STRING "iOS Application identifier")
+        set(BUILD_IOS_APP_IDENTIFIER org.amneziaUnipessoal.DefaultVPN CACHE STRING "iOS Application identifier")
     endif()
     if(NOT BUILD_IOS_GROUP_IDENTIFIER)
-        set(BUILD_IOS_GROUP_IDENTIFIER group.org.amnezia.AmneziaVPN CACHE STRING "iOS Group identifier")
+        set(BUILD_IOS_GROUP_IDENTIFIER group.org.amneziaUnipessoal.DefaultVPN CACHE STRING "iOS Group identifier")
     endif()
     if(NOT BUILD_VPN_DEVELOPMENT_TEAM)
         set(BUILD_VPN_DEVELOPMENT_TEAM X7UJ388FXK CACHE STRING "Amnezia VPN Development Team")
diff --git a/client/cmake/ios.cmake b/client/cmake/ios.cmake
index 58192237..a262942d 100644
--- a/client/cmake/ios.cmake
+++ b/client/cmake/ios.cmake
@@ -86,7 +86,7 @@ set_target_properties(${PROJECT} PROPERTIES
     XCODE_ATTRIBUTE_SWIFT_OBJC_INTEROP_MODE "objcxx"
 )
 set_target_properties(${PROJECT} PROPERTIES
-    XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
+    XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "GBN9N55CGR"
 )
 target_include_directories(${PROJECT} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
 target_compile_options(${PROJECT} PRIVATE
diff --git a/client/ios/app/main.entitlements b/client/ios/app/main.entitlements
index d9f00bb1..9de9d045 100644
--- a/client/ios/app/main.entitlements
+++ b/client/ios/app/main.entitlements
@@ -8,13 +8,13 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.org.amnezia.AmneziaVPN</string>
+		<string>group.org.amneziaUnipessoal.DefaultVPN</string>
 	</array>
 	<key>com.apple.security.files.user-selected.read-write</key>
 	<true/>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)group.org.amnezia.AmneziaVPN</string>
+		<string>$(AppIdentifierPrefix)group.org.amneziaUnipessoal.DefaultVPN</string>
 	</array>
 </dict>
 </plist>
diff --git a/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements b/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements
index 92432b56..d2552522 100644
--- a/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements
+++ b/client/ios/networkextension/AmneziaVPNNetworkExtension.entitlements
@@ -8,11 +8,11 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.org.amnezia.AmneziaVPN</string>
+		<string>group.org.amneziaUnipessoal.DefaultVPN</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
-		<string>$(AppIdentifierPrefix)group.org.amnezia.AmneziaVPN</string>
+		<string>$(AppIdentifierPrefix)group.org.amneziaUnipessoal.DefaultVPN</string>
 	</array>
 </dict>
 </plist>
diff --git a/client/ios/networkextension/CMakeLists.txt b/client/ios/networkextension/CMakeLists.txt
index dde03b3b..64896c23 100644
--- a/client/ios/networkextension/CMakeLists.txt
+++ b/client/ios/networkextension/CMakeLists.txt
@@ -39,7 +39,7 @@ set_target_properties(networkextension PROPERTIES
 )
 
 set_target_properties("networkextension" PROPERTIES
-    XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "X7UJ388FXK"
+    XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "GBN9N55CGR"
 )
 
 find_library(FW_ASSETS_LIBRARY AssetsLibrary)
diff --git a/client/platforms/ios/Log.swift b/client/platforms/ios/Log.swift
index d2222f9d..da07f66a 100644
--- a/client/platforms/ios/Log.swift
+++ b/client/platforms/ios/Log.swift
@@ -14,7 +14,7 @@ struct Log {
     }
   }
 
-  private static let appGroupID = "group.org.amnezia.AmneziaVPN"
+  private static let appGroupID = "group.org.amneziaUnipessoal.DefaultVPN"
 
   static let appLogURL = {
     let sharedContainerURL = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupID)!
diff --git a/client/platforms/macos/macosutils.mm b/client/platforms/macos/macosutils.mm
index 177ed2a2..788c2687 100644
--- a/client/platforms/macos/macosutils.mm
+++ b/client/platforms/macos/macosutils.mm
@@ -21,7 +21,7 @@ NSString* MacOSUtils::appId() {
   if (!appId) {
     // Fallback. When an unsigned/un-notarized app is executed in
     // command-line mode, it could fail the fetching of its own bundle id.
-    appId = @"org.amnezia.AmneziaVPN";
+    appId = @"org.amneziaUnipessoal.DefaultVPN";
   }
 
   return appId;