Send site credentials to JetpackErrorViewModel

Author: itsmeichigo

WooCommerce/Classes/Authentication/AuthenticationManager.swift

@@ -553,7 +553,9 @@ private extension AuthenticationManager {
                              with credentials: AuthenticatorCredentials,
                              in navigationController: UINavigationController,
                              onDismiss: @escaping () -> Void) {
-        let viewModel = JetpackErrorViewModel(siteURL: siteURL, onJetpackSetupCompletion: { [weak self] authorizedEmailAddress in
+        let viewModel = JetpackErrorViewModel(siteURL: siteURL,
+                                              siteCredentials: credentials.wporg,
+                                              onJetpackSetupCompletion: { [weak self] authorizedEmailAddress in
             guard let self = self else { return }
             // Resets the referenced site since the setup completed now.
             self.currentSelfHostedSite = nil
@@ -589,7 +591,9 @@ private extension AuthenticationManager {
     /// without Jetpack in the site discovery flow
     ///
     func jetpackErrorUI(for siteURL: String, with matcher: ULAccountMatcher, in navigationController: UINavigationController) -> UIViewController {
-        let viewModel = JetpackErrorViewModel(siteURL: siteURL, onJetpackSetupCompletion: { [weak self] authorizedEmailAddress in
+        let viewModel = JetpackErrorViewModel(siteURL: siteURL,
+                                              siteCredentials: nil,
+                                              onJetpackSetupCompletion: { [weak self] authorizedEmailAddress in
             guard let self = self else { return }
 
             // Tries re-syncing to get an updated store list

WooCommerce/Classes/Authentication/Navigation Exceptions/JetpackErrorViewModel.swift

@@ -8,15 +8,18 @@ import WordPressUI
 /// an error when Jetpack is not installed or is not connected
 struct JetpackErrorViewModel: ULErrorViewModel {
     private let siteURL: String
+    private let siteCredentials: WordPressOrgCredentials?
     private let analytics: Analytics
     private let jetpackSetupCompletionHandler: (String?) -> Void
     private let authentication: Authentication
 
     init(siteURL: String?,
+         siteCredentials: WordPressOrgCredentials?,
          analytics: Analytics = ServiceLocator.analytics,
          authentication: Authentication = ServiceLocator.authenticationManager,
          onJetpackSetupCompletion: @escaping (String?) -> Void) {
         self.siteURL = siteURL ?? Localization.yourSite
+        self.siteCredentials = siteCredentials
         self.analytics = analytics
         self.authentication = authentication
         self.jetpackSetupCompletionHandler = onJetpackSetupCompletion
@@ -62,7 +65,10 @@ struct JetpackErrorViewModel: ULErrorViewModel {
             return
         }
 
-        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL, analytics: analytics, onCompletion: jetpackSetupCompletionHandler)
+        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL,
+                                                 siteCredentials: siteCredentials,
+                                                 analytics: analytics,
+                                                 onCompletion: jetpackSetupCompletionHandler)
         let connectionController = AuthenticatedWebViewController(viewModel: viewModel)
         viewController.navigationController?.show(connectionController, sender: nil)
     }

WooCommerce/Classes/Authentication/Navigation Exceptions/JetpackSetupWebViewModel.swift

@@ -1,10 +1,14 @@
 import Foundation
 import WebKit
+import WordPressAuthenticator
 
 /// View model used for the web view controller to install Jetpack the plugin during the login flow.
 ///
 final class JetpackSetupWebViewModel: AuthenticatedWebViewModel {
 
+    // Site credentials if available
+    let wporgCredentials: WordPressOrgCredentials?
+
     /// The site URL to set up Jetpack for.
     private let siteURL: String
     private let analytics: Analytics
@@ -15,8 +19,12 @@ final class JetpackSetupWebViewModel: AuthenticatedWebViewModel {
     /// The email address that the user uses to authorize Jetpack
     private var authorizedEmailAddress: String?
 
-    init(siteURL: String, analytics: Analytics = ServiceLocator.analytics, onCompletion: @escaping (String?) -> Void) {
+    init(siteURL: String,
+         siteCredentials: WordPressOrgCredentials?,
+         analytics: Analytics = ServiceLocator.analytics,
+         onCompletion: @escaping (String?) -> Void) {
         self.siteURL = siteURL
+        self.wporgCredentials = siteCredentials
         self.analytics = analytics
         self.completionHandler = onCompletion
     }