Fix logout not clearing token if current user had no device registered (#3838)

* Fix logout not clearing current user token if does not have a device registered

* Update CHANGELOG.md

Author: nuno-vieira

CHANGELOG.md

@@ -7,7 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### ✅ Added
 - Add support for deleting messages only for the current user [#3836](https://github.com/GetStream/stream-chat-swift/pull/3836)
   - Add `ChatMessageController.deleteMessageForMe()`
-  - Add `ChatMessage.deletedForMe` 
+  - Add `ChatMessage.deletedForMe`
+### 🐞 Fixed
+- Fix logout not clearing token when current user had no device registered [#3838](https://github.com/GetStream/stream-chat-swift/pull/3838)
 
 # [4.90.0](https://github.com/GetStream/stream-chat-swift/releases/tag/4.90.0)
 _October 07, 2025_

Sources/StreamChat/ChatClient.swift

@@ -515,14 +515,13 @@ public class ChatClient {
                 }
                 self?.authenticationRepository.logOutUser()
             }
+        } else {
+            authenticationRepository.logOutUser()
         }
 
+        // Clear current user id instantly even if pending removing device.
         authenticationRepository.clearCurrentUserId()
 
-        if removeDevice == false {
-            authenticationRepository.logOutUser()
-        }
-
         // Stop tracking active components
         syncRepository.removeAllTracked()
 

Tests/StreamChatTests/ChatClient_Tests.swift

@@ -340,7 +340,7 @@ final class ChatClient_Tests: XCTestCase {
         XCTAssertEqual(testEnv.apiClient?.request_endpoint?.method, .delete)
     }
 
-    func test_logout_whenNoCurrentDevice_doesNotRemoveDevice() throws {
+    func test_logout_whenNoCurrentDevice_doesNotRemoveDevice_shouldClearToken() throws {
         // GIVEN
         let client = ChatClient(
             config: inMemoryStorageConfig,
@@ -363,6 +363,7 @@ final class ChatClient_Tests: XCTestCase {
 
         // THEN
         XCTAssertCall(ConnectionRepository_Mock.Signature.disconnect, on: testEnv.connectionRepository!)
+        XCTAssertCall(AuthenticationRepository_Mock.Signature.logOut, on: testEnv.authenticationRepository!)
         XCTAssertNil(testEnv.apiClient?.request_endpoint?.path)
         XCTAssertNil(testEnv.apiClient?.request_endpoint?.method)
     }