Fix Tic Tac Toe Optional Bug (#291)

Author: stephencelis

Examples/TicTacToe/Sources/Core/LoginCore.swift

@@ -95,7 +95,7 @@ public let loginReducer =
 
       case .twoFactorDismissed:
         state.twoFactor = nil
-        return .none
+        return .cancel(id: TwoFactorTearDownToken())
       }
     }
   )

Examples/TicTacToe/Sources/Core/TwoFactorCore.swift

@@ -23,6 +23,10 @@ public enum TwoFactorAction: Equatable {
   case twoFactorResponse(Result<AuthenticationResponse, AuthenticationError>)
 }
 
+public struct TwoFactorTearDownToken: Hashable {
+  public init() {}
+}
+
 public struct TwoFactorEnvironment {
   public var authenticationClient: AuthenticationClient
   public var mainQueue: DateScheduler
@@ -56,6 +60,7 @@ public let twoFactorReducer = Reducer<TwoFactorState, TwoFactorAction, TwoFactor
       .observe(on: environment.mainQueue)
       .catchToEffect()
       .map(TwoFactorAction.twoFactorResponse)
+      .cancellable(id: TwoFactorTearDownToken())
 
   case let .twoFactorResponse(.failure(error)):
     state.alert = .init(title: .init(error.localizedDescription))

Examples/TicTacToe/Tests/LoginCoreTests.swift

@@ -61,4 +61,51 @@ class LoginCoreTests: XCTestCase {
       }
     )
   }
+
+  func testFlow_DismissEarly_TwoFactor_Integration() {
+    let store = TestStore(
+      initialState: LoginState(),
+      reducer: loginReducer,
+      environment: LoginEnvironment(
+        authenticationClient: .mock(
+          login: { _ in
+            Effect(value: .init(token: "deadbeefdeadbeef", twoFactorRequired: true))
+          },
+          twoFactor: { _ in
+            Effect(value: .init(token: "deadbeefdeadbeef", twoFactorRequired: false))
+          }
+        ),
+        mainQueue: AnyScheduler(self.scheduler)
+      )
+    )
+
+    store.assert(
+      .send(.emailChanged("[email protected]")) {
+        $0.email = "[email protected]"
+      },
+      .send(.passwordChanged("password")) {
+        $0.password = "password"
+        $0.isFormValid = true
+      },
+      .send(.loginButtonTapped) {
+        $0.isLoginRequestInFlight = true
+      },
+      .do { self.scheduler.advance() },
+      .receive(.loginResponse(.success(.init(token: "deadbeefdeadbeef", twoFactorRequired: true))))
+      {
+        $0.isLoginRequestInFlight = false
+        $0.twoFactor = TwoFactorState(token: "deadbeefdeadbeef")
+      },
+      .send(.twoFactor(.codeChanged("1234"))) {
+        $0.twoFactor?.code = "1234"
+        $0.twoFactor?.isFormValid = true
+      },
+      .send(.twoFactor(.submitButtonTapped)) {
+        $0.twoFactor?.isTwoFactorRequestInFlight = true
+      },
+      .send(.twoFactorDismissed) {
+        $0.twoFactor = nil
+      }
+    )
+  }
 }