mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-09-03 16:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Migrate app accounts to shared keychain

Browse source
This commit is contained in:
Thomas Ricouard 2023-01-13 13:05:43 +01:00
parent 1eb3dfb5a5
commit 03b304c58d
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Packages/AppAccount/Sources/AppAccount/AppAccount.swift
View file

@ -12,6 +12,14 @@ public struct AppAccount: Codable, Identifiable {
key key
} }
private static var keychain: KeychainSwift {
let keychain = KeychainSwift()
#if !DEBUG
keychain.accessGroup = AppInfo.keychainGroup
#endif
return keychain
}
public var key: String { public var key: String {
if let oauthToken { if let oauthToken {
return "\(server):\(oauthToken.createdAt)" return "\(server):\(oauthToken.createdAt)"
@ -28,16 +36,16 @@ public struct AppAccount: Codable, Identifiable {
public func save() throws { public func save() throws {
let encoder = JSONEncoder() let encoder = JSONEncoder()
let data = try encoder.encode(self) let data = try encoder.encode(self)
let keychain = KeychainSwift() Self.keychain.set(data, forKey: key)
keychain.set(data, forKey: key)
} }
public func delete() { public func delete() {
KeychainSwift().delete(key) Self.keychain.delete(key)
} }
public static func retrieveAll() -> [AppAccount] { public static func retrieveAll() -> [AppAccount] {
let keychain = KeychainSwift() migrateLegacyAccounts()
let keychain = Self.keychain
let decoder = JSONDecoder() let decoder = JSONDecoder()
let keys = keychain.allKeys let keys = keychain.allKeys
var accounts: [AppAccount] = [] var accounts: [AppAccount] = []
@ -51,8 +59,21 @@ public struct AppAccount: Codable, Identifiable {
return accounts return accounts
} }
public static func deleteAll() { public static func migrateLegacyAccounts() {
let keychain = KeychainSwift() let keychain = KeychainSwift()
let decoder = JSONDecoder()
let keys = keychain.allKeys
for key in keys {
if let data = keychain.getData(key) {
if let account = try? decoder.decode(AppAccount.self, from: data) {
try? account.save()
}
}
}
}
public static func deleteAll() {
let keychain = Self.keychain
let keys = keychain.allKeys let keys = keychain.allKeys
for key in keys { for key in keys {
keychain.delete(key) keychain.delete(key)