Use a session-scoped sync coordinator

Author: joshheald

Modules/Sources/Yosemite/Base/StoresManager.swift

@@ -65,6 +65,10 @@ public protocol StoresManager {
     ///
     var site: AnyPublisher<Site?, Never> { get }
 
+    /// Provides access to the session-scoped POS catalog sync coordinator
+    ///
+    var posCatalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol? { get }
+
     /// Indicates if we need a Default StoreID, or there's one already set.
     ///
     var needsDefaultStore: Bool { get }

Modules/Sources/Yosemite/Model/Mocks/MockStoresManager.swift

@@ -253,6 +253,10 @@ public class MockStoresManager: StoresManager {
     public func shouldAuthenticateAdminPage(for site: Site) -> Bool {
         return false
     }
+
+    public var posCatalogSyncCoordinator: (any POSCatalogSyncCoordinatorProtocol)? {
+        nil
+    }
 }
 
 private extension MockStoresManager {

Modules/Tests/YosemiteTests/Tools/POS/POSCatalogSyncCoordinatorTests.swift

@@ -46,7 +46,7 @@ struct POSCatalogSyncCoordinatorTests {
         mockSyncService.startFullSyncResult = .success(expectedCatalog)
 
         // When
-        _ = try await sut.performFullSync(for: sampleSiteID)
+        try await sut.performFullSync(for: sampleSiteID)
         let afterSync = Date()
 
         // Then
@@ -66,7 +66,7 @@ struct POSCatalogSyncCoordinatorTests {
 
         // When/Then
         await #expect(throws: expectedError) {
-            _ = try await sut.performFullSync(for: sampleSiteID)
+            try await sut.performFullSync(for: sampleSiteID)
         }
 
         // Should not store timestamp on failure

WooCommerce/Classes/ServiceLocator/ServiceLocator.swift

@@ -112,10 +112,6 @@ final class ServiceLocator {
     ///
     private static var _startupWaitingTimeTracker: AppStartupWaitingTimeTracker = AppStartupWaitingTimeTracker()
 
-    /// POS catalog sync coordinator
-    ///
-    private static var _posCatalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol?
-
     // MARK: - Getters
 
     /// Provides the access point to the analytics.
@@ -305,25 +301,14 @@ final class ServiceLocator {
     }
 
     /// Provides access point to the `POSCatalogSyncCoordinator`.
+    /// Returns nil if feature flag is disabled or user is not authenticated.
     ///
-    static var posCatalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol {
+    static var posCatalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol? {
         guard featureFlagService.isFeatureFlagEnabled(.pointOfSaleLocalCatalogi1) else {
-            fatalError("POSCatalogSyncCoordinator accessed when pointOfSaleLocalCatalogi1 feature flag is disabled")
-        }
-
-        guard let coordinator = _posCatalogSyncCoordinator else {
-            guard let credentials = stores.sessionManager.defaultCredentials,
-                  let fullSyncService = POSCatalogFullSyncService(credentials: credentials, grdbManager: grdbManager)
-            else {
-                fatalError("Failed to create POSCatalogSyncCoordinator due to missing credentials")
-            }
-
-            let coordinator = POSCatalogSyncCoordinator(fullSyncService: fullSyncService, grdbManager: grdbManager)
-            _posCatalogSyncCoordinator = coordinator
-            return coordinator
+            return nil
         }
 
-        return coordinator
+        return stores.posCatalogSyncCoordinator
     }
 }
 

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -767,9 +767,8 @@ private extension MainTabBarController {
         )
 
         // Configure POS catalog sync coordinator for local catalog syncing
-        if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleLocalCatalogi1) {
-            posCatalogSyncCoordinator = ServiceLocator.posCatalogSyncCoordinator
-        }
+        // Get POS catalog sync coordinator (will be nil if feature flag disabled or not authenticated)
+        posCatalogSyncCoordinator = ServiceLocator.posCatalogSyncCoordinator
 
         // Configure hub menu tab coordinator once per logged in session potentially with multiple sites.
         if hubMenuTabCoordinator == nil {

WooCommerce/Classes/Yosemite/AuthenticatedState.swift

@@ -28,6 +28,10 @@ class AuthenticatedState: StoresManagerState {
 
     private var cancellables: Set<AnyCancellable> = []
 
+    /// POS Catalog Sync Coordinator (session-scoped)
+    ///
+    private(set) var posCatalogSyncCoordinator: POSCatalogSyncCoordinator?
+
     /// Designated Initializer
     ///
     init(credentials: Credentials, sessionManager: SessionManagerProtocol) {
@@ -136,6 +140,17 @@ class AuthenticatedState: StoresManagerState {
 
         self.services = services
 
+        // Initialize POS catalog sync coordinator if feature flag is enabled
+        if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleLocalCatalogi1),
+           let fullSyncService = POSCatalogFullSyncService(credentials: credentials, grdbManager: ServiceLocator.grdbManager) {
+            posCatalogSyncCoordinator = POSCatalogSyncCoordinator(
+                fullSyncService: fullSyncService,
+                grdbManager: ServiceLocator.grdbManager
+            )
+        } else {
+            posCatalogSyncCoordinator = nil
+        }
+
         trackEventRequestNotificationHandler = TrackEventRequestNotificationHandler()
 
         startListeningToNotifications()

WooCommerce/Classes/Yosemite/DefaultStoresManager.swift

@@ -120,6 +120,12 @@ class DefaultStoresManager: StoresManager {
         sessionManager.defaultSitePublisher
     }
 
+    /// Provides access to the session-scoped POS catalog sync coordinator
+    ///
+    var posCatalogSyncCoordinator: POSCatalogSyncCoordinatorProtocol? {
+        (state as? AuthenticatedState)?.posCatalogSyncCoordinator
+    }
+
     /// Designated Initializer
     ///
     init(sessionManager: SessionManagerProtocol,