felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 09:02:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove now unnecessary creator public key publishing. Rebuilt flows and fixed tests

Browse Source
This commit is contained in:
Stefan Ceriu
2022-10-12 11:59:29 +03:00
committed by Stefan Ceriu
parent 83c91677a4
commit 3433e26e8c
3 changed files with 13 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Authentication/QRLogin/Common/Service/MatrixSDK/QRLoginService.swift
+4 -11
View File
@@ -183,12 +183,7 @@ class QRLoginService: NSObject, QRLoginServiceProtocol {
self.rendezvousService = rendezvousService
MXLog.debug("[QRLoginService] Joining the rendezvous at \(rendezvousURL)")
guard case .success = await rendezvousService.joinRendezvous() else {
await teardownRendezvous(state: .failed(error: .rendezvousFailed))
return
}
guard case .success(let validationCode) = await rendezvousService.waitForInterlocutor(withPublicKey: key) else {
guard case .success(let validationCode) = await rendezvousService.joinRendezvous(withPublicKey: key) else {
await teardownRendezvous(state: .failed(error: .rendezvousFailed))
return
}
@@ -218,8 +213,6 @@ class QRLoginService: NSObject, QRLoginServiceProtocol {
return
}
state = .waitingForRemoteSignIn
MXLog.debug("[QRLoginService] Waiting for the login token")
guard case let .success(data) = await rendezvousService.receive(),
let responsePayload = try? JSONDecoder().decode(QRLoginRendezvousPayload.self, from: data),
@@ -229,6 +222,8 @@ class QRLoginService: NSObject, QRLoginServiceProtocol {
}
MXLog.debug("[QRLoginService] Received login token \(responsePayload)")
state = .waitingForRemoteSignIn
MXLog.debug("[QRLoginService] Logging in with the login token")
guard let credentials = try? await client.login(parameters: LoginTokenParameters(token: login_token)) else {
await teardownRendezvous(state: .failed(error: .rendezvousFailed))
@@ -238,9 +233,7 @@ class QRLoginService: NSObject, QRLoginServiceProtocol {
let session = sessionCreator.createSession(credentials: credentials, client: client, removeOtherAccounts: false)
MXLog.debug("[QRLoginService] Created session")
MXLog.debug("[QRLoginService] No E2EE support. Inform the interlocutor of finishing")
MXLog.debug("[QRLoginService] Session created without E2EE support. Inform the interlocutor of finishing")
guard let requestData = try? JSONEncoder().encode(QRLoginRendezvousPayload(type: .loginFinish, outcome: .success)),
case .success = await rendezvousService.send(data: requestData) else {
await teardownRendezvous(state: .failed(error: .rendezvousFailed))