add DeviceID to AccountInfo

kloenk · kloenk · commit ca2c7b2f8a5d · 2022-04-22T22:55:06.000+02:00
diff --git a/Sources/MatrixSQLiteStore/AccountInfo.swift b/Sources/MatrixSQLiteStore/AccountInfo.swift
@@ -16,13 +16,32 @@ public struct MatrixSQLAccountInfo: MatrixStoreAccountInfo {
         displayName: String? = nil,
         mxID: MatrixFullUserIdentifier,
         homeServer: MatrixHomeserver,
-        accessToken: String? = nil
+        accessToken: String? = nil,
+        deviceID: String
     ) {
         self.name = name
         self.displayName = displayName
         self.mxID = mxID
         self.homeServer = homeServer
         self.accessToken = accessToken
+        self.deviceID = deviceID
+    }
+
+    public init?(_ homeserver: MatrixHomeserver, login: MatrixLogin) {
+        guard let mxID = login.userId,
+              let accessToken = login.accessToken,
+              let deviceID = login.deviceId
+        else {
+            return nil
+        }
+        self.init(
+            name: mxID.localpart,
+            displayName: nil,
+            mxID: mxID,
+            homeServer: homeserver,
+            accessToken: accessToken,
+            deviceID: deviceID
+        )
     }
 
     public typealias AccountIdentifier = MatrixFullUserIdentifier
@@ -36,6 +55,8 @@ public struct MatrixSQLAccountInfo: MatrixStoreAccountInfo {
     public var homeServer: MatrixHomeserver
 
     public var accessToken: String?
+
+    public var deviceID: String
 }
 
 extension MatrixSQLAccountInfo: Codable, FetchableRecord, PersistableRecord {
@@ -46,5 +67,6 @@ extension MatrixSQLAccountInfo: Codable, FetchableRecord, PersistableRecord {
         case displayName
         case mxID = "id"
         case homeServer = "homeserver"
+        case deviceID = "device_id"
     }
 }
diff --git a/Sources/MatrixSQLiteStore/MatrixSQLiteStore.swift b/Sources/MatrixSQLiteStore/MatrixSQLiteStore.swift
@@ -41,6 +41,7 @@ public struct MatrixSQLiteStore {
                 t.column("name", .text).notNull()
                 t.column("displayName", .text)
                 t.column("homeserver", .text).notNull()
+                t.column("device_id", .text).notNull()
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public struct MatrixSQLiteStore {`
`41`	`41`	`t.column("name", .text).notNull()`
`42`	`42`	`t.column("displayName", .text)`
`43`	`43`	`t.column("homeserver", .text).notNull()`
	`44`	`+ t.column("device_id", .text).notNull()`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`