Revert changes to app password deletion

Author: itsmeichigo

WooCommerce/Classes/System/SessionManager.swift

@@ -200,6 +200,7 @@ final class SessionManager: SessionManagerProtocol {
     /// Nukes all of the known Session's properties.
     ///
     func reset() {
+        deleteApplicationPassword()
         defaultAccount = nil
         defaultCredentials = nil
         defaultStoreID = nil

WooCommerce/Classes/Yosemite/DefaultStoresManager.swift

@@ -246,11 +246,6 @@ class DefaultStoresManager: StoresManager {
         applicationPasswordGenerationFailureObserver = nil
 
         if isAuthenticated {
-            if case .wpcom = sessionManager.defaultCredentials {
-                // TODO: fetch site list and delete password for each site
-            } else {
-                sessionManager.deleteApplicationPassword()
-            }
             let resetAction = CardPresentPaymentAction.reset
             dispatch(resetAction)
         }

WooCommerce/WooCommerceTests/System/SessionManagerTests.swift

@@ -106,6 +106,28 @@ final class SessionManagerTests: XCTestCase {
         }
     }
 
+    /// Verifies that application password is deleted upon reset
+    ///
+    func test_application_password_is_deleted_upon_reset() {
+        // Given
+        manager.defaultCredentials = Settings.wporgCredentials
+        let storage = ApplicationPasswordStorage(keychain: Keychain(service: Settings.keychainServiceName))
+
+        // When
+        storage.saveApplicationPassword(applicationPassword)
+
+        // Then
+        XCTAssertNotNil(storage.applicationPassword)
+
+        // When
+        manager.reset()
+
+        // Then
+        waitUntil {
+            storage.applicationPassword == nil
+        }
+    }
+
     /// Verifies that `storePhoneNumber` is set to `nil` upon reset
     ///
     func test_storePhoneNumber_is_set_to_nil_upon_reset() throws {

WooCommerce/WooCommerceTests/Yosemite/StoresManagerTests.swift

@@ -421,32 +421,6 @@ final class StoresManagerTests: XCTestCase {
         XCTAssertNil(defaults[UserDefaults.Key.numberOfTimesWriteWithAITooltipIsShown])
     }
 
-    func test_deauthenticate_triggers_deleteApplicationPassword_in_sessionManager_when_authenticated_with_site_credentials() {
-        // Given
-        let mockSessionManager = MockSessionManager()
-        mockSessionManager.defaultCredentials = .wporg(username: "miffy", password: "secret", siteAddress: "https://example.com")
-        let sut = DefaultStoresManager(sessionManager: mockSessionManager)
-
-        // When
-        sut.deauthenticate()
-
-        // Then
-        XCTAssertTrue(mockSessionManager.deleteApplicationPasswordInvoked)
-    }
-
-    func test_deauthenticate_triggers_deleteApplicationPassword_in_sessionManager_when_authenticated_with_app_password() {
-        // Given
-        let mockSessionManager = MockSessionManager()
-        mockSessionManager.defaultCredentials = .applicationPassword(username: "miffy", password: "secret", siteAddress: "https://example.com")
-        let sut = DefaultStoresManager(sessionManager: mockSessionManager)
-
-        // When
-        sut.deauthenticate()
-
-        // Then
-        XCTAssertTrue(mockSessionManager.deleteApplicationPasswordInvoked)
-    }
-
     /// Verifies that user is logged out when application password regeneration fails
     ///
     func test_it_deauthenticates_upon_receiving_application_password_generation_failure_notification() {