Jetpack Setup: Fix issue removing application password (#14929)

woocommerce · Jan 24, 2025 · ab53700 · ab53700
2 parents 65a7b39 + aa05cb4
commit ab53700
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -7,6 +7,7 @@
 - [*] Receipts: Email receipts can now be sent to customers after failed payments using WooCommerce Stripe 9.1.0+. [https://github.com/woocommerce/woocommerce-ios/pull/14864].
 - [*] Order Creation: orders are always created using the store's currency, not the user's [https://github.com/woocommerce/woocommerce-ios/pull/14907]
 - [*] Dashboard: Updated the drag gesture on the Performance chart to show stats instantly. [https://github.com/woocommerce/woocommerce-ios/pull/14906]
+- [*] Jetpack Setup: Fix issue setting up Jetpack for JCP sites when authenticated without WPCom and removing application password after completion [https://github.com/woocommerce/woocommerce-ios/pull/14929]
 - [Internal] Removed feedback survey for Store Setup feature [https://github.com/woocommerce/woocommerce-ios/pull/14888]
 - [Internal] Removed feedback survey for shipping label creation [https://github.com/woocommerce/woocommerce-ios/pull/14889]
 - [Internal] Removed feedback survey for product creation AI [https://github.com/woocommerce/woocommerce-ios/pull/14890]

diff --git a/WooCommerce/Classes/System/SessionManager.swift b/WooCommerce/Classes/System/SessionManager.swift
@@ -219,9 +219,9 @@ final class SessionManager: SessionManagerProtocol {
 
     /// Deletes application password
     ///
-    func deleteApplicationPassword() {
+    func deleteApplicationPassword(using credentials: Credentials?) {
         let useCase: ApplicationPasswordUseCase? = {
-            switch loadCredentials() {
+            switch credentials ?? loadCredentials() {
             case let .wporg(username, password, siteAddress):
                 return try? DefaultApplicationPasswordUseCase(username: username,
                                                               password: password,

diff --git a/WooCommerce/Classes/ViewRelated/JetpackSetup/JetpackSetupCoordinator.swift b/WooCommerce/Classes/ViewRelated/JetpackSetup/JetpackSetupCoordinator.swift
@@ -257,11 +257,11 @@ private extension JetpackSetupCoordinator {
         let progressView = InProgressViewController(viewProperties: .init(title: Localization.syncingData, message: ""))
         rootViewController.topmostPresentedViewController.present(progressView, animated: true)
 
-        let action = SiteAction.syncSiteByDomain(domain: site.url.trimHTTPScheme()) { [weak self] result in
+        let resultHandler: (Result<Site, Error>) -> Void = { [weak self] result in
             guard let self else { return }
             switch result {
             case .success(let site):
-                self.stores.sessionManager.deleteApplicationPassword()
+                self.stores.sessionManager.deleteApplicationPassword(using: previousCredentials)
                 self.stores.updateDefaultStore(storeID: site.siteID)
                 self.stores.synchronizeEntities { [weak self] in
                     self?.stores.updateDefaultStore(site)
@@ -289,7 +289,12 @@ private extension JetpackSetupCoordinator {
 
             }
         }
-        stores.dispatch(action)
+
+        if site.isJetpackCPConnected {
+            stores.dispatch(AccountAction.synchronizeSitesAndReturnSelectedSiteInfo(siteAddress: site.url, onCompletion: resultHandler))
+        } else {
+            stores.dispatch(SiteAction.syncSiteByDomain(domain: site.url.trimHTTPScheme(), completion: resultHandler))
+        }
     }
 
     func registerForPushNotifications() {

diff --git a/WooCommerce/WooCommerceTests/Yosemite/StoresManagerTests.swift b/WooCommerce/WooCommerceTests/Yosemite/StoresManagerTests.swift
@@ -535,6 +535,10 @@ final class MockSessionManager: SessionManagerProtocol {
         // Do nothing
     }
 
+    func deleteApplicationPassword(using credentials: Credentials?) {
+        deleteApplicationPasswordInvoked = true
+    }
+
     func deleteApplicationPassword() {
         deleteApplicationPasswordInvoked = true
     }

diff --git a/Yosemite/Yosemite/Base/SessionManagerProtocol.swift b/Yosemite/Yosemite/Base/SessionManagerProtocol.swift
@@ -51,5 +51,13 @@ public protocol SessionManagerProtocol {
 
     /// Deletes application password
     ///
-    func deleteApplicationPassword()
+    func deleteApplicationPassword(using credentials: Credentials?)
+}
+
+/// Helper methods
+public extension SessionManagerProtocol {
+    /// Let the session manager figure out the credentials by itself
+    func deleteApplicationPassword() {
+        deleteApplicationPassword(using: nil)
+    }
 }
diff --git a/Yosemite/Yosemite/Model/Mocks/MockSessionManager.swift b/Yosemite/Yosemite/Model/Mocks/MockSessionManager.swift
@@ -43,7 +43,7 @@ public struct MockSessionManager: SessionManagerProtocol {
         // Do nothing
     }
 
-    public func deleteApplicationPassword() {
+    public func deleteApplicationPassword(using credentials: Credentials?) {
         // Do nothing
     }
 }