Remove WPAppGroupName and WPAppKeychainAccessGroup from Constants.h (Part 1) (#24214)

* Add BuildSettings

* Add new values to the app plist files

* Remove unused Info.plist files from JetpackShareExtension

* Remove similar unused Info.plist files from WordPressShareExtension

* Remove similat plist files from Draft extensions

* Remove more unused plist files

* Add WPAppGroupName and WPAppKeychainAccessGroup to remaining targets

* Update ShareExtensionService to use BuildSettings

* Integrate BuildSettingsKit in ShareExtensionService

* Reverse changse

* Remove two more unwanted plist files

* And two more

* Fix compilation (typo)

* Remove unused -Internal entitlements

* Remove WPAppGroupName and WPAppKeychainAccessGroup from Constants.h (Part 2) (#24218)

* Update StatsWidgetsStore

* Replace remainig WPAppGroupName usages

* Add BuildSettingsKit to JetpackIntents app extension and expose these settings via its plist file

* Remove WPAppGroupName from Constants.h

* Update NotificationSupportService

* Update StatsWidgetsStore

* Remove remaining WPAppKeychainAccessGroup usages

* Remove WPAppKeychainAccessGroup from Constants.h

* Add missing package

Author: kean

Modules/Package.swift

@@ -59,6 +59,7 @@ let package = Package(
             .product(name: "Collections", package: "swift-collections"),
             .product(name: "Gifu", package: "Gifu"),
         ]),
+        .target(name: "BuildSettingsKit"),
         .target(name: "DesignSystem", swiftSettings: [.swiftLanguageMode(.v5)]),
         .target(name: "JetpackStatsWidgetsCore", swiftSettings: [.swiftLanguageMode(.v5)]),
         // SFHFKeychainUtils is an old Objective-C keychain wrapper.
@@ -151,6 +152,7 @@ enum XcodeSupport {
 
     static var targets: [Target] {
         let wordPresAuthentificatorDependencies: [Target.Dependency] = [
+            "BuildSettingsKit",
             "WordPressShared",
             "WordPressUI",
             .product(name: "Gridicons", package: "Gridicons-iOS"),
@@ -162,6 +164,7 @@ enum XcodeSupport {
         ]
 
         let shareAndDraftExtensionsDependencies: [Target.Dependency] = [
+            "BuildSettingsKit",
             "SFHFKeychainUtils",
             "WordPressShared",
             "WordPressUI",
@@ -185,6 +188,7 @@ enum XcodeSupport {
         return [
             .xcodeTarget("XcodeTarget_App", dependencies: [
                 "DesignSystem",
+                "BuildSettingsKit",
                 "JetpackStatsWidgetsCore",
                 "SFHFKeychainUtils",
                 "WordPressData",
@@ -238,8 +242,10 @@ enum XcodeSupport {
             .xcodeTarget("XcodeTarget_NotificationServiceExtension", dependencies: [
                 "SFHFKeychainUtils",
                 "WordPressShared",
+                "BuildSettingsKit",
             ]),
             .xcodeTarget("XcodeTarget_StatsWidget", dependencies: [
+                "BuildSettingsKit",
                 "JetpackStatsWidgetsCore",
                 "SFHFKeychainUtils",
                 "WordPressShared",
@@ -249,6 +255,7 @@ enum XcodeSupport {
                 .product(name: "ColorStudio", package: "color-studio"),
             ]),
             .xcodeTarget("XcodeTarget_Intents", dependencies: [
+                "BuildSettingsKit",
                 "JetpackStatsWidgetsCore",
                 .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
             ]),

Modules/Sources/BuildSettingsKit/BuildSettings.swift

@@ -0,0 +1,31 @@
+import Foundation
+
+/// Provides convenient access for values defined in Info.plist files for
+/// apps and app extensions.
+///
+/// - warning: Most of these values exist only in Info.plist files for apps as
+/// app extensions only need a tiny subset of these settings.
+public enum BuildSettings {
+    public static var appGroupName: String {
+        infoPlistValue(forKey: "WPAppGroupName")
+    }
+
+    public static var appKeychainAccessGroup: String {
+        infoPlistValue(forKey: "WPAppKeychainAccessGroup")
+    }
+}
+
+private func infoPlistValue<T>(forKey key: String) -> T where T: LosslessStringConvertible {
+    guard let object = Bundle.main.object(forInfoDictionaryKey: key) else {
+        fatalError("missing value for key: \(key)")
+    }
+    switch object {
+    case let value as T:
+        return value
+    case let string as String:
+        guard let value = T(string) else { fallthrough }
+        return value
+    default:
+        fatalError("unexpected value: \(object) for key: \(key)")
+    }
+}

WordPress/Classes/Services/AccountService.m

@@ -404,23 +404,26 @@ - (void)setupAppExtensionsWithDefaultAccount:(WPAccount *)defaultAccount inConte
     NSNumber *siteId    = defaultBlog.dotComID;
     NSString *blogName  = defaultBlog.settings.name;
 
+    ShareExtensionService *shareExtensionService = [ShareExtensionService new];
+    NotificationSupportService *notificationSupportService = [NotificationSupportService new];
+
     if (defaultBlog == nil || defaultBlog.isDeleted) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            [ShareExtensionService removeShareExtensionConfiguration];
+            [shareExtensionService removeShareExtensionConfiguration];
 
-            [NotificationSupportService deleteServiceExtensionToken];
+            [notificationSupportService deleteServiceExtensionToken];
         });
     } else {
         dispatch_async(dispatch_get_main_queue(), ^{
             WPAccount *defaultAccount = [self.coreDataStack.mainContext existingObjectWithID:defaultAccountObjectID error:nil];
 
-            [ShareExtensionService configureShareExtensionDefaultSiteID:siteId.integerValue defaultSiteName:blogName];
-            [ShareExtensionService configureShareExtensionToken:defaultAccount.authToken];
-            [ShareExtensionService configureShareExtensionUsername:defaultAccount.username];
+            [shareExtensionService configureShareExtensionDefaultSiteID:siteId.integerValue defaultSiteName:blogName];
+            [shareExtensionService configureShareExtensionToken:defaultAccount.authToken];
+            [shareExtensionService configureShareExtensionUsername:defaultAccount.username];
 
-            [NotificationSupportService insertServiceExtensionToken:defaultAccount.authToken];
-            [NotificationSupportService insertServiceExtensionUsername:defaultAccount.username];
-            [NotificationSupportService insertServiceExtensionUserID:defaultAccount.userID.stringValue];
+            [notificationSupportService insertServiceExtensionToken:defaultAccount.authToken];
+            [notificationSupportService insertServiceExtensionUsername:defaultAccount.username];
+            [notificationSupportService insertServiceExtensionUserID:defaultAccount.userID.stringValue];
         });
     }
 }

WordPress/Classes/Services/NotificationSupportService.swift

@@ -1,20 +1,31 @@
 import Foundation
+import BuildSettingsKit
 import SFHFKeychainUtils
 
 @objc
 open class NotificationSupportService: NSObject {
+    private let appKeychainAccessGroup: String
+
+    @objc convenience override init() {
+        self.init(appKeychainAccessGroup: BuildSettings.appKeychainAccessGroup)
+    }
+
+    init(appKeychainAccessGroup: String) {
+        self.appKeychainAccessGroup = appKeychainAccessGroup
+    }
+
     /// Sets the OAuth Token that should be used by the Notification Service Extension to access WPCOM.
     ///
     /// - Parameter oauth2Token: WordPress.com OAuth Token
     ///
     @objc
-    class func insertServiceExtensionToken(_ oauthToken: String) {
+    func insertServiceExtensionToken(_ oauthToken: String) {
         do {
             try SFHFKeychainUtils.storeUsername(
                 AppConfiguration.Extension.NotificationsService.keychainTokenKey,
                 andPassword: oauthToken,
                 forServiceName: AppConfiguration.Extension.NotificationsService.keychainServiceName,
-                accessGroup: WPAppKeychainAccessGroup,
+                accessGroup: appKeychainAccessGroup,
                 updateExisting: true
             )
         } catch {
@@ -27,13 +38,13 @@ open class NotificationSupportService: NSObject {
     /// - Parameter username: WordPress.com username
     ///
     @objc
-    class func insertServiceExtensionUsername(_ username: String) {
+    func insertServiceExtensionUsername(_ username: String) {
         do {
             try SFHFKeychainUtils.storeUsername(
                 AppConfiguration.Extension.NotificationsService.keychainUsernameKey,
                 andPassword: username,
                 forServiceName: AppConfiguration.Extension.NotificationsService.keychainServiceName,
-                accessGroup: WPAppKeychainAccessGroup,
+                accessGroup: appKeychainAccessGroup,
                 updateExisting: true
             )
         } catch {
@@ -46,13 +57,13 @@ open class NotificationSupportService: NSObject {
     /// - Parameter userID: WordPress.com userID
     ///
     @objc
-    class func insertServiceExtensionUserID(_ userID: String) {
+    func insertServiceExtensionUserID(_ userID: String) {
         do {
             try SFHFKeychainUtils.storeUsername(
                 AppConfiguration.Extension.NotificationsService.keychainUserIDKey,
                 andPassword: userID,
                 forServiceName: AppConfiguration.Extension.NotificationsService.keychainServiceName,
-                accessGroup: WPAppKeychainAccessGroup,
+                accessGroup: appKeychainAccessGroup,
                 updateExisting: true
             )
         } catch {
@@ -63,12 +74,12 @@ open class NotificationSupportService: NSObject {
     /// Attempts to delete the current WPCOM OAuth Token used by the Notification Service Extension.
     ///
     @objc
-    class func deleteServiceExtensionToken() {
+    func deleteServiceExtensionToken() {
         do {
             try SFHFKeychainUtils.deleteItem(
                 forUsername: AppConfiguration.Extension.NotificationsService.keychainTokenKey,
                 andServiceName: AppConfiguration.Extension.NotificationsService.keychainServiceName,
-                accessGroup: WPAppKeychainAccessGroup
+                accessGroup: appKeychainAccessGroup
             )
         } catch {
             DDLogDebug("Error while removing Notification Service Extension OAuth token: \(error)")
@@ -78,12 +89,12 @@ open class NotificationSupportService: NSObject {
     /// Attempts to delete the current WPCOM Username used by the Notification Service Extension.
     ///
     @objc
-    class func deleteServiceExtensionUsername() {
+    func deleteServiceExtensionUsername() {
         do {
             try SFHFKeychainUtils.deleteItem(
                 forUsername: AppConfiguration.Extension.NotificationsService.keychainUsernameKey,
                 andServiceName: AppConfiguration.Extension.NotificationsService.keychainServiceName,
-                accessGroup: WPAppKeychainAccessGroup
+                accessGroup: appKeychainAccessGroup
             )
         } catch {
             DDLogDebug("Error while removing Notification Service Extension username: \(error)")
@@ -93,12 +104,12 @@ open class NotificationSupportService: NSObject {
     /// Attempts to delete the current WPCOM Username used by the Notification Service Extension.
     ///
     @objc
-    class func deleteServiceExtensionUserID() {
+    func deleteServiceExtensionUserID() {
         do {
             try SFHFKeychainUtils.deleteItem(
                 forUsername: AppConfiguration.Extension.NotificationsService.keychainUserIDKey,
                 andServiceName: AppConfiguration.Extension.NotificationsService.keychainServiceName,
-                accessGroup: WPAppKeychainAccessGroup
+                accessGroup: appKeychainAccessGroup
             )
         } catch {
             DDLogDebug("Error while removing Notification Service Extension userID: \(error)")