Remove siteCredentials from JetpackSetupWebViewModel

Author: itsmeichigo

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

@@ -66,10 +66,9 @@ struct JetpackErrorViewModel: ULErrorViewModel {
         }
 
         let viewModel = JetpackSetupWebViewModel(siteURL: siteURL,
-                                                 siteCredentials: siteCredentials,
                                                  analytics: analytics,
                                                  onCompletion: jetpackSetupCompletionHandler)
-        let connectionController = AuthenticatedWebViewController(viewModel: viewModel)
+        let connectionController = AuthenticatedWebViewController(viewModel: viewModel, wporgCredentials: siteCredentials)
         viewController.navigationController?.show(connectionController, sender: nil)
     }
 

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

@@ -1,14 +1,10 @@
 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
@@ -20,11 +16,9 @@ final class JetpackSetupWebViewModel: AuthenticatedWebViewModel {
     private var authorizedEmailAddress: String?
 
     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
     }

WooCommerce/WooCommerceTests/Authentication/JetpackSetupWebViewModelTests.swift

@@ -6,7 +6,7 @@ final class JetpackSetupWebViewModelTests: XCTestCase {
     func test_initial_url_is_correct() {
         // Given
         let siteURL = "https://test.com"
-        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL, siteCredentials: nil, onCompletion: {_ in })
+        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL, onCompletion: {_ in })
 
         // Then
         let expectedURL = "https://wordpress.com/jetpack/connect?url=https://test.com&mobile_redirect=woocommerce://jetpack-connected&from=mobile"
@@ -20,7 +20,7 @@ final class JetpackSetupWebViewModelTests: XCTestCase {
         let completionHandler: (String?) -> Void = { _ in
             triggeredCompletion = true
         }
-        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL, siteCredentials: nil, onCompletion: completionHandler)
+        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL, onCompletion: completionHandler)
 
         // When
         let url = try XCTUnwrap(URL(string: "woocommerce://jetpack-connected"))
@@ -39,7 +39,7 @@ final class JetpackSetupWebViewModelTests: XCTestCase {
         let completionHandler: (String?) -> Void = { email in
             authorizedEmail = email
         }
-        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL, siteCredentials: nil, onCompletion: completionHandler)
+        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL, onCompletion: completionHandler)
 
         // When
         let authorizeURL = try XCTUnwrap(URL(string: "https://jetpack.wordpress.com/jetpack.authorize?user_email=\(expectedEmail)"))
@@ -57,7 +57,7 @@ final class JetpackSetupWebViewModelTests: XCTestCase {
         let siteURL = "https://test.com"
         let analyticsProvider = MockAnalyticsProvider()
         let analytics = WooAnalytics(analyticsProvider: analyticsProvider)
-        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL, siteCredentials: nil, analytics: analytics, onCompletion: { _ in })
+        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL, analytics: analytics, onCompletion: { _ in })
 
         // When
         viewModel.handleDismissal()
@@ -73,7 +73,7 @@ final class JetpackSetupWebViewModelTests: XCTestCase {
         let siteURL = "https://test.com"
         let analyticsProvider = MockAnalyticsProvider()
         let analytics = WooAnalytics(analyticsProvider: analyticsProvider)
-        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL, siteCredentials: nil, analytics: analytics, onCompletion: { _ in })
+        let viewModel = JetpackSetupWebViewModel(siteURL: siteURL, analytics: analytics, onCompletion: { _ in })
 
         // When
         let url = try XCTUnwrap(URL(string: "woocommerce://jetpack-connected"))