add delete accountInfo functions

kloenk · kloenk · commit bc0a2e3fa90e · 2022-04-21T09:14:43.000+02:00
diff --git a/.swiftformat b/.swiftformat
@@ -0,0 +1,5 @@
+--maxwidth 120
+--disable enumNamespaces
+--swiftversion 5.5
+--trimwhitespace always
+
diff --git a/Sources/MatrixSQLiteStore/AccountInfo.swift b/Sources/MatrixSQLiteStore/AccountInfo.swift
@@ -11,11 +11,27 @@ import MatrixClient
 import MatrixCore
 
 public struct MatrixSQLAccountInfo: MatrixStoreAccountInfo {
+    public init(
+        name: String,
+        displayName: String? = nil,
+        mxID: MatrixFullUserIdentifier,
+        homeServer: MatrixHomeserver,
+        accessToken: String? = nil
+    ) {
+        self.name = name
+        self.displayName = displayName
+        self.mxID = mxID
+        self.homeServer = homeServer
+        self.accessToken = accessToken
+    }
+
+    public typealias AccountIdentifier = MatrixFullUserIdentifier
+
     public var name: String
 
     public var displayName: String?
 
-    public var mxID: MatrixUserIdentifier
+    public var mxID: MatrixFullUserIdentifier
 
     public var homeServer: MatrixHomeserver
 
diff --git a/Sources/MatrixSQLiteStore/MatrixSQLiteStore.swift b/Sources/MatrixSQLiteStore/MatrixSQLiteStore.swift
@@ -9,6 +9,19 @@ public struct MatrixSQLiteStore {
 
     public init(_ dbWriter: DatabaseWriter) throws {
         self.dbWriter = dbWriter
+        try migrate()
+    }
+
+    public init(path: String) throws {
+        dbWriter = try DatabasePool(path: path)
+        try migrate()
+    }
+
+    public static func inMemory() -> Self {
+        try! MatrixSQLiteStore(DatabaseQueue())
+    }
+
+    private func migrate() throws {
         try migrator.migrate(dbWriter)
     }
 
@@ -43,9 +56,9 @@ extension MatrixSQLiteStore: MatrixStore {
         }
     }
 
-    public func getAccountInfo(accountID: MatrixUserIdentifier) async throws -> MatrixSQLAccountInfo {
+    public func getAccountInfo(accountID: MatrixFullUserIdentifier) async throws -> MatrixSQLAccountInfo {
         let account = try await dbWriter.read { db in
-            try MatrixSQLAccountInfo.fetchOne(db, key: accountID.FQMXID!)
+            try MatrixSQLAccountInfo.fetchOne(db, key: accountID.FQMXID)
         }
 
         guard var account = account else {
@@ -68,6 +81,13 @@ extension MatrixSQLiteStore: MatrixStore {
             return account
         }
     }
+
+    public func deleteAccountInfo(account: MatrixSQLAccountInfo) async throws {
+        _ = try await dbWriter.write { db in
+            try account.delete(db)
+        }
+        try account.deleteFromKeychain()
+    }
 }
 
 public extension MatrixSQLiteStore {
diff --git a/Tests/MatrixSQLiteStoreTests/MatrixAccountInfoTests.swift b/Tests/MatrixSQLiteStoreTests/MatrixAccountInfoTests.swift
@@ -16,7 +16,12 @@ class AccountInfoTests: XCTestCase {
         let store = try MatrixSQLiteStore(dbQueue)
 
         let id = MatrixUserIdentifier(rawValue: "@test:example.com")!
-        let data = MatrixSQLAccountInfo(name: "test", mxID: id, homeServer: MatrixHomeserver(string: "https://example.com")!, accessToken: "secret")
+        let data = MatrixSQLAccountInfo(
+            name: "test",
+            mxID: id,
+            homeServer: MatrixHomeserver(string: "https://example.com")!,
+            accessToken: "secret"
+        )
 
         defer {
             try! data.deleteFromKeychain()

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,19 @@ public struct MatrixSQLiteStore {`
`9`	`9`
`10`	`10`	`public init(_ dbWriter: DatabaseWriter) throws {`
`11`	`11`	`self.dbWriter = dbWriter`
	`12`	`+ try migrate()`
	`13`	`+ }`
	`14`	`+`
	`15`	`+ public init(path: String) throws {`
	`16`	`+ dbWriter = try DatabasePool(path: path)`
	`17`	`+ try migrate()`
	`18`	`+ }`
	`19`	`+`
	`20`	`+ public static func inMemory() -> Self {`
	`21`	`+ try! MatrixSQLiteStore(DatabaseQueue())`
	`22`	`+ }`
	`23`	`+`
	`24`	`+ private func migrate() throws {`
`12`	`25`	`try migrator.migrate(dbWriter)`
`13`	`26`	`}`
`14`	`27`
`@@ -43,9 +56,9 @@ extension MatrixSQLiteStore: MatrixStore {`
`43`	`56`	`}`
`44`	`57`	`}`
`45`	`58`
`46`		`- public func getAccountInfo(accountID: MatrixUserIdentifier) async throws -> MatrixSQLAccountInfo {`
	`59`	`+ public func getAccountInfo(accountID: MatrixFullUserIdentifier) async throws -> MatrixSQLAccountInfo {`
`47`	`60`	`let account = try await dbWriter.read { db in`
`48`		`- try MatrixSQLAccountInfo.fetchOne(db, key: accountID.FQMXID!)`
	`61`	`+ try MatrixSQLAccountInfo.fetchOne(db, key: accountID.FQMXID)`
`49`	`62`	`}`
`50`	`63`
`51`	`64`	`guard var account = account else {`
`@@ -68,6 +81,13 @@ extension MatrixSQLiteStore: MatrixStore {`
`68`	`81`	`return account`
`69`	`82`	`}`
`70`	`83`	`}`
	`84`	`+`
	`85`	`+ public func deleteAccountInfo(account: MatrixSQLAccountInfo) async throws {`
	`86`	`+ _ = try await dbWriter.write { db in`
	`87`	`+ try account.delete(db)`
	`88`	`+ }`
	`89`	`+ try account.deleteFromKeychain()`
	`90`	`+ }`
`71`	`91`	`}`
`72`	`92`
`73`	`93`	`public extension MatrixSQLiteStore {`