Fix keychain access on macOS. (#354)

ElementX/Sources/Other/InfoPlistReader.swift

@@ -20,6 +20,7 @@ struct InfoPlistReader {
     private enum Keys {
         static let appGroupIdentifier = "appGroupIdentifier"
         static let baseBundleIdentifier = "baseBundleIdentifier"
+        static let keychainAccessGroupIdentifier = "keychainAccessGroupIdentifier"
         static let bundleShortVersion = "CFBundleShortVersionString"
         static let bundleDisplayName = "CFBundleDisplayName"
     }
@@ -44,6 +45,11 @@ struct InfoPlistReader {
     var baseBundleIdentifier: String {
         infoPlistStringValue(forKey: Keys.baseBundleIdentifier)
     }
+    
+    /// Keychain access group identifier set in Info.plist of the target
+    var keychainAccessGroupIdentifier: String {
+        infoPlistStringValue(forKey: Keys.keychainAccessGroupIdentifier)
+    }
 
     /// Bundle executable of the target
     var bundleExecutable: String {

ElementX/Sources/Services/UserSession/UserSessionStore.swift

@@ -30,7 +30,7 @@ class UserSessionStore: UserSessionStoreProtocol {
     
     init(backgroundTaskService: BackgroundTaskServiceProtocol) {
         keychainController = KeychainController(service: .sessions,
-                                                accessGroup: InfoPlistReader.target.appGroupIdentifier)
+                                                accessGroup: InfoPlistReader.target.keychainAccessGroupIdentifier)
         self.backgroundTaskService = backgroundTaskService
         baseDirectory = .sessionsBaseDirectory
         MXLog.debug("Setup base directory at: \(baseDirectory)")

ElementX/SupportingFiles/ElementX.entitlements

@@ -14,5 +14,9 @@
 	</array>
 	<key>com.apple.security.network.client</key>
 	<true/>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)</string>
+	</array>
 </dict>
 </plist>

ElementX/SupportingFiles/Info.plist

@@ -39,5 +39,7 @@
 	<string>$(APP_GROUP_IDENTIFIER)</string>
 	<key>baseBundleIdentifier</key>
 	<string>$(BASE_BUNDLE_IDENTIFIER)</string>
+	<key>keychainAccessGroupIdentifier</key>
+	<string>$(KEYCHAIN_ACCESS_GROUP_IDENTIFIER)</string>
 </dict>
 </plist>

ElementX/SupportingFiles/target.yml

@@ -54,6 +54,7 @@ targets:
         ]
         appGroupIdentifier: $(APP_GROUP_IDENTIFIER)
         baseBundleIdentifier: $(BASE_BUNDLE_IDENTIFIER)
+        keychainAccessGroupIdentifier: $(KEYCHAIN_ACCESS_GROUP_IDENTIFIER)
         ITSAppUsesNonExemptEncryption: false
         NSUserActivityTypes: [
           INSendMessageIntent