Trigger WordPressComBlogService directly instead of using WordPressAuthenticator

Author: itsmeichigo

WooCommerce/Classes/AppDelegate.swift

@@ -57,12 +57,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let stores = ServiceLocator.stores
         let analytics = ServiceLocator.analytics
         let pushNotesManager = ServiceLocator.pushNotesManager
-
-        /// This is important to initialize early as there are a few code points where the authenticator is used.
-        ServiceLocator.authenticationManager.initialize()
         stores.initializeAfterDependenciesAreInitialized()
-
         setupAnalytics(analytics)
+
         setupCocoaLumberjack()
         setupLibraryLogger()
         setupLogLevel(.verbose)

WooCommerce/Classes/Yosemite/DefaultStoresManager.swift

@@ -7,7 +7,7 @@ import class Networking.WordPressOrgNetwork
 import KeychainAccess
 import class WidgetKit.WidgetCenter
 import Experiments
-import WordPressAuthenticator
+import class WordPressAuthenticator.WordPressComBlogService
 import enum NetworkingCore.RequestAuthenticationMode
 
 // MARK: - DefaultStoresManager
@@ -765,19 +765,17 @@ private extension DefaultStoresManager {
                 self.updateAndReloadWidgetInformation(with: site.siteID)
                 /// Trigger the `v1.1/connect/site-info` API to get information about
                 /// the site's Jetpack status and whether it's a WPCom site.
-                WordPressAuthenticator.fetchSiteInfo(for: url) { [weak self] result in
+                let service = WordPressComBlogService()
+                service.fetchUnauthenticatedSiteInfoForAddress(for: url, success: { [weak self] info in
                     guard let self else { return }
-                    switch result {
-                    case .success(let info):
-                        let updatedSite = site.copy(isJetpackThePluginInstalled: info.hasJetpack,
-                                                    isJetpackConnected: info.isJetpackConnected,
-                                                    isWordPressComStore: info.isWPCom)
-                        self.sessionManager.defaultSite = updatedSite
-                        self.updateAndReloadWidgetInformation(with: site.siteID)
-                    case .failure(let error):
-                        DDLogError("⛔️ Cannot fetch generic site info: \(error)")
-                    }
-                }
+                    let updatedSite = site.copy(isJetpackThePluginInstalled: info.hasJetpack,
+                                                isJetpackConnected: info.isJetpackConnected,
+                                                isWordPressComStore: info.isWPCom)
+                    sessionManager.defaultSite = updatedSite
+                    updateAndReloadWidgetInformation(with: site.siteID)
+                }, failure: { error in
+                    DDLogError("⛔️ Cannot fetch generic site info: \(error)")
+                })
             case .failure(let error):
                 DDLogError("⛔️ Cannot fetch WordPress site info: \(error)")
             }

WooCommerce/WordPressAuthenticator/Services/WordPressComBlogService.swift

@@ -2,7 +2,9 @@ import Foundation
 
 // MARK: - WordPress.com BlogService
 //
-class WordPressComBlogService {
+public class WordPressComBlogService {
+
+    public init() {}
 
     /// Returns a new anonymous instance of WordPressComRestApi.
     ///
@@ -13,7 +15,7 @@ class WordPressComBlogService {
     }
 
 
-     func fetchUnauthenticatedSiteInfoForAddress(for address: String, success: @escaping (WordPressComSiteInfo) -> Void, failure: @escaping (Error) -> Void) {
+    public func fetchUnauthenticatedSiteInfoForAddress(for address: String, success: @escaping (WordPressComSiteInfo) -> Void, failure: @escaping (Error) -> Void) {
         let remote = BlogServiceRemoteREST(wordPressComRestApi: anonymousAPI, siteID: 0)
         remote.fetchUnauthenticatedSiteInfo(forAddress: address, success: { response in
             guard let response = response else {