Switch to save unsupported list

Author: itsmeichigo

Modules/Sources/NetworkingCore/ApplicationPassword/RequestAuthenticator.swift

@@ -10,6 +10,8 @@ protocol RequestAuthenticator {
     ///
     var credentials: Credentials? { get }
 
+    var jetpackSiteID: Int64? { get }
+
     /// Authenticates the provided urlRequest using the `credentials`
     ///
     /// - Parameter urlRequest: `URLRequest` to authenticate
@@ -37,6 +39,10 @@ public struct DefaultRequestAuthenticator: RequestAuthenticator {
     ///
     let credentials: Credentials?
 
+    /// ID of current site if Jetpack site
+    ///
+    let jetpackSiteID: Int64?
+
     /// The use case to handle authentication with application passwords.
     ///
     private let applicationPasswordUseCase: ApplicationPasswordUseCase?
@@ -86,6 +92,8 @@ public struct DefaultRequestAuthenticator: RequestAuthenticator {
                 return selectedSite?.siteAddress
             }
         }()
+
+        jetpackSiteID = selectedSite?.siteID
     }
 
     /// Authenticates the provided urlRequest using the `credentials`

Modules/Sources/NetworkingCore/ApplicationPassword/RequestProcessor.swift

@@ -2,7 +2,7 @@ import Alamofire
 import Foundation
 
 protocol RequestProcessorDelegate: AnyObject {
-    func didFailToAuthenticateRequestWithApplicationPassword()
+    func didFailToAuthenticateRequestWithApplicationPassword(siteID: Int64)
 }
 
 /// Authenticates and retries requests
@@ -18,6 +18,8 @@ final class RequestProcessor: RequestInterceptor {
 
     private var isAuthenticatedWithWPCom = false
 
+    private var currentSiteID: Int64?
+
     weak var delegate: RequestProcessorDelegate?
 
     init(requestAuthenticator: RequestAuthenticator,
@@ -34,6 +36,7 @@ final class RequestProcessor: RequestInterceptor {
             default: false
             }
         }()
+        currentSiteID = authenticator.jetpackSiteID
     }
 }
 
