Skip to content

Commit

Permalink
General: Fix keychain items not being accessible when device is loc…
Browse files Browse the repository at this point in the history 
…ked (#96)
  • Loading branch information
@anian03
anian03 authored Oct 30, 2024
1 parent 13e3416 commit 3d5a785
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 20 deletions.
6 changes: 4 additions & 2 deletions Sources/UserStore/KeychainHelper.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ final class KeychainHelper {
kSecValueData: data,
kSecClass: kSecClassGenericPassword,
kSecAttrService: service,
kSecAttrAccount: account
kSecAttrAccount: account,
kSecAttrAccessible: kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly
] as CFDictionary

// Add data in query to keychain
Expand All @@ -35,7 +36,8 @@ final class KeychainHelper {
let query = [
kSecAttrService: service,
kSecAttrAccount: account,
kSecClass: kSecClassGenericPassword
kSecClass: kSecClassGenericPassword,
kSecAttrAccessible: kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly
] as CFDictionary

let attributesToUpdate = [kSecValueData: data] as CFDictionary
Expand Down
44 changes: 26 additions & 18 deletions Sources/UserStore/UserSession.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class UserSession: ObservableObject {
}

private func setupInstitutionSelection() {
if let institutionData = KeychainHelper.shared.read(service: "institution", account: "Artemis") {
if let institutionData = KeychainHelper.shared.read(service: .institutionKey, account: "Artemis") {
institution = InstitutionIdentifier(value: String(decoding: institutionData, as: UTF8.self))
} else {
institution = .tum
Expand All @@ -39,7 +39,7 @@ public class UserSession: ObservableObject {
}

private func setupNotificationData() {
if let notificationDeviceConfigurationData = KeychainHelper.shared.read(service: "notificationDeviceConfigurations", account: "Artemis") {
if let notificationDeviceConfigurationData = KeychainHelper.shared.read(service: .notificationConfigKey, account: "Artemis") {
let decoder = JSONDecoder()
do {
notificationDeviceConfigurations = try decoder.decode([NotificationDeviceConfiguration].self, from: notificationDeviceConfigurationData)
Expand All @@ -51,15 +51,15 @@ public class UserSession: ObservableObject {
}

private func setupLoginData() {
if let tokenData = KeychainHelper.shared.read(service: "isLoggedIn", account: "Artemis") {
if let tokenData = KeychainHelper.shared.read(service: .isLoggedInKey, account: "Artemis") {
isLoggedIn = String(decoding: tokenData, as: UTF8.self) == "true"
}

if let username = KeychainHelper.shared.read(service: "username", account: "Artemis") {
if let username = KeychainHelper.shared.read(service: .usernameKey, account: "Artemis") {
self.username = String(decoding: username, as: UTF8.self)
}

if let password = KeychainHelper.shared.read(service: "password", account: "Artemis") {
if let password = KeychainHelper.shared.read(service: .passwordKey, account: "Artemis") {
self.password = String(decoding: password, as: UTF8.self)
}
}
Expand All @@ -71,17 +71,17 @@ public class UserSession: ObservableObject {
public func setUserLoggedIn(isLoggedIn: Bool) {
self.isLoggedIn = isLoggedIn
let isLoggedInData = Data(isLoggedIn.description.utf8)
KeychainHelper.shared.save(isLoggedInData, service: "isLoggedIn", account: "Artemis")
KeychainHelper.shared.save(isLoggedInData, service: .isLoggedInKey, account: "Artemis")
}

public func saveUsername(username: String?) {
self.username = username

if let username {
let usernameData = Data(username.description.utf8)
KeychainHelper.shared.save(usernameData, service: "username", account: "Artemis")
KeychainHelper.shared.save(usernameData, service: .usernameKey, account: "Artemis")
} else {
KeychainHelper.shared.delete(service: "username", account: "Artemis")
KeychainHelper.shared.delete(service: .usernameKey, account: "Artemis")
}
}

Expand All @@ -90,9 +90,9 @@ public class UserSession: ObservableObject {

if let password {
let passwordData = Data(password.description.utf8)
KeychainHelper.shared.save(passwordData, service: "password", account: "Artemis")
KeychainHelper.shared.save(passwordData, service: .passwordKey, account: "Artemis")
} else {
KeychainHelper.shared.delete(service: "password", account: "Artemis")
KeychainHelper.shared.delete(service: .passwordKey, account: "Artemis")
}
}

Expand All @@ -112,7 +112,7 @@ public class UserSession: ObservableObject {

let encoder = JSONEncoder()
if let encodedData = try? encoder.encode(notificationDeviceConfigurations) {
KeychainHelper.shared.save(encodedData, service: "notificationDeviceConfigurations", account: "Artemis")
KeychainHelper.shared.save(encodedData, service: .notificationConfigKey, account: "Artemis")
}
}

Expand All @@ -125,19 +125,19 @@ public class UserSession: ObservableObject {

if let identifier {
let identifierData = Data(identifier.value.utf8)
KeychainHelper.shared.save(identifierData, service: "institution", account: "Artemis")
KeychainHelper.shared.save(identifierData, service: .institutionKey, account: "Artemis")
} else {
KeychainHelper.shared.delete(service: "institution", account: "Artemis")
KeychainHelper.shared.delete(service: .institutionKey, account: "Artemis")
}
}

// only used for debugging
public func wipeKeychain() {
KeychainHelper.shared.delete(service: "username", account: "Artemis")
KeychainHelper.shared.delete(service: "isLoggedIn", account: "Artemis")
KeychainHelper.shared.delete(service: "password", account: "Artemis")
KeychainHelper.shared.delete(service: "institution", account: "Artemis")
KeychainHelper.shared.delete(service: "notificationDeviceConfigurations", account: "Artemis")
KeychainHelper.shared.delete(service: .usernameKey, account: "Artemis")
KeychainHelper.shared.delete(service: .isLoggedInKey, account: "Artemis")
KeychainHelper.shared.delete(service: .passwordKey, account: "Artemis")
KeychainHelper.shared.delete(service: .institutionKey, account: "Artemis")
KeychainHelper.shared.delete(service: .notificationConfigKey, account: "Artemis")
}
}

Expand All @@ -148,3 +148,11 @@ public struct NotificationDeviceConfiguration: Codable {
public var apnsDeviceToken: String?
public var notificationsEncryptionKey: String?
}

fileprivate extension String {
static let usernameKey = "Username"
static let passwordKey = "Password"
static let notificationConfigKey = "NotificationConfigurations"
static let institutionKey = "Institution"
static let isLoggedInKey = "LoginStatus"
}

0 comments on commit 3d5a785

Please sign in to comment.