Make selectedSite param required for AlamofireNetwork init

Author: itsmeichigo

Modules/Sources/NetworkingCore/Network/AlamofireNetwork.swift

@@ -67,11 +67,12 @@ public class AlamofireNetwork: Network {
     /// - Parameters:
     ///   - credentials: Authentication credentials for requests.
     ///   - selectedSite: Publisher for site selection changes.
+    ///   This is necessary if you wish to enable network switching to direct requests while authenticated with WPCOM for better performance.
     ///   - sessionManager: Optional pre-configured session manager.
     ///   - ensuresSessionManagerIsInitialized: If true, the session is always set during initialization immediately to avoid lazy initialization race conditions.
     ///     Defaults to false for backward compatibility. Set to true when making concurrent requests immediately after initialization.
     public required init(credentials: Credentials?,
-                         selectedSite: AnyPublisher<JetpackSite?, Never>? = nil,
+                         selectedSite: AnyPublisher<JetpackSite?, Never>?,
                          userDefaults: UserDefaults = .standard,
                          sessionManager: Alamofire.Session? = nil,
                          ensuresSessionManagerIsInitialized: Bool = false) {
@@ -121,6 +122,7 @@ public class AlamofireNetwork: Network {
             requestAuthenticator.updateAuthenticator(DefaultRequestAuthenticator(credentials: credentials))
             requestAuthenticator.delegate = nil
             updateAuthenticationMode(.jetpackTunnel)
+            subscription = nil
         }
     }
 

Modules/Sources/Yosemite/PointOfSale/Coupons/PointOfSaleCouponFetchStrategyFactory.swift

@@ -3,6 +3,8 @@ import class WooFoundation.CurrencySettings
 import protocol Storage.StorageManagerType
 import class Networking.CouponsRemote
 import class Networking.AlamofireNetwork
+import struct Combine.AnyPublisher
+import struct NetworkingCore.JetpackSite
 
 public struct PointOfSaleCouponFetchStrategyFactory {
     private let siteID: Int64
@@ -13,8 +15,9 @@ public struct PointOfSaleCouponFetchStrategyFactory {
     public init(siteID: Int64,
                 currencySettings: CurrencySettings,
                 credentials: Credentials?,
+                selectedSite: AnyPublisher<JetpackSite?, Never>,
                 storage: StorageManagerType) {
-        let network = AlamofireNetwork(credentials: credentials)
+        let network = AlamofireNetwork(credentials: credentials, selectedSite: selectedSite)
         let remote = CouponsRemote(network: network)
         self.siteID = siteID
         self.currencySettings = currencySettings

Modules/Sources/Yosemite/PointOfSale/Coupons/PointOfSaleCouponService.swift

@@ -5,6 +5,8 @@ import class WooFoundation.CurrencyFormatter
 import class WooFoundation.CurrencySettings
 import Storage
 import enum Alamofire.AFError
+import struct Combine.AnyPublisher
+import struct NetworkingCore.JetpackSite
 
 public protocol PointOfSaleCouponServiceProtocol {
     func provideLocalPointOfSaleCoupons(fetchStrategy: PointOfSaleCouponFetchStrategy) async throws -> [POSItem]
@@ -30,8 +32,9 @@ public final class PointOfSaleCouponService: PointOfSaleCouponServiceProtocol {
     public convenience init(siteID: Int64,
                             currencySettings: CurrencySettings,
                             credentials: Credentials?,
+                            selectedSite: AnyPublisher<JetpackSite?, Never>,
                             storage: StorageManagerType) {
-        let network = AlamofireNetwork(credentials: credentials)
+        let network = AlamofireNetwork(credentials: credentials, selectedSite: selectedSite)
         self.init(siteID: siteID,
                   currencySettings: currencySettings,
                   settingStoreMethods: SettingStoreMethods(storageManager: storage, network: network),

Modules/Sources/Yosemite/PointOfSale/Eligibility/POSSystemStatusService.swift

@@ -1,6 +1,7 @@
 import Foundation
 import Networking
 import Storage
+import struct Combine.AnyPublisher
 
 public protocol POSSystemStatusServiceProtocol {
     /// Loads WooCommerce plugin and POS feature switch value remotely for eligibility checks.
@@ -27,8 +28,10 @@ public final class POSSystemStatusService: POSSystemStatusServiceProtocol {
     private let storageManager: StorageManagerType
     private let pluginsService: PluginsServiceProtocol
 
-    public init(credentials: Credentials?, storageManager: StorageManagerType) {
-        let network = AlamofireNetwork(credentials: credentials)
+    public init(credentials: Credentials?,
+                selectedSite: AnyPublisher<JetpackSite?, Never>,
+                storageManager: StorageManagerType) {
+        let network = AlamofireNetwork(credentials: credentials, selectedSite: selectedSite)
         self.remote = SystemStatusRemote(network: network)
         self.storageManager = storageManager
         self.pluginsService = PluginsService(storageManager: storageManager)

Modules/Sources/Yosemite/PointOfSale/Items/PointOfSaleBarcodeScanService.swift

@@ -4,6 +4,8 @@ import class Networking.ProductsRemote
 import class WooFoundation.CurrencySettings
 import class Networking.AlamofireNetwork
 import enum Networking.NetworkError
+import struct Combine.AnyPublisher
+import struct NetworkingCore.JetpackSite
 
 public protocol PointOfSaleBarcodeScanServiceProtocol {
     func getItem(barcode: String) async throws(PointOfSaleBarcodeScanError) -> POSItem
@@ -40,8 +42,9 @@ public final class PointOfSaleBarcodeScanService: PointOfSaleBarcodeScanServiceP
 
     public convenience init(siteID: Int64,
                             credentials: Credentials?,
+                            selectedSite: AnyPublisher<JetpackSite?, Never>,
                             currencySettings: CurrencySettings) {
-        let network = AlamofireNetwork(credentials: credentials)
+        let network = AlamofireNetwork(credentials: credentials, selectedSite: selectedSite)
         self.init(siteID: siteID,
                   productsRemote: ProductsRemote(network: network),
                   currencySettings: currencySettings)

Modules/Sources/Yosemite/PointOfSale/Items/PointOfSaleItemFetchStrategyFactory.swift

@@ -2,6 +2,8 @@ import Foundation
 import class Networking.ProductsRemote
 import class Networking.ProductVariationsRemote
 import class Networking.AlamofireNetwork
+import struct Combine.AnyPublisher
+import struct NetworkingCore.JetpackSite
 
 public protocol PointOfSaleItemFetchStrategyFactoryProtocol {
     func defaultStrategy(analytics: POSItemFetchAnalyticsTracking) -> PointOfSalePurchasableItemFetchStrategy
@@ -18,9 +20,10 @@ public final class PointOfSaleItemFetchStrategyFactory: PointOfSaleItemFetchStra
     private let variationsRemote: ProductVariationsRemote
 
     public init(siteID: Int64,
-                credentials: Credentials?) {
+                credentials: Credentials?,
+                selectedSite: AnyPublisher<JetpackSite?, Never>? = nil) {
         self.siteID = siteID
-        let network = AlamofireNetwork(credentials: credentials)
+        let network = AlamofireNetwork(credentials: credentials, selectedSite: selectedSite)
         self.productsRemote = ProductsRemote(network: network)
         self.variationsRemote = ProductVariationsRemote(network: network)
     }

Modules/Sources/Yosemite/PointOfSale/OrderList/PointOfSaleOrderListFetchStrategyFactory.swift

@@ -2,6 +2,8 @@ import Foundation
 import class Networking.AlamofireNetwork
 import class Networking.OrdersRemote
 import class WooFoundationCore.CurrencyFormatter
+import struct Combine.AnyPublisher
+import struct NetworkingCore.JetpackSite
 
 public protocol PointOfSaleOrderListFetchStrategyFactoryProtocol {
     func defaultStrategy() -> PointOfSaleOrderListFetchStrategy
@@ -15,9 +17,10 @@ public final class PointOfSaleOrderListFetchStrategyFactory: PointOfSaleOrderLis
 
     public init(siteID: Int64,
                 credentials: Credentials?,
+                selectedSite: AnyPublisher<JetpackSite?, Never>,
                 currencyFormatter: CurrencyFormatter) {
         self.siteID = siteID
-        let network = AlamofireNetwork(credentials: credentials)
+        let network = AlamofireNetwork(credentials: credentials, selectedSite: selectedSite)
         self.ordersRemote = OrdersRemote(network: network)
         self.currencyFormatter = currencyFormatter
     }

Modules/Sources/Yosemite/Tools/POS/POSCatalogFullSyncService.swift

@@ -3,6 +3,8 @@ import protocol Networking.POSCatalogSyncRemoteProtocol
 import class Networking.AlamofireNetwork
 import class Networking.POSCatalogSyncRemote
 import Storage
+import struct Combine.AnyPublisher
+import struct NetworkingCore.JetpackSite
 
 // TODO - remove the periphery ignore comment when the catalog is integrated with POS.
 // periphery:ignore
@@ -30,12 +32,17 @@ public final class POSCatalogFullSyncService: POSCatalogFullSyncServiceProtocol
     private let persistenceService: POSCatalogPersistenceServiceProtocol
     private let batchedLoader: BatchedRequestLoader
 
-    public convenience init?(credentials: Credentials?, batchSize: Int = 2, grdbManager: GRDBManagerProtocol) {
+    public convenience init?(credentials: Credentials?,
+                             selectedSite: AnyPublisher<JetpackSite?, Never>,
+                             batchSize: Int = 2,
+                             grdbManager: GRDBManagerProtocol) {
         guard let credentials else {
             DDLogError("⛔️ Could not create POSCatalogFullSyncService due missing credentials")
             return nil
         }
-        let network = AlamofireNetwork(credentials: credentials, ensuresSessionManagerIsInitialized: true)
+        let network = AlamofireNetwork(credentials: credentials,
+                                       selectedSite: selectedSite,
+                                       ensuresSessionManagerIsInitialized: true)
         let syncRemote = POSCatalogSyncRemote(network: network)
         let persistenceService = POSCatalogPersistenceService(grdbManager: grdbManager)
         self.init(syncRemote: syncRemote, batchSize: batchSize, persistenceService: persistenceService)

Modules/Sources/Yosemite/Tools/POS/POSCatalogIncrementalSyncService.swift

@@ -3,6 +3,8 @@ import protocol Networking.POSCatalogSyncRemoteProtocol
 import class Networking.AlamofireNetwork
 import class Networking.POSCatalogSyncRemote
 import protocol Storage.GRDBManagerProtocol
+import struct NetworkingCore.JetpackSite
+import struct Combine.AnyPublisher
 
 // TODO - remove the periphery ignore comment when the service is integrated with POS.
 // periphery:ignore
@@ -22,12 +24,17 @@ public final class POSCatalogIncrementalSyncService: POSCatalogIncrementalSyncSe
     private let persistenceService: POSCatalogPersistenceServiceProtocol
     private let batchedLoader: BatchedRequestLoader
 
-    public convenience init?(credentials: Credentials?, batchSize: Int = 1, grdbManager: GRDBManagerProtocol) {
+    public convenience init?(credentials: Credentials?,
+                             selectedSite: AnyPublisher<JetpackSite?, Never>,
+                             batchSize: Int = 1,
+                             grdbManager: GRDBManagerProtocol) {
         guard let credentials else {
             DDLogError("⛔️ Could not create POSCatalogIncrementalSyncService due missing credentials")
             return nil
         }
-        let network = AlamofireNetwork(credentials: credentials, ensuresSessionManagerIsInitialized: true)
+        let network = AlamofireNetwork(credentials: credentials,
+                                       selectedSite: selectedSite,
+                                       ensuresSessionManagerIsInitialized: true)
         let syncRemote = POSCatalogSyncRemote(network: network)
         let persistenceService = POSCatalogPersistenceService(grdbManager: grdbManager)
         self.init(syncRemote: syncRemote, batchSize: batchSize, persistenceService: persistenceService)

Modules/Sources/Yosemite/Tools/POS/POSOrderService.swift

@@ -2,6 +2,8 @@ import Foundation
 import Networking
 import class WooFoundation.CurrencyFormatter
 import enum WooFoundation.CurrencyCode
+import struct Combine.AnyPublisher
+import struct NetworkingCore.JetpackSite
 
 public protocol POSOrderServiceProtocol {
     /// Syncs order based on the cart.
@@ -17,12 +19,12 @@ public final class POSOrderService: POSOrderServiceProtocol {
     private let siteID: Int64
     private let ordersRemote: POSOrdersRemoteProtocol
 
-    public convenience init?(siteID: Int64, credentials: Credentials?) {
+    public convenience init?(siteID: Int64, credentials: Credentials?, selectedSite: AnyPublisher<JetpackSite?, Never>) {
         guard let credentials else {
             DDLogError("⛔️ Could not create POSOrderService due to not finding credentials")
             return nil
         }
-        let network = AlamofireNetwork(credentials: credentials)
+        let network = AlamofireNetwork(credentials: credentials, selectedSite: selectedSite)
         self.init(siteID: siteID,
                   ordersRemote: OrdersRemote(network: network))
     }