Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PM-14259: Fix never lock timeout value doesn't reset on logout #1091

Merged
merged 3 commits into from
Oct 31, 2024
+22 −3
Merged

PM-14259: Fix never lock timeout value doesn't reset on logout #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00e5df1
PM-14259: Fix never lock timeout value doesn't reset on logout
matt-livefront Oct 30, 2024
a944935
PM-14259: Update vault timeout logic
matt-livefront Oct 31, 2024
e29b0ad
Merge branch 'main' into matt/PM-14259-never-lock-missing-key
matt-livefront Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions BitwardenShared/Core/Platform/Services/StateService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1494,11 +1494,19 @@ actor DefaultStateService: StateService { // swiftlint:disable:this type_body_le

func getVaultTimeout(userId: String?) async throws -> SessionTimeoutValue {
let userId = try getAccount(userId: userId).profile.userId
let userAuthKey = try? await keychainRepository.getUserAuthKeyValue(for: .neverLock(userId: userId))
guard let rawValue = appSettingsStore.vaultTimeout(userId: userId) else {
let userAuthKey = try? await keychainRepository.getUserAuthKeyValue(for: .neverLock(userId: userId))
return userAuthKey == nil ? .fifteenMinutes : .never
// If there isn't a stored value, it may be because MAUI stored `nil` for never timeout.
// So if the never lock key exists, set the timeout to never, otherwise to default.
return userAuthKey != nil ? .never : .fifteenMinutes
}
return SessionTimeoutValue(rawValue: rawValue)

let timeoutValue = SessionTimeoutValue(rawValue: rawValue)
if timeoutValue == .never, userAuthKey == nil {
// If never lock but no key (possibly due to logging out), return the default timeout.
return .fifteenMinutes
}
return timeoutValue
}

func isAuthenticated(userId: String?) async throws -> Bool {
Expand Down
11 changes: 11 additions & 0 deletions BitwardenShared/Core/Platform/Services/StateServiceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,17 @@ class StateServiceTests: BitwardenTestCase { // swiftlint:disable:this type_body
XCTAssertEqual(vaultTimeout, .never)
}

/// `getVaultTimeout(userId:)` returns the default timeout if the user has a never lock value
/// stored but the never lock key doesn't exist.
func test_getVaultTimeout_neverLock_missingKey() async throws {
appSettingsStore.vaultTimeout["1"] = -2

await subject.addAccount(.fixture(profile: .fixture(userId: "1")))

let vaultTimeout = try await subject.getVaultTimeout()
XCTAssertEqual(vaultTimeout, .fifteenMinutes)
}

/// `lastSyncTimePublisher()` returns a publisher for the user's last sync time.
func test_lastSyncTimePublisher() async throws {
await subject.addAccount(.fixture(profile: .fixture(userId: "1")))
Expand Down
Loading