PM-9003: Fix never lock with logout action error (#724)

Author: matt-livefront

BitwardenShared/Core/Auth/Repositories/TestHelpers/MockAuthRepository.swift

@@ -57,6 +57,7 @@ class MockAuthRepository: AuthRepository { // swiftlint:disable:this type_body_l
     var unlockVaultResult: Result<Void, Error> = .success(())
     var unlockVaultWithBiometricsResult: Result<Void, Error> = .success(())
     var unlockVaultWithDeviceKeyResult: Result<Void, Error> = .success(())
+    var unlockVaultWithNeverlockKeyCalled = false
     var unlockVaultWithNeverlockResult: Result<Void, Error> = .success(())
     var verifyOtpOpt: String?
     var verifyOtpResult: Result<Void, Error> = .success(())
@@ -266,7 +267,8 @@ class MockAuthRepository: AuthRepository { // swiftlint:disable:this type_body_l
     }
 
     func unlockVaultWithNeverlockKey() async throws {
-        try unlockVaultWithNeverlockResult.get()
+        unlockVaultWithNeverlockKeyCalled = true
+        return try unlockVaultWithNeverlockResult.get()
     }
 
     /// Attempts to convert a possible user id into a known account id.

BitwardenShared/UI/Auth/AuthRouterTests.swift

@@ -711,6 +711,20 @@ final class AuthRouterTests: BitwardenTestCase { // swiftlint:disable:this type_
         )
     }
 
+    /// `handleAndRoute(_ :)` redirects `.didStart` to `.complete` and unlocks the vault if the
+    /// account never times out with a logout timeout action.
+    func test_handleAndRoute_didStart_neverLockLogout() async {
+        let account = Account.fixtureAccountLogin()
+        authRepository.activeAccount = account
+        authRepository.sessionTimeoutAction[account.profile.userId] = .logout
+        vaultTimeoutService.vaultTimeout[account.profile.userId] = .never
+
+        let route = await subject.handleAndRoute(.didStart)
+
+        XCTAssertEqual(route, .complete)
+        XCTAssertTrue(authRepository.unlockVaultWithNeverlockKeyCalled)
+    }
+
     /// `handleAndRoute(_ :)` redirects `.didStart` to `.landing`
     ///     when there are no accounts.
     func test_handleAndRoute_didStart_noAccounts() async {

BitwardenShared/UI/Auth/Extensions/AuthRouter+Redirects.swift

@@ -209,9 +209,9 @@ extension AuthRouter {
         }
 
         // Check for a `logout` timeout action.
-        let timeoutAction = try? await services.authRepository
-            .sessionTimeoutAction(userId: activeAccount.profile.userId)
-        if timeoutAction == .logout {
+        let userId = activeAccount.profile.userId
+        if await (try? services.authRepository.sessionTimeoutAction(userId: userId)) == .logout,
+           await (try? services.vaultTimeoutService.sessionTimeoutValue(userId: userId)) != .never {
             return await handleAndRoute(.didTimeout(userId: activeAccount.profile.userId))
         }
 

BitwardenShared/UI/Platform/Application/Extensions/UITabBarControllerExtensionsTests.swift

@@ -3,9 +3,9 @@ import XCTest
 
 @testable import BitwardenShared
 
-// MARK: - UITabBarControllerTests
+// MARK: - UITabBarControllerExtensionsTests
 
-class UITabBarControllerTests: BitwardenTestCase {
+class UITabBarControllerExtensionsTests: BitwardenTestCase {
     var module: MockAppModule!
     var coordinator: TabCoordinator!
     var rootNavigator: MockRootNavigator!