@@ -85,8 +88,8 @@ private extension RequestProcessor {
                 // Post a notification for tracking
                 notificationCenter.post(name: .ApplicationPasswordsGenerationFailed, object: error, userInfo: nil)
 
-                if isAuthenticatedWithWPCom {
-                    await retryPasswordGenerationIfNeeded(with: error)
+                if isAuthenticatedWithWPCom, let currentSiteID {
+                    await retryPasswordGenerationIfNeeded(error: error, siteID: currentSiteID)
                 } else {
                     isAuthenticating = false
                     completeRequests(false)
@@ -96,7 +99,7 @@ private extension RequestProcessor {
     }
 
     @MainActor
-    func retryPasswordGenerationIfNeeded(with error: Error) async {
+    func retryPasswordGenerationIfNeeded(error: Error, siteID: Int64) async {
         defer {
             isAuthenticating = false
         }
@@ -112,7 +115,7 @@ private extension RequestProcessor {
         case AFError.responseValidationFailed(reason: .unacceptableStatusCode(code: 404)):
             /// Site doesn't support application password
             completeRequests(false)
-            delegate?.didFailToAuthenticateRequestWithApplicationPassword()
+            delegate?.didFailToAuthenticateRequestWithApplicationPassword(siteID: siteID)
         default:
             completeRequests(false)
         }

Modules/Sources/NetworkingCore/Network/AlamofireNetwork.swift

@@ -79,7 +79,7 @@ public class AlamofireNetwork: Network {
 
     public func updateAppPasswordSwitching(enabled: Bool) {
         guard let credentials, case .wpcom = credentials else { return }
-        if enabled, let selectedSite, !userDefaults.applicationPasswordUnsupported {
+        if enabled, let selectedSite {
             observeSelectedSite(selectedSite)
         } else {
             requestConverter = RequestConverter(siteAddress: nil)
@@ -198,10 +198,12 @@ private extension AlamofireNetwork {
     func observeSelectedSite(_ selectedSite: AnyPublisher<JetpackSite?, Never>) {
         subscription = selectedSite
             .removeDuplicates()
-            .combineLatest(userDefaults.publisher(for: \.applicationPasswordUnsupported))
-            .sink { [weak self] site, appPasswordUnsupported in
+            .combineLatest(userDefaults.publisher(for: \.applicationPasswordUnsupportedList))
+            .print("✨")
+            .sink { [weak self] site, unsupportedList in
                 guard let self else { return }
-                guard let site, site.applicationPasswordAvailable, !appPasswordUnsupported else {
+                guard let site, site.applicationPasswordAvailable,
+                      unsupportedList.contains(site.siteID) == false else {
                     requestConverter = RequestConverter(siteAddress: nil)
                     requestAuthenticator.updateAuthenticator(DefaultRequestAuthenticator(credentials: credentials))
                     requestAuthenticator.delegate = nil
@@ -221,8 +223,9 @@ private extension AlamofireNetwork {
 // MARK: `RequestProcessorDelegate` conformance
 //
 extension AlamofireNetwork: RequestProcessorDelegate {
-    func didFailToAuthenticateRequestWithApplicationPassword() {
-        userDefaults.applicationPasswordUnsupported = false
+    func didFailToAuthenticateRequestWithApplicationPassword(siteID: Int64) {
+        let currentList = userDefaults.applicationPasswordUnsupportedList
+        userDefaults.applicationPasswordUnsupportedList = currentList + [siteID]
     }
 }
 
@@ -271,12 +274,12 @@ extension Alamofire.DataResponse {
 // MARK: - Helper extension to save internal flag for app password availability
 //
 extension UserDefaults {
-    @objc dynamic var applicationPasswordUnsupported: Bool {
-        get { bool(forKey: Key.applicationPasswordUnsupported.rawValue) }
-        set { setValue(newValue, forKey: Key.applicationPasswordUnsupported.rawValue) }
+    @objc dynamic var applicationPasswordUnsupportedList: [Int64] {
+        get { value(forKey: Key.applicationPasswordUnsupportedList.rawValue) as? [Int64] ?? [] }
+        set { setValue(newValue, forKey: Key.applicationPasswordUnsupportedList.rawValue) }
     }
 
     enum Key: String {
-        case applicationPasswordUnsupported
+        case applicationPasswordUnsupportedList
     }
 }

Modules/Tests/NetworkingTests/ApplicationPassword/RequestProcessorTests.swift

@@ -302,6 +302,7 @@ final class RequestProcessorTests: XCTestCase {
         let request = try mockRequest()
         let wpcomCredentials = Networking.Credentials.wpcom(username: "test", authToken: "token", siteAddress: "test.com")
         mockRequestAuthenticator.credentials = wpcomCredentials
+        mockRequestAuthenticator.jetpackSiteID = 123
         let mockDelegate = MockRequestProcessorDelegate()
         sut.updateAuthenticator(mockRequestAuthenticator)
         sut.delegate = mockDelegate
@@ -320,7 +321,7 @@ final class RequestProcessorTests: XCTestCase {
         // Then
         XCTAssertFalse(shouldRetry.retryRequired)
         waitUntil {
-            mockDelegate.didFailToAuthenticateRequestWithApplicationPasswordCalled
+            mockDelegate.didFailToAuthenticateRequestForSiteID == 123
         }
     }
 
@@ -399,6 +400,7 @@ private class MockRequestAuthenticator: RequestAuthenticator {
     private(set) var deleteApplicationPasswordCalled = false
 
     var credentials: Networking.Credentials? = nil
+    var jetpackSiteID: Int64?
 
     var mockErrorWhileGeneratingPassword: Error?
     var mockErrorWhileDeletingPassword: Error?
@@ -450,9 +452,9 @@ private class MockRequest: Alamofire.DataRequest, @unchecked Sendable {
 }
 
 private class MockRequestProcessorDelegate: RequestProcessorDelegate {
-    private(set) var didFailToAuthenticateRequestWithApplicationPasswordCalled = false
+    private(set) var didFailToAuthenticateRequestForSiteID: Int64?
 
-    func didFailToAuthenticateRequestWithApplicationPassword() {
-        didFailToAuthenticateRequestWithApplicationPasswordCalled = true
+    func didFailToAuthenticateRequestWithApplicationPassword(siteID: Int64) {
+        didFailToAuthenticateRequestForSiteID = siteID
     }
 }

WooCommerce/WooCommerceTests/Yosemite/StoresManagerTests.swift

@@ -451,7 +451,9 @@ final class StoresManagerTests: XCTestCase {
         MockNotificationCenter.testingInstance.post(name: .ApplicationPasswordsGenerationFailed, object: error, userInfo: nil)
 
         // Assert
-        XCTAssertFalse(manager.isAuthenticated)
+        waitUntil {
+            manager.isAuthenticated == false
+        }
         XCTAssertEqual(isLoggedInValues, [false, true, false])
     }