From 3535be9cf8686f1a6ea9ae73a4399e2106a43bfa Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik@verbruggen.consulting>
Date: Fri, 12 Nov 2021 14:55:44 +0100
Subject: [PATCH] macOS: change SOCKETAPI_TEAM_IDENTIFIER_PREFIX concatenation

Previously, the socket api prefix was created by concatenating
SOCKETAPI_TEAM_IDENTIFIER_PREFIX and OC_APPLICATION_REV_DOMAIN together,
so the first variable had to end in a "." to get the correct result.
This change moves adding that period from configuration to the places
where the concatenation happens.
---
 CMakeLists.txt                                                  | 2 +-
 .../OwnCloudFinderSync/FinderSyncExt/FinderSyncExt.entitlements | 2 +-
 .../MacOSX/OwnCloudFinderSync/FinderSyncExt/Info.plist          | 2 +-
 src/gui/guiutility_mac.mm                                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 678047fff0e..7ee9040be80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,7 +131,7 @@ option(BUILD_GUI "BUILD_GUI" ON)
 set(VIRTUAL_FILE_SYSTEM_PLUGINS suffix win CACHE STRING "Name of internal plugin in src/libsync/vfs or the locations of virtual file plugins")
 
 if(APPLE)
-  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
+  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (without a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
 endif()
 
 if(BUILD_CLIENT)
diff --git a/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSyncExt.entitlements b/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSyncExt.entitlements
index 5d2a36d31b7..b69291f8bf7 100644
--- a/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSyncExt.entitlements
+++ b/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSyncExt.entitlements
@@ -6,7 +6,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX)$(OC_APPLICATION_REV_DOMAIN)</string>
+		<string>$(OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX).$(OC_APPLICATION_REV_DOMAIN)</string>
 	</array>
 </dict>
 </plist>
diff --git a/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/Info.plist b/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/Info.plist
index 88bb87e9163..926a0a69547 100644
--- a/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/Info.plist
+++ b/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>SocketApiPrefix</key>
-	<string>$(OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX)$(OC_APPLICATION_REV_DOMAIN)</string>
+	<string>$(OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX).$(OC_APPLICATION_REV_DOMAIN)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
diff --git a/src/gui/guiutility_mac.mm b/src/gui/guiutility_mac.mm
index f5c880373a9..65e05ab6a8a 100644
--- a/src/gui/guiutility_mac.mm
+++ b/src/gui/guiutility_mac.mm
@@ -56,7 +56,7 @@
     // This must match the code signing Team setting of the extension
     // Example for developer builds (with ad-hoc signing identity): "" "com.owncloud.desktopclient" ".socketApi"
     // Example for official signed packages: "9B5WD74GWJ." "com.owncloud.desktopclient" ".socketApi"
-    return QLatin1String(SOCKETAPI_TEAM_IDENTIFIER_PREFIX APPLICATION_REV_DOMAIN ".socketApi");
+    return QLatin1String(SOCKETAPI_TEAM_IDENTIFIER_PREFIX "." APPLICATION_REV_DOMAIN ".socketApi");
 }
 
 } // namespace OCC