Fix PR remarks

RiotSwiftUI/Modules/Authentication/Common/Service/MatrixSDK/LoginWizard.swift

@@ -53,8 +53,13 @@ class LoginWizard {
     ///   - password: The password of the account.
     ///   - initialDeviceName: The initial device name.
     ///   - deviceID: The device ID, optional. If not provided or nil, the server will generate one.
+    ///   - removeOtherAccounts: If set to true, existing accounts with different user identifiers will be removed.
     /// - Returns: An `MXSession` if the login is successful.
-    func login(login: String, password: String, initialDeviceName: String, deviceID: String? = nil, resetOthers: Bool = false) async throws -> MXSession {
+    func login(login: String,
+               password: String,
+               initialDeviceName: String,
+               deviceID: String? = nil,
+               removeOtherAccounts: Bool = false) async throws -> MXSession {
         let parameters: LoginPasswordParameters
         
         if MXTools.isEmailAddress(login) {
@@ -70,16 +75,22 @@ class LoginWizard {
         }
         
         let credentials = try await client.login(parameters: parameters)
-        return sessionCreator.createSession(credentials: credentials, client: client, resetOthers: resetOthers)
+        return sessionCreator.createSession(credentials: credentials,
+                                            client: client,
+                                            removeOtherAccounts: removeOtherAccounts)
     }
-    
+
     /// Exchange a login token to an access token.
-    /// - Parameter loginToken: A login token, obtained when login has happened in a WebView, using SSO.
+    /// - Parameters:
+    ///   - token: A login token, obtained when login has happened in a WebView, using SSO.
+    ///   - removeOtherAccounts: If set to true, existing accounts with different user identifiers will be removed.
     /// - Returns: An `MXSession` if the login is successful.
-    func login(with token: String, resetOthers: Bool = false) async throws -> MXSession {
+    func login(with token: String, removeOtherAccounts: Bool = false) async throws -> MXSession {
         let parameters = LoginTokenParameters(token: token)
         let credentials = try await client.login(parameters: parameters)
-        return sessionCreator.createSession(credentials: credentials, client: client, resetOthers: resetOthers)
+        return sessionCreator.createSession(credentials: credentials,
+                                            client: client,
+                                            removeOtherAccounts: removeOtherAccounts)
     }
     
 //    /// Login to the homeserver by sending a custom JsonDict.

RiotSwiftUI/Modules/Authentication/Common/Service/MatrixSDK/RegistrationWizard.swift

@@ -255,7 +255,7 @@ class RegistrationWizard {
         do {
             let response = try await client.register(parameters: parameters)
             let credentials = MXCredentials(loginResponse: response, andDefaultCredentials: client.credentials)
-            return .success(sessionCreator.createSession(credentials: credentials, client: client, resetOthers: false))
+            return .success(sessionCreator.createSession(credentials: credentials, client: client, removeOtherAccounts: false))
         } catch {
             let nsError = error as NSError
             

RiotSwiftUI/Modules/Authentication/Common/Service/MatrixSDK/SessionCreator.swift

@@ -21,9 +21,9 @@ protocol SessionCreatorProtocol {
     /// - Parameters:
     ///   - credentials: The `MXCredentials` for the account.
     ///   - client: The client that completed the authentication.
-    ///   - resetOthers: Flag to reset other accounts.
+    ///   - removeOtherAccounts: Flag to remove other accounts than the account specified with the `credentials.userId`.
     /// - Returns: A new `MXSession` for the account.
-    func createSession(credentials: MXCredentials, client: AuthenticationRestClient, resetOthers: Bool) -> MXSession
+    func createSession(credentials: MXCredentials, client: AuthenticationRestClient, removeOtherAccounts: Bool) -> MXSession
 }
 
 /// A struct that provides common functionality to create a new session.
@@ -35,20 +35,23 @@ struct SessionCreator: SessionCreatorProtocol {
         self.accountManager = accountManager
     }
 
-    func createSession(credentials: MXCredentials, client: AuthenticationRestClient, resetOthers: Bool) -> MXSession {
+    func createSession(credentials: MXCredentials, client: AuthenticationRestClient, removeOtherAccounts: Bool) -> MXSession {
         // Use identity server provided in the client
         if credentials.identityServer == nil {
             credentials.identityServer = client.identityServer
         }
 
+        if removeOtherAccounts {
+            let otherAccounts = accountManager.accounts.filter({ $0.mxCredentials.userId != credentials.userId })
+            for account in otherAccounts {
+                accountManager.removeAccount(account, completion: nil)
+            }
+        }
+
         if let account = accountManager.account(forUserId: credentials.userId) {
             accountManager.hydrateAccount(account, with: credentials)
             return account.mxSession
         } else {
-            if resetOthers {
-                accountManager.logout(completion: nil)
-            }
-
             let account = MXKAccount(credentials: credentials)
 
             //  set identity server of the new account