letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Fixes #239 - Use new restoration token format, pass stored homeserver url to the client builder when restoring, dropping the need for a network request

Browse Source 
- bumped the rust sdk to v1.0.17-alpha
- move all UserSession related files to Services/UserSession
This commit is contained in:
Stefan Ceriu
2022-11-04 13:24:53 +02:00
parent 79c36d65da
commit 6ba4c09819
18 changed files with 271 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
UnitTests/Sources/KeychainControllerTests.swift
View File

@@ -22,68 +22,70 @@ class KeychainControllerTests: XCTestCase {
override func setUp() {
keychain = KeychainController(identifier: "\(ElementInfoPlist.cfBundleIdentifier).tests")
keychain.removeAllRestoreTokens()
keychain.removeAllRestorationTokens()
}
func testAddRestoreToken() {
func testAddRestorationToken() {
// Given an empty keychain.
XCTAssertTrue(keychain.restoreTokens().isEmpty, "The keychain should be empty to begin with.")
XCTAssertTrue(keychain.restorationTokens().isEmpty, "The keychain should be empty to begin with.")
// When adding an restore token.
// When adding an restoration token.
let username = "@test:example.com"
let restoreToken = UUID().uuidString
keychain.setRestoreToken(restoreToken, forUsername: username)
let restorationToken = RestorationToken(session: .init(accessToken: "accessToken", refreshToken: "refreshToken", userId: "userId", deviceId: "deviceId", homeserverUrl: "homeserverUrl", isSoftLogout: false))
keychain.setRestorationToken(restorationToken, forUsername: username)
// Then the restore token should be stored in the keychain.
XCTAssertEqual(keychain.restoreTokenForUsername(username), restoreToken, "The retrieved restore token should match the value that was stored.")
// Then the restoration token should be stored in the keychain.
XCTAssertEqual(keychain.restorationTokenForUsername(username), restorationToken, "The retrieved restoration token should match the value that was stored.")
}
func testRemovingRestoreToken() {
// Given a keychain with a stored restore token.
func testRemovingRestorationToken() {
// Given a keychain with a stored restoration token.
let username = "@test:example.com"
let restoreToken = UUID().uuidString
keychain.setRestoreToken(restoreToken, forUsername: username)
XCTAssertEqual(keychain.restoreTokens().count, 1, "The keychain should have 1 restore token.")
XCTAssertEqual(keychain.restoreTokenForUsername(username), restoreToken, "The initial restore token should match the value that was stored.")
let restorationToken = RestorationToken(session: .init(accessToken: "accessToken", refreshToken: "refreshToken", userId: "userId", deviceId: "deviceId", homeserverUrl: "homeserverUrl", isSoftLogout: false))
keychain.setRestorationToken(restorationToken, forUsername: username)
XCTAssertEqual(keychain.restorationTokens().count, 1, "The keychain should have 1 restoration token.")
XCTAssertEqual(keychain.restorationTokenForUsername(username), restorationToken, "The initial restoration token should match the value that was stored.")
// When deleting the restore token.
keychain.removeRestoreTokenForUsername(username)
// When deleting the restoration token.
keychain.removeRestorationTokenForUsername(username)
// Then the keychain should be empty.
XCTAssertTrue(keychain.restoreTokens().isEmpty, "The keychain should be empty after deleting the token.")
XCTAssertNil(keychain.restoreTokenForUsername(username), "There restore token should not be returned after removal.")
XCTAssertTrue(keychain.restorationTokens().isEmpty, "The keychain should be empty after deleting the token.")
XCTAssertNil(keychain.restorationTokenForUsername(username), "There restoration token should not be returned after removal.")
}
func testRemovingAllRestoreTokens() {
// Given a keychain with 5 stored restore tokens.
func testRemovingAllRestorationTokens() {
// Given a keychain with 5 stored restoration tokens.
for index in 0..<5 {
keychain.setRestoreToken(UUID().uuidString, forUsername: "@test\(index):example.com")
let restorationToken = RestorationToken(session: .init(accessToken: "accessToken", refreshToken: "refreshToken", userId: "userId", deviceId: "deviceId", homeserverUrl: "homeserverUrl", isSoftLogout: false))
keychain.setRestorationToken(restorationToken, forUsername: "@test\(index):example.com")
}
XCTAssertEqual(keychain.restoreTokens().count, 5, "The keychain should have 5 restore tokens.")
XCTAssertEqual(keychain.restorationTokens().count, 5, "The keychain should have 5 restoration tokens.")
// When deleting all of the restore tokens.
keychain.removeAllRestoreTokens()
// When deleting all of the restoration tokens.
keychain.removeAllRestorationTokens()
// Then the keychain should be empty.
XCTAssertTrue(keychain.restoreTokens().isEmpty, "The keychain should be empty after deleting the token.")
XCTAssertTrue(keychain.restorationTokens().isEmpty, "The keychain should be empty after deleting the token.")
}
func testRemovingSingleRestoreTokens() {
// Given a keychain with 5 stored restore tokens.
func testRemovingSingleRestorationTokens() {
// Given a keychain with 5 stored restoration tokens.
for index in 0..<5 {
keychain.setRestoreToken(UUID().uuidString, forUsername: "@test\(index):example.com")
let restorationToken = RestorationToken(session: .init(accessToken: "accessToken", refreshToken: "refreshToken", userId: "userId", deviceId: "deviceId", homeserverUrl: "homeserverUrl", isSoftLogout: false))
keychain.setRestorationToken(restorationToken, forUsername: "@test\(index):example.com")
}
XCTAssertEqual(keychain.restoreTokens().count, 5, "The keychain should have 5 restore tokens.")
XCTAssertEqual(keychain.restorationTokens().count, 5, "The keychain should have 5 restoration tokens.")
// When deleting one of the restore tokens.
keychain.removeRestoreTokenForUsername("@test2:example.com")
// When deleting one of the restoration tokens.
keychain.removeRestorationTokenForUsername("@test2:example.com")
// Then the other 4 items should remain untouched.
XCTAssertEqual(keychain.restoreTokens().count, 4, "The keychain have 4 remaining restore tokens.")
XCTAssertNotNil(keychain.restoreTokenForUsername("@test0:example.com"), "The restore token should not have been deleted.")
XCTAssertNotNil(keychain.restoreTokenForUsername("@test1:example.com"), "The restore token should not have been deleted.")
XCTAssertNil(keychain.restoreTokenForUsername("@test2:example.com"), "The restore token should have been deleted.")
XCTAssertNotNil(keychain.restoreTokenForUsername("@test3:example.com"), "The restore token should not have been deleted.")
XCTAssertNotNil(keychain.restoreTokenForUsername("@test4:example.com"), "The restore token should not have been deleted.")
XCTAssertEqual(keychain.restorationTokens().count, 4, "The keychain have 4 remaining restoration tokens.")
XCTAssertNotNil(keychain.restorationTokenForUsername("@test0:example.com"), "The restoration token should not have been deleted.")
XCTAssertNotNil(keychain.restorationTokenForUsername("@test1:example.com"), "The restoration token should not have been deleted.")
XCTAssertNil(keychain.restorationTokenForUsername("@test2:example.com"), "The restoration token should have been deleted.")
XCTAssertNotNil(keychain.restorationTokenForUsername("@test3:example.com"), "The restoration token should not have been deleted.")
XCTAssertNotNil(keychain.restorationTokenForUsername("@test4:example.com"), "The restoration token should not have been deleted.")
}
}