Skip to content

Commit 0f2c576

Browse files
authored
Merge branch 'GoodRequest:main' into main
2 parents 2bddfea + aa5614c commit 0f2c576

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

Sources/GoodPersistence/KeychainValue.swift

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public class KeychainValue<T: Codable & Equatable> {
136136
public init(
137137
_ key: String,
138138
defaultValue: T,
139-
accessibility: KeychainAccess.Accessibility? = nil,
139+
accessibility: KeychainAccess.Accessibility = .afterFirstUnlock,
140140
synchronizable: Bool = false,
141141
authenticationPolicy: KeychainAccess.AuthenticationPolicy? = nil
142142
) {
@@ -170,7 +170,7 @@ public class KeychainValue<T: Codable & Equatable> {
170170

171171
private let key: String
172172
private let defaultValue: T
173-
private let accessibility: KeychainAccess.Accessibility?
173+
private let accessibility: KeychainAccess.Accessibility
174174
private let synchronizable: Bool
175175
private let authenticationPolicy: KeychainAccess.AuthenticationPolicy?
176176

@@ -321,19 +321,14 @@ public class KeychainValue<T: Codable & Equatable> {
321321
///
322322
/// - Returns: A configured `KeychainAccess.Keychain` instance based on the provided parameters.
323323
private func setupKeychain() -> KeychainAccess.Keychain {
324-
if let accessibility, let authenticationPolicy {
325-
return Keychain.default
326-
.accessibility(accessibility, authenticationPolicy: authenticationPolicy)
327-
} else if let accessibility {
324+
if let authenticationPolicy {
328325
return Keychain.default
329326
.synchronizable(synchronizable)
330-
.accessibility(accessibility)
331-
} else if let authenticationPolicy {
332-
return Keychain.default
333-
.accessibility(Keychain.default.accessibility, authenticationPolicy: authenticationPolicy)
327+
.accessibility(accessibility, authenticationPolicy: authenticationPolicy)
334328
} else {
335329
return Keychain.default
336330
.synchronizable(synchronizable)
331+
.accessibility(accessibility)
337332
}
338333
}
339334

0 commit comments

Comments
 (0)