Rewrite WPAuthTokenIssueSolver (#24397)

Author: kean

Sources/Keystone/Keystone.h

@@ -73,7 +73,6 @@ FOUNDATION_EXPORT const unsigned char KeystoneVersionString[];
 #import <Keystone/WPAccount.h>
 #import <Keystone/WPActivityDefaults.h>
 #import <Keystone/WPAppAnalytics.h>
-#import <Keystone/WPAuthTokenIssueSolver.h>
 #import <Keystone/WPUploadStatusButton.h>
 #import <Keystone/WPError.h>
 #import <Keystone/WPTableViewHandler.h>

Sources/WordPressAuthenticator/Helpers/Authenticator/WordPressAuthenticator.swift

@@ -341,7 +341,6 @@ import WordPressKit
         }
     }
 
-    // Helper used by WPAuthTokenIssueSolver
     @objc
     public class func signinForWPCom(dotcomEmailAddress: String?, dotcomUsername: String?, onDismissed: ((_ cancelled: Bool) -> Void)? = nil) -> UIViewController {
         let loginFields = LoginFields()

WordPress/Classes/System/WordPress-Bridging-Header.h

@@ -65,7 +65,6 @@
 #import "WPAccount.h"
 #import "WPActivityDefaults.h"
 #import "WPAppAnalytics.h"
-#import "WPAuthTokenIssueSolver.h"
 #import "WPUploadStatusButton.h"
 #import "WPError.h"
 #import "WPTableViewHandler.h"

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -104,9 +104,8 @@ public class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
         customizeAppearance()
         configureAnalytics()
 
-        let solver = WPAuthTokenIssueSolver()
-        _ = solver.fixAuthTokenIssueAndDo { [weak self] in
-            self?.runStartupSequence(with: launchOptions ?? [:])
+        AuthTokenIssueSolver().fixAuthTokenIssueIfNeeded(in: window) {
+            self.runStartupSequence(with: launchOptions ?? [:])
         }
 
         return true

WordPress/Classes/Utility/AuthTokenIssueSolver.swift

@@ -0,0 +1,74 @@
+import UIKit
+import WordPressData
+
+struct AuthTokenIssueSolver {
+    private let coreData: CoreDataStack
+
+    init(coreData: CoreDataStack = ContextManager.shared) {
+        self.coreData = coreData
+    }
+
+    /// - note: The completion callback is run immediatelly if there is no issue.
+    func fixAuthTokenIssueIfNeeded(in window: UIWindow, _ completion: @escaping () -> Void) {
+        guard hasAuthTokenIssues() else {
+            completion()
+            return
+        }
+
+        let signInVC = WordPressAuthenticationManager.signinForWPComFixingAuthToken { cancelled in
+            if cancelled {
+                // We present asynchronously to prevent an issue where the Login VC would dismiss the
+                // alert instead of itself.
+                DispatchQueue.main.async {
+                    showCancelReAuthenticationAlert(in: window, onDeletionConfirmed: {
+                        let accountService = AccountService(coreDataStack: ContextManager.sharedInstance())
+                        accountService.removeDefaultWordPressComAccount()
+                        completion()
+                    })
+                }
+            } else {
+                completion()
+            }
+        }
+
+        window.rootViewController = signInVC
+
+        showExplanationAlertForReAuthentication(in: signInVC)
+    }
+
+    /// Call this method to know if the local installation of WPiOS has the
+    /// authToken issue this class was designed to solve.
+    /// - returns: `true` if the local WPiOS installation needs to be fixed by this class.
+    private func hasAuthTokenIssues() -> Bool {
+        guard let account = try? WPAccount.lookupDefaultWordPressComAccount(in: coreData.mainContext) else {
+            return false
+        }
+        return account.authToken == nil
+    }
+
+    private func showCancelReAuthenticationAlert(in window: UIWindow, onDeletionConfirmed: @escaping () -> Void) {
+        let title = NSLocalizedString("Careful!", comment: "Title for the warning shown to the user when he refuses to re-login when the authToken is missing.")
+        let message = NSLocalizedString("Proceeding will remove all WordPress.com data from this device, and delete any locally saved drafts. You will not lose anything already saved to your WordPress.com blog(s).", comment: "Message for the warning shown to the user when he refuses to re-login when the authToken is missing.")
+
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
+
+        alert.addAction(UIAlertAction(title: SharedStrings.Button.cancel, style: .cancel) { _ in })
+        alert.addAction(UIAlertAction(title: SharedStrings.Button.delete, style: .destructive) { _ in
+            onDeletionConfirmed()
+        })
+
+        window.rootViewController?.present(alert, animated: true, completion: nil)
+    }
+
+    private func showExplanationAlertForReAuthentication(in presentingViewController: UIViewController) {
+        let title = NSLocalizedString("Oops!", comment: "Title for the warning shown to the user when the app realizes there should be an auth token but there isn't one.")
+        let message = NSLocalizedString("There was a problem connecting to WordPress.com. Please log in again.", comment: "Message for the warning shown to the user when the app realizes there should be an auth token but there isn't one.")
+
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
+
+        alert.addAction(UIAlertAction(title: SharedStrings.Button.ok, style: .default) { _ in })
+        alert.modalPresentationStyle = .popover
+
+        presentingViewController.present(alert, animated: true)
+    }
+}

WordPress/Classes/Utility/WPAuthTokenIssueSolver.h

@@ -1977,7 +1977,6 @@
 				Utility/Logging/WPLogger.h,
 				Utility/Sharing/WPActivityDefaults.h,
 				Utility/UIAlertControllerProxy.h,
-				Utility/WPAuthTokenIssueSolver.h,
 				Utility/WPError.h,
 				Utility/WPTableViewHandler.h,
 				"ViewRelated/Blog/Blog Details/BlogDetailsViewController.h",