Misc keychain changes

kloenk · kloenk · commit fe3501f87552 · 2022-06-26T10:41:23.000+02:00
diff --git a/Sources/MatrixClient/API/Auth/Login.swift b/Sources/MatrixClient/API/Auth/Login.swift
@@ -125,6 +125,12 @@ extension MatrixLoginFlowType: ExpressibleByStringLiteral {
 }
 
 public struct MatrixLoginFlow {
+    public init(type: MatrixLoginFlowType, identiyProviders: [MatrixLoginFlow.IdentityProvider]? = nil, extraInfo: [String : AnyCodable] = [:]) {
+        self.type = type
+        self.identiyProviders = identiyProviders
+        self.extraInfo = extraInfo
+    }
+    
     public var type: MatrixLoginFlowType
     
     public var identiyProviders: [IdentityProvider]?
diff --git a/Sources/MatrixClient/MatrixClient/MatrixClient+Auth.swift b/Sources/MatrixClient/MatrixClient/MatrixClient+Auth.swift
@@ -115,20 +115,27 @@ public extension MatrixClient {
     @available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
     func login(
         token: Bool = false,
-        username: String,
+        username: String? = nil,
         password: String,
         displayName: String? = nil,
         deviceId: String? = nil
     ) async throws -> MatrixLogin {
         let flow: MatrixLoginFlowType
+        let identifier: MatrixLoginUserIdentifier?
         if token {
             flow = .token
+            identifier = nil
         } else {
             flow = .password
+            guard let username else {
+                throw MatrixCommonErrorCode.missingParam
+            }
+            identifier = .user(id: username)
         }
+        
         var request = MatrixLoginRequest(
             type: flow.rawValue,
-            identifier: MatrixLoginUserIdentifier.user(id: username),
+            identifier: identifier,
             deviceId: deviceId,
             initialDeviceDisplayName: displayName
         )
diff --git a/Sources/MatrixCore/MatrixStore.swift b/Sources/MatrixCore/MatrixStore.swift
@@ -14,6 +14,8 @@ import OSLog
 public protocol MatrixStore {
     // MARK: - Account Info
 
+    static var extraKeychainArguments: [String: Any] { get }
+    
     /// Type for Account Informations.
     associatedtype AccountInfo: MatrixStoreAccountInfo
     //associatedtype RoomState: MatrixStoreRoomState
diff --git a/Sources/MatrixCore/MatrixStoreAccountInfo.swift b/Sources/MatrixCore/MatrixStoreAccountInfo.swift
@@ -38,7 +38,7 @@ public extension MatrixStoreAccountInfo {
         var dict = dict
         dict[kSecClass as String] = kSecClassGenericPassword
         dict[kSecAttrAccount as String] = mxID.FQMXID
-        //dict[kSecUseDataProtectionKeychain as String] = true
+        dict[kSecUseDataProtectionKeychain as String] = true
         if dict[kSecAttrLabel as String] == nil {
             dict[kSecAttrLabel as String] = MXkSecAttrLabel
         }
@@ -73,6 +73,10 @@ public extension MatrixStoreAccountInfo {
 
     /// Save the ``accessToken`` to keychain, using the accountID data as identifier.
     func saveToKeychain(extraKeychainArguments: [String: Any] = [:]) throws {
+        do {
+            try self.deleteFromKeychain(extraKeychainArguments: extraKeychainArguments)
+        }
+        
         guard let accessToken = self.accessToken?.data(using: .utf8)
         else {
             throw MatrixErrorCode.NotFound
@@ -133,8 +137,15 @@ public extension MatrixStore {
     func getAccounts() async throws -> [MatrixCore<Self>] {
         let accounts = try await getAccountInfos()
 
-        return accounts.map { MatrixCore(store: self, account: $0) }
-        // Init MatrixCore.client somehow?
+        var cores: [MatrixCore<Self>] = []
+        
+        for account in accounts {
+            var account = account
+            try account.loadAccessToken(extraKeychainArguments: Self.extraKeychainArguments)
+            cores.append(MatrixCore(store: self, account: account))
+        }
+        
+        return cores
     }
 
     /// Create ``MatrixCore`` instance for the given MatrixUser ID with data from the store.
