diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/SessionKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/SessionKtTest.kt
index 9e6d87957c..b0e1254179 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/SessionKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/mapper/SessionKtTest.kt
@@ -8,6 +8,7 @@
 package io.element.android.libraries.matrix.impl.mapper
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.auth.external.ExternalSession
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustSession
 import io.element.android.libraries.matrix.impl.paths.SessionPaths
 import io.element.android.libraries.matrix.test.A_DEVICE_ID
@@ -81,4 +82,55 @@ class SessionKtTest {
         )
         assertThat(result.slidingSyncProxy).isEqualTo("proxyUrl")
     }
+
+    @Test
+    fun `ExternalSession toSessionData compute the expected result`() {
+        val result = anExternalSession().toSessionData(
+            isTokenValid = true,
+            loginType = LoginType.PASSWORD,
+            passphrase = A_SECRET,
+            sessionPaths = SessionPaths(File("/a/file"), File("/a/cache")),
+        )
+        assertThat(result.userId).isEqualTo(A_USER_ID.value)
+        assertThat(result.deviceId).isEqualTo(A_DEVICE_ID.value)
+        assertThat(result.accessToken).isEqualTo("accessToken")
+        assertThat(result.refreshToken).isNull()
+        assertThat(result.homeserverUrl).isEqualTo(A_HOMESERVER_URL)
+        assertThat(result.isTokenValid).isTrue()
+        assertThat(result.oidcData).isNull()
+        assertThat(result.slidingSyncProxy).isNull()
+        assertThat(result.loginType).isEqualTo(LoginType.PASSWORD)
+        assertThat(result.loginTimestamp).isNotNull()
+        assertThat(result.passphrase).isEqualTo(A_SECRET)
+        assertThat(result.sessionPath).isEqualTo("/a/file")
+        assertThat(result.cachePath).isEqualTo("/a/cache")
+    }
+
+    @Test
+    fun `ExternalSession toSessionData can change the validity of the token`() {
+        val result = anExternalSession().toSessionData(
+            isTokenValid = false,
+            loginType = LoginType.PASSWORD,
+            passphrase = A_SECRET,
+            sessionPaths = SessionPaths(File("/a/file"), File("/a/cache")),
+        )
+        assertThat(result.isTokenValid).isFalse()
+    }
 }
+
+private fun anExternalSession(
+    userId: String = A_USER_ID.value,
+    deviceId: String = A_DEVICE_ID.value,
+    accessToken: String = "accessToken",
+    refreshToken: String? = null,
+    homeserverUrl: String = A_HOMESERVER_URL,
+    slidingSyncProxy: String? = null,
+
+    ) = ExternalSession(
+    userId = userId,
+    deviceId = deviceId,
+    accessToken = accessToken,
+    refreshToken = refreshToken,
+    homeserverUrl = homeserverUrl,
+    slidingSyncProxy = slidingSyncProxy,
+)