PIA-000: Handle Onboarding screens inside the Authenticated flow

PIA VPN-tvOS/Navigation/AppRouter.swift

@@ -9,8 +9,11 @@ protocol AppRouterType {
     func navigate(to destination: any Destinations)
     func pop()
     func goBackToRoot()
+
+    func execute(action: AppRouter.Actions)
 }
 
+
 // AppRouter enables any component to navigate the user to any screen defined within Destinations
 class AppRouter: ObservableObject, AppRouterType {
 
@@ -38,14 +41,24 @@ class AppRouter: ObservableObject, AppRouterType {
     func goBackToRoot() {
         path.removeLast(path.count)
     }
-
+    /*
+    func execute(action: AppRouter.Actions) {
+        switch action {
+        case .pop:
+            pop()
+        case .goBackToRoot:
+            goBackToRoot()
+        case .navigate(let destination):
+            navigate(to: destination)
+        }
+    }
+    */
 }
 
 
 extension AppRouter {
 
     enum Actions: Equatable {
-
         case pop(router: AppRouterType)
         case goBackToRoot(router: AppRouterType)
         case navigate(router: AppRouterType, destination: any Destinations)
@@ -74,5 +87,4 @@ extension AppRouter {
         }
 
     }
-
 }

PIA VPN-tvOS/Navigation/Destinations.swift

@@ -10,7 +10,6 @@ import Foundation
 
 typealias Destinations = Hashable
 
-
 enum DashboardDestinations: Destinations {
     case home
 }

PIA VPN-tvOS/Navigation/Routes.swift

@@ -15,7 +15,6 @@ enum AuthenticationDestinations: Destinations {
 
 enum OnboardingDestinations: Destinations {
     case installVPNProfile
-    case dashboard
 }
 
 public extension View {
@@ -33,8 +32,6 @@ public extension View {
             switch destination {
                 case .installVPNProfile:
                     VPNConfigurationInstallingFactory.makeVPNConfigurationInstallingView()
-                case .dashboard:
-                    UserActivatedContainerFactory.makeUSerActivatedContainerView()
             }
         }
     }

PIA VPN-tvOS/RootContainer/CompositionRoot/RootContainerFactory.swift

@@ -11,9 +11,10 @@ class RootContainerFactory {
         guard let defaultAccountProvider = Client.providers.accountProvider as? DefaultAccountProvider else {
             fatalError("Incorrect account provider type")
         }
-        return RootContainerViewModel(accountProvider: defaultAccountProvider, 
+        return RootContainerViewModel(accountProvider: defaultAccountProvider,
                                       vpnConfigurationAvailability: VPNConfigurationAvailability(), 
                                       bootstrap: BootstraperFactory.makeBootstrapper(), 
-                                      userAuthenticationStatusMonitor: StateMonitorsFactory.makeUserAuthenticationStatusMonitor())
+                                      userAuthenticationStatusMonitor: StateMonitorsFactory.makeUserAuthenticationStatusMonitor(),
+                                      appRouter: AppRouterFactory.makeAppRouter())
     }
 }

PIA VPN-tvOS/RootContainer/Presentation/RootContainerViewModel.swift

@@ -20,23 +20,21 @@ class RootContainerViewModel: ObservableObject {
     private let vpnConfigurationAvailability: VPNConfigurationAvailabilityType
     private let bootstrap: BootstraperType
     private let userAuthenticationStatusMonitor: UserAuthenticationStatusMonitorType
+    private let appRouter: AppRouterType
     private var cancellables = Set<AnyCancellable>()
 
-    init(accountProvider: AccountProviderType, notificationCenter: NotificationCenterType = NotificationCenter.default, vpnConfigurationAvailability: VPNConfigurationAvailabilityType, bootstrap: BootstraperType, userAuthenticationStatusMonitor: UserAuthenticationStatusMonitorType) {
+    init(accountProvider: AccountProviderType, notificationCenter: NotificationCenterType = NotificationCenter.default, vpnConfigurationAvailability: VPNConfigurationAvailabilityType, bootstrap: BootstraperType, userAuthenticationStatusMonitor: UserAuthenticationStatusMonitorType, appRouter: AppRouterType) {
 
         self.accountProvider = accountProvider
         self.notificationCenter = notificationCenter
         self.vpnConfigurationAvailability = vpnConfigurationAvailability
         self.bootstrap = bootstrap
         self.userAuthenticationStatusMonitor = userAuthenticationStatusMonitor
+        self.appRouter = appRouter
         updateState()
         subscribeToAccountUpdates()
     }
 
-    deinit {
-        notificationCenter.removeObserver(self)
-    }
-
     func phaseDidBecomeActive() {
         bootstrap()
         isBootstrapped = true
@@ -56,6 +54,7 @@ class RootContainerViewModel: ObservableObject {
             state = .activated
             // logged in, vpn profile not installed
         case (true, false):
+            appRouter.navigate(to: OnboardingDestinations.installVPNProfile)
             state = .activatedNotOnboarded
             // not logged in, any
         case (false, _):

PIA VPN-tvOS/RootContainer/UI/RootContainerView.swift

@@ -25,11 +25,9 @@ struct RootContainerView: View {
                     LoginFactory.makeLoginView()
                         .withAuthenticationRoutes()
                         .withOnboardingRoutes()
-                case .activatedNotOnboarded:
-                    VPNConfigurationInstallingFactory.makeVPNConfigurationInstallingView()
-                        .withOnboardingRoutes()
-                case .activated:
+                case .activatedNotOnboarded, .activated:
                     UserActivatedContainerFactory.makeUSerActivatedContainerView()
+                        .withOnboardingRoutes()
                 }
         }.onChange(of: scenePhase) { _, newPhase in
             if newPhase == .active {

PIA VPN-tvOS/VPNConfigurationInstalling/CompositionRoot/VPNConfigurationInstallingFactory.swift

@@ -26,8 +26,7 @@ class VPNConfigurationInstallingFactory {
         VPNConfigurationInstallingViewModel(installVPNConfiguration: 
                                                 makeInstallVPNConfigurationUseCase(), 
                                             errorMapper: VPNConfigurationInstallingErrorMapper(),
-                                            appRouter: AppRouter.shared,
-                                            successDestination: OnboardingDestinations.dashboard)
+                                            appRouter: AppRouter.shared, onSuccessAction: .goBackToRoot)
     }
 
     private static func makeInstallVPNConfigurationUseCase() -> InstallVPNConfigurationUseCaseType {

PIA VPN-tvOS/VPNConfigurationInstalling/Presentation/VPNConfigurationInstallingViewModel.swift

@@ -12,18 +12,17 @@ class VPNConfigurationInstallingViewModel: ObservableObject {
     private let installVPNConfiguration: InstallVPNConfigurationUseCaseType
     private let errorMapper: VPNConfigurationInstallingErrorMapper
     private let appRouter: AppRouterType
+    private let onSuccessAction: AppRouter.Actions
 
     @Published var shouldShowErrorMessage = false
     @Published var installingStatus: VPNConfigurationInstallingStatus = .none
     var errorMessage: String?
 
-    private let successDestination: any Destinations
-
-    init(installVPNConfiguration: InstallVPNConfigurationUseCaseType, errorMapper: VPNConfigurationInstallingErrorMapper, appRouter: AppRouterType, successDestination: any Destinations) {
+    init(installVPNConfiguration: InstallVPNConfigurationUseCaseType, errorMapper: VPNConfigurationInstallingErrorMapper, appRouter: AppRouterType, onSuccessAction: AppRouter.Actions) {
         self.installVPNConfiguration = installVPNConfiguration
         self.errorMapper = errorMapper
         self.appRouter = appRouter
-        self.successDestination = successDestination
+        self.onSuccessAction = onSuccessAction
     }
 
     func install() {
@@ -38,7 +37,7 @@ class VPNConfigurationInstallingViewModel: ObservableObject {
                 try await installVPNConfiguration()
                 Task { @MainActor in
                     installingStatus = .succeeded
-                    appRouter.navigate(to: successDestination)
+                    appRouter.execute(action: onSuccessAction)
                 }
             } catch {
                 errorMessage = errorMapper.map(error: error)

PIA VPN-tvOSTests/Common/Mocks/AppRouterSpy.swift

@@ -10,6 +10,7 @@ import Foundation
 @testable import PIA_VPN_tvOS
 
 class AppRouterSpy: AppRouterType {
+
     enum Request: Equatable {
         static func == (lhs: AppRouterSpy.Request, rhs: AppRouterSpy.Request) -> Bool {
             switch (lhs, rhs) {
@@ -55,4 +56,13 @@ class AppRouterSpy: AppRouterType {
         requests.append(.goBackToRoot)
         didGetARequest?()
     }
+
+    func execute(action: AppRouter.Actions) {
+        switch action {
+        case .pop: pop()
+        case .goBackToRoot: goBackToRoot()
+        case .navigate(let destination): navigate(to: destination)
+        }
+    }
+
 }

PIA VPN-tvOSTests/RootContainer/RootContainerViewModelTests.swift

@@ -9,19 +9,20 @@
 import XCTest
 import Combine
 @testable import PIA_VPN_tvOS
+import SwiftUI
 
 final class RootContainerViewModelTests: XCTestCase {
 
     final class Fixture {
         let accountProvierMock = AccountProviderTypeMock()
         let notificationCenterMock = NotificationCenterMock()
         var vpnConfigurationAvailabilityMock = VPNConfigurationAvailabilityMock(value: false)
+        let appRouterSpy = AppRouterSpy()
         let bootstrapMock = BootstraperMock()
 
         func makeUserAuthenticationStatusMonitorMock(status: UserAuthenticationStatus) -> UserAuthenticationStatusMonitorMock {
             return UserAuthenticationStatusMonitorMock(status: status)
         }
-
     }
 
     var fixture: Fixture!
@@ -38,11 +39,12 @@ final class RootContainerViewModelTests: XCTestCase {
     }
 
     private func initializeSut(bootStrapped: Bool = true) {
-        sut = RootContainerViewModel(accountProvider: fixture.accountProvierMock, 
+        sut = RootContainerViewModel(accountProvider: fixture.accountProvierMock,
                                      notificationCenter: fixture.notificationCenterMock,
                                      vpnConfigurationAvailability: fixture.vpnConfigurationAvailabilityMock, 
                                      bootstrap: fixture.bootstrapMock, 
-                                     userAuthenticationStatusMonitor: fixture.makeUserAuthenticationStatusMonitorMock(status: .loggedOut))
+                                     userAuthenticationStatusMonitor: fixture.makeUserAuthenticationStatusMonitorMock(status: .loggedOut),
+                                     appRouter: fixture.appRouterSpy)
         sut.isBootstrapped = bootStrapped
     }
 
@@ -57,6 +59,9 @@ final class RootContainerViewModelTests: XCTestCase {
 
         // THEN the state becomes 'notActivated'
         XCTAssertEqual(sut.state, .notActivated)
+
+        // AND no navigation requests are sent to the router
+        XCTAssertEqual(fixture.appRouterSpy.requests, [])
     }
 
     func testState_WhenUserIsAuthenticatedAndVpnProfileNotInstalled() {
@@ -72,6 +77,9 @@ final class RootContainerViewModelTests: XCTestCase {
 
         // THEN the state becomes 'activatedNotOnboarded'
         XCTAssertEqual(sut.state, .activatedNotOnboarded)
+
+        // AND the router is called to navigate to the Onboarding Install VPN profile
+        XCTAssertEqual(fixture.appRouterSpy.requests, [AppRouterSpy.Request.navigate(OnboardingDestinations.installVPNProfile)])
     }
 
     func testState_WhenUserIsAuthenticatedAndVpnProfileInstalled() {
@@ -87,6 +95,9 @@ final class RootContainerViewModelTests: XCTestCase {
 
         // THEN the state becomes 'activated'
         XCTAssertEqual(sut.state, .activated)
+
+        // AND no navigation requests are sent to the router
+        XCTAssertEqual(fixture.appRouterSpy.requests, [])
     }
 
     func testBoostrapperIsCalled_WhenAppIsLaunched() {
@@ -112,7 +123,8 @@ final class RootContainerViewModelTests: XCTestCase {
                                      notificationCenter: fixture.notificationCenterMock,
                                      vpnConfigurationAvailability: fixture.vpnConfigurationAvailabilityMock,
                                      bootstrap: fixture.bootstrapMock,
-                                     userAuthenticationStatusMonitor: userAuthenticationStatusMonitor)
+                                     userAuthenticationStatusMonitor: userAuthenticationStatusMonitor, 
+                                     appRouter: fixture.appRouterSpy)
 
         // AND the app is launched
         sut.phaseDidBecomeActive()
@@ -138,7 +150,8 @@ final class RootContainerViewModelTests: XCTestCase {
                                      notificationCenter: fixture.notificationCenterMock,
                                      vpnConfigurationAvailability: fixture.vpnConfigurationAvailabilityMock,
                                      bootstrap: fixture.bootstrapMock,
-                                     userAuthenticationStatusMonitor: userAuthenticationStatusMonitor)
+                                     userAuthenticationStatusMonitor: userAuthenticationStatusMonitor,
+                                    appRouter: fixture.appRouterSpy)
 
         // AND the app is launched
         sut.phaseDidBecomeActive()

PIA VPN-tvOSTests/VPNConfigurationInstalling/VPNConfigurationInstallingViewModelTests.swift

@@ -35,14 +35,18 @@ final class VPNConfigurationInstallingViewModelTests: XCTestCase {
         fixture = nil
         cancellables = nil
     }
-
-    func test_install_fails_when_installVPNConfiguration_fails() {
-        // GIVEN
+
+    func instantiateSut(with installConfigError: InstallVPNConfigurationError? = nil) {
         sut = VPNConfigurationInstallingViewModel(
-            installVPNConfiguration: fixture.makeInstallVPNConfiguration(error: .userCanceled),
+            installVPNConfiguration: fixture.makeInstallVPNConfiguration(error: installConfigError),
             errorMapper: fixture.errorMapper,
             appRouter: fixture.appRouterSpy,
-            successDestination: OnboardingDestinations.dashboard)
+            onSuccessAction: AppRouter.Actions.goBackToRoot)
+    }
+
+    func test_install_fails_when_installVPNConfiguration_fails() {
+        // GIVEN
+        instantiateSut(with: .userCanceled)
 
         let expectation = expectation(description: "Waiting for installing to finish with error message")
         let expectedErrorMessage = "We need this permission for the application to function."
@@ -70,11 +74,7 @@ final class VPNConfigurationInstallingViewModelTests: XCTestCase {
 
     func test_install_succeeds_when_installVPNConfiguration_succeeds() {
         // GIVEN
-        sut = VPNConfigurationInstallingViewModel(
-            installVPNConfiguration: fixture.makeInstallVPNConfiguration(error: nil),
-            errorMapper: fixture.errorMapper,
-            appRouter: fixture.appRouterSpy,
-            successDestination: OnboardingDestinations.dashboard)
+        instantiateSut()
 
         let expectation = expectation(description: "Waiting for installing to finish successfully")
         var capturedInstallingStatuses = [VPNConfigurationInstallingStatus]()
@@ -89,10 +89,10 @@ final class VPNConfigurationInstallingViewModelTests: XCTestCase {
         sut.install()
 
         // THEN
-        wait(for: [expectation], timeout: 1)
+        wait(for: [expectation], timeout: 2)
         XCTAssertEqual(capturedInstallingStatuses, [.isInstalling, .succeeded])
         XCTAssertFalse(sut.shouldShowErrorMessage)
         XCTAssertNil(sut.errorMessage)
-        XCTAssertEqual(fixture.appRouterSpy.requests, [.navigate(OnboardingDestinations.dashboard)])
+        XCTAssertEqual(fixture.appRouterSpy.requests, [.goBackToRoot])
     }
 }