Merge branch trunk into task/jetpack-landing-screen-blur-effect

Author: Giorgio Ruscigno

WordPressAuthenticator/Authenticator/WordPressAuthenticator.swift

@@ -194,6 +194,77 @@ import WordPressKit
         showGetStarted(from: presenter, jetpackLogin: jetpackLogin, connectedEmail: connectedEmail, siteURL: siteURL)
     }
 
+    /// Used to present the Verify Email flow from the app delegate.
+    ///
+    /// - Parameters:
+    ///     - presenter: The view controller that presents the Verify Email view.
+    ///     - xmlrpc: The URL to reach the XMLRPC file of the site to log in to.
+    ///     - connectedEmail: The email address used to authorized Jetpack connection with the site.
+    ///     - siteURL: The URL of the site to log in to.
+    ///
+    @objc public class func showVerifyEmailForWPCom(from presenter: UIViewController, xmlrpc: String, connectedEmail: String, siteURL: String) {
+        guard let xmlrpcURL = URL(string: xmlrpc) else {
+            DDLogError("Failed to initiate XML-RPC URL from \(xmlrpc)")
+            return
+        }
+        let loginFields = LoginFields()
+        loginFields.meta.xmlrpcURL = xmlrpcURL as NSURL
+        loginFields.username = connectedEmail
+        loginFields.siteAddress = siteURL
+
+        guard let vc = VerifyEmailViewController.instantiate(from: .verifyEmail) else {
+            DDLogError("Failed to navigate to VerifyEmailViewController")
+            return
+        }
+
+        vc.loginFields = loginFields
+        let navController = LoginNavigationController(rootViewController: vc)
+        navController.modalPresentationStyle = .fullScreen
+        presenter.present(navController, animated: true, completion: nil)
+    }
+
+    /// Used to present the site credential login flow directly from the delegate.
+    ///
+    /// - Parameters:
+    ///     - presenter: The view controller that presents the site credential login flow.
+    ///     - siteURL: The URL of the site to log in to.
+    ///     - onCompletion: The closure to be trigged when the login succeeds with the input credentials.
+    ///
+    public class func showSiteCredentialLogin(from presenter: UIViewController, siteURL: String, onCompletion: @escaping (WordPressOrgCredentials) -> Void) {
+        let controller = SiteCredentialsViewController.instantiate(from: .siteAddress) { coder in
+            SiteCredentialsViewController(coder: coder, isDismissible: true, onCompletion: onCompletion)
+        }
+        guard let controller = controller else {
+            DDLogError("Failed to navigate from GetStartedViewController to SiteCredentialsViewController")
+            return
+        }
+
+        let loginFields = LoginFields()
+        loginFields.siteAddress = siteURL
+        controller.loginFields = loginFields
+        controller.dismissBlock = { _ in
+            controller.navigationController?.dismiss(animated: true)
+        }
+
+        let navController = LoginNavigationController(rootViewController: controller)
+        navController.modalPresentationStyle = .fullScreen
+        presenter.present(navController, animated: true, completion: nil)
+    }
+
+    /// A helper method to fetch site info for a given URL.
+    /// - Parameters:
+    ///     - siteURL: The URL of the site to fetch information for.
+    ///     - onCompletion: The closure to be triggered when fetching site info is done.
+    ///
+    public class func fetchSiteInfo(for siteURL: String, onCompletion: @escaping (Result<WordPressComSiteInfo, Error>) -> Void) {
+        let service = WordPressComBlogService()
+        service.fetchUnauthenticatedSiteInfoForAddress(for: siteURL, success: { siteInfo in
+            onCompletion(.success(siteInfo))
+        }, failure: { error in
+            onCompletion(.failure(error))
+        })
+    }
+
     /// Shows the unified Login/Signup flow.
     ///
     private class func showGetStarted(from presenter: UIViewController, jetpackLogin: Bool, connectedEmail: String? = nil, siteURL: String? = nil) {

WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteCredentialsViewController.swift

@@ -16,6 +16,21 @@ final class SiteCredentialsViewController: LoginViewController {
     private var errorMessage: String?
     private var shouldChangeVoiceOverFocus: Bool = false
 
+    private let isDismissible: Bool
+    private let completionHandler: ((WordPressOrgCredentials) -> Void)?
+
+    init?(coder: NSCoder, isDismissible: Bool, onCompletion: @escaping (WordPressOrgCredentials) -> Void) {
+        self.isDismissible = isDismissible
+        self.completionHandler = onCompletion
+        super.init(coder: coder)
+    }
+
+    required init?(coder: NSCoder) {
+        self.isDismissible = false
+        self.completionHandler = nil
+        super.init(coder: coder)
+    }
+
     // Required for `NUXKeyboardResponder` but unused here.
     var verticalCenterConstraint: NSLayoutConstraint?
 
@@ -46,6 +61,9 @@ final class SiteCredentialsViewController: LoginViewController {
         loginFields.meta.userIsDotCom = false
 
         navigationItem.title = WordPressAuthenticator.shared.displayStrings.logInTitle
+        if isDismissible {
+            navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(dismissView))
+        }
         styleNavigationBar(forUnified: true)
 
         // Store default margin, and size table for the view.
@@ -221,6 +239,9 @@ extension SiteCredentialsViewController: UITextFieldDelegate {
 // MARK: - Private Methods
 private extension SiteCredentialsViewController {
 
+    @objc func dismissView() {
+        dismissBlock?(true)
+    }
     /// Registers all of the available TableViewCells.
     ///
     func registerTableViewCells() {
@@ -478,6 +499,9 @@ extension SiteCredentialsViewController {
         // Try to get the jetpack email from XML-RPC response dictionary.
         //
         guard let loginFields = makeLoginFieldsUsing(xmlrpc: xmlrpc, options: options) else {
+            if let completionHandler = completionHandler {
+                return completionHandler(wporg)
+            }
             DDLogError("Unexpected response from .org site credentials sign in using XMLRPC.")
             showLoginEpilogue(for: credentials)
             return