From d28d80bca33a544dc94e1edb27fd6f1f0bfabf85 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 22 Apr 2025 15:01:00 +0200
Subject: [PATCH 1/9] Login: more logs.

---
 .../matrix/impl/auth/RustMatrixAuthenticationService.kt      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
index 33af371569e..b03e0c9af43 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
@@ -137,6 +137,7 @@ class RustMatrixAuthenticationService @Inject constructor(
             }.onFailure {
                 clear()
             }.mapFailure { failure ->
+                Timber.e(failure, "Failed to set homeserver to $homeserver")
                 failure.mapAuthenticationException()
             }
         }
@@ -162,6 +163,7 @@ class RustMatrixAuthenticationService @Inject constructor(
 
                 SessionId(sessionData.userId)
             }.mapFailure { failure ->
+                Timber.e(failure, "Failed to login")
                 failure.mapAuthenticationException()
             }
         }
@@ -197,6 +199,7 @@ class RustMatrixAuthenticationService @Inject constructor(
                 pendingOAuthAuthorizationData = oAuthAuthorizationData
                 OidcDetails(url)
             }.mapFailure { failure ->
+                Timber.e(failure, "Failed to get OIDC URL")
                 failure.mapAuthenticationException()
             }
         }
@@ -210,6 +213,7 @@ class RustMatrixAuthenticationService @Inject constructor(
                 }
                 pendingOAuthAuthorizationData = null
             }.mapFailure { failure ->
+                Timber.e(failure, "Failed to cancel OIDC login")
                 failure.mapAuthenticationException()
             }
         }
@@ -243,6 +247,7 @@ class RustMatrixAuthenticationService @Inject constructor(
 
                 SessionId(sessionData.userId)
             }.mapFailure { failure ->
+                Timber.e(failure, "Failed to login with OIDC")
                 failure.mapAuthenticationException()
             }
         }

From 912d6f2ffd13aeca4edc857672139403c0d9f0a1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 22 Apr 2025 15:17:34 +0200
Subject: [PATCH 2/9] Login: map Oidc error to provide more information in the
 error dialog.

---
 .../features/login/impl/error/ChangeServerError.kt   | 12 +++++++++---
 .../matrix/api/auth/AuthenticationException.kt       |  1 +
 .../matrix/impl/auth/AuthenticationException.kt      |  8 ++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
index b450aaea531..618f4f81f69 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
@@ -12,18 +12,24 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import io.element.android.features.login.impl.R
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
+import io.element.android.libraries.ui.strings.CommonStrings
 
 sealed class ChangeServerError : Throwable() {
-    data class Error(@StringRes val messageId: Int) : ChangeServerError() {
+    data class Error(
+        @StringRes val messageId: Int? = null,
+        val messageStr: String? = null,
+    ) : ChangeServerError() {
         @Composable
-        fun message(): String = stringResource(messageId)
+        fun message(): String = messageStr ?: stringResource(messageId ?: CommonStrings.error_unknown)
     }
+
     data object SlidingSyncAlert : ChangeServerError()
 
     companion object {
         fun from(error: Throwable): ChangeServerError = when (error) {
             is AuthenticationException.SlidingSyncVersion -> SlidingSyncAlert
-            else -> Error(R.string.screen_change_server_error_invalid_homeserver)
+            is AuthenticationException.Oidc -> Error(messageStr = error.message)
+            else -> Error(messageId = R.string.screen_change_server_error_invalid_homeserver)
         }
     }
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
index e3153cbbb84..ef73edfaf50 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
@@ -10,5 +10,6 @@ package io.element.android.libraries.matrix.api.auth
 sealed class AuthenticationException(message: String) : Exception(message) {
     class InvalidServerName(message: String) : AuthenticationException(message)
     class SlidingSyncVersion(message: String) : AuthenticationException(message)
+    class Oidc(message: String) : AuthenticationException(message)
     class Generic(message: String) : AuthenticationException(message)
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
index c7fa9598ffe..7175913dad4 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
@@ -9,6 +9,7 @@ package io.element.android.libraries.matrix.impl.auth
 
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
 import org.matrix.rustcomponents.sdk.ClientBuildException
+import org.matrix.rustcomponents.sdk.OidcException
 
 fun Throwable.mapAuthenticationException(): AuthenticationException {
     val message = this.message ?: "Unknown error"
@@ -24,6 +25,13 @@ fun Throwable.mapAuthenticationException(): AuthenticationException {
             is ClientBuildException.WellKnownLookupFailed -> AuthenticationException.Generic(message)
             is ClientBuildException.EventCache -> AuthenticationException.Generic(message)
         }
+        is OidcException -> when (this) {
+            is OidcException.Generic -> AuthenticationException.Oidc(message)
+            is OidcException.CallbackUrlInvalid -> AuthenticationException.Oidc(message)
+            is OidcException.Cancelled -> AuthenticationException.Oidc(message)
+            is OidcException.MetadataInvalid -> AuthenticationException.Oidc(message)
+            is OidcException.NotSupported -> AuthenticationException.Oidc(message)
+        }
         else -> AuthenticationException.Generic(message)
     }
 }

From 0bea29af01f12ec2058e4d0455885bde27686818 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 22 Apr 2025 15:23:20 +0200
Subject: [PATCH 3/9] Oidc: use the application name.

---
 .../matrix/impl/auth/OidcConfigurationProvider.kt         | 7 +++++--
 .../matrix/impl/auth/OidcConfigurationProviderTest.kt     | 8 +++++++-
 .../impl/auth/RustMatrixAuthenticationServiceTest.kt      | 3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
index ec220112ded..78490ea6461 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
@@ -7,13 +7,16 @@
 
 package io.element.android.libraries.matrix.impl.auth
 
+import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.api.auth.OidcConfig
 import org.matrix.rustcomponents.sdk.OidcConfiguration
 import javax.inject.Inject
 
-class OidcConfigurationProvider @Inject constructor() {
+class OidcConfigurationProvider @Inject constructor(
+    private val buildMeta: BuildMeta,
+) {
     fun get(): OidcConfiguration = OidcConfiguration(
-        clientName = "Element",
+        clientName = buildMeta.applicationName,
         redirectUri = OidcConfig.REDIRECT_URI,
         clientUri = "https://element.io",
         logoUri = "https://element.io/mobile-icon.png",
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProviderTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProviderTest.kt
index 01321fcdf69..907e2e59e4a 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProviderTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProviderTest.kt
@@ -9,12 +9,18 @@ package io.element.android.libraries.matrix.impl.auth
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.auth.OidcConfig
+import io.element.android.libraries.matrix.test.core.aBuildMeta
 import org.junit.Test
 
 class OidcConfigurationProviderTest {
     @Test
     fun get() {
-        val result = OidcConfigurationProvider().get()
+        val result = OidcConfigurationProvider(
+            aBuildMeta(
+                applicationName = "myName",
+            )
+        ).get()
+        assertThat(result.clientName).isEqualTo("myName")
         assertThat(result.redirectUri).isEqualTo(OidcConfig.REDIRECT_URI)
     }
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt
index e2a9d883eec..6a6ccf917c5 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt
@@ -11,6 +11,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.impl.createRustMatrixClientFactory
 import io.element.android.libraries.matrix.impl.paths.SessionPathsFactory
+import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.impl.memory.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
@@ -48,7 +49,7 @@ class RustMatrixAuthenticationServiceTest {
             sessionStore = sessionStore,
             rustMatrixClientFactory = rustMatrixClientFactory,
             passphraseGenerator = FakePassphraseGenerator(),
-            oidcConfigurationProvider = OidcConfigurationProvider(),
+            oidcConfigurationProvider = OidcConfigurationProvider(aBuildMeta()),
         )
     }
 }

From 8d7a57ba042b1ad006e2e83d42f42bcc107a1ac0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 22 Apr 2025 15:39:15 +0200
Subject: [PATCH 4/9] Oidc: move configuration from OidcConfigurationProvider
 to OidcConfig and add some comments.

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../libraries/matrix/api/auth/OidcConfig.kt   | 23 +++++++++++++++++++
 .../impl/auth/OidcConfigurationProvider.kt    | 17 +++++---------
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3450fcd55eb..c867a817f44 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,6 +60,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
+                <!-- Note: the scheme must match the scheme of the value of OidcConfig.REDIRECT_URI -->
                 <data android:scheme="io.element" />
             </intent-filter>
             <!--
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
index 23d55b74ea0..428946e2e79 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
@@ -8,5 +8,28 @@
 package io.element.android.libraries.matrix.api.auth
 
 object OidcConfig {
+    const val CLIENT_URI = "https://element.io"
+
+    // Notes:
+    // 1. the scheme must match the value declared in the AndroidManifest.xml
+    // 2. the scheme must be the reverse of the host of CLIENT_URI
     const val REDIRECT_URI = "io.element:/callback"
+
+    // Note: host must match with the host of CLIENT_URI
+    const val LOGO_URI = "https://element.io/mobile-icon.png"
+
+    // Note: host must match with the host of CLIENT_URI
+    const val TOS_URI = "https://element.io/acceptable-use-policy-terms"
+
+    // Note: host must match with the host of CLIENT_URI
+    const val POLICY_URI = "https://element.io/privacy"
+
+    val CONTACTS = listOf(
+        "support@element.io",
+    )
+
+    // Some homeservers/auth issuers don't support dynamic client registration, and have to be registered manually
+    val STATIC_REGISTRATIONS = mapOf(
+        "https://id.thirdroom.io/realms/thirdroom" to "elementx",
+    )
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
index 78490ea6461..5b2546ddcc4 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
@@ -18,16 +18,11 @@ class OidcConfigurationProvider @Inject constructor(
     fun get(): OidcConfiguration = OidcConfiguration(
         clientName = buildMeta.applicationName,
         redirectUri = OidcConfig.REDIRECT_URI,
-        clientUri = "https://element.io",
-        logoUri = "https://element.io/mobile-icon.png",
-        tosUri = "https://element.io/acceptable-use-policy-terms",
-        policyUri = "https://element.io/privacy",
-        contacts = listOf(
-            "support@element.io",
-        ),
-        // Some homeservers/auth issuers don't support dynamic client registration, and have to be registered manually
-        staticRegistrations = mapOf(
-            "https://id.thirdroom.io/realms/thirdroom" to "elementx",
-        ),
+        clientUri = OidcConfig.CLIENT_URI,
+        logoUri = OidcConfig.LOGO_URI,
+        tosUri = OidcConfig.TOS_URI,
+        policyUri = OidcConfig.POLICY_URI,
+        contacts = OidcConfig.CONTACTS,
+        staticRegistrations = OidcConfig.STATIC_REGISTRATIONS,
     )
 }

From ae56172e97c37eae591a9e903214ee06435db21c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 22 Apr 2025 16:03:17 +0200
Subject: [PATCH 5/9] Oidc: limit to only 1 contact in the configuration.

---
 .../element/android/libraries/matrix/api/auth/OidcConfig.kt   | 4 +---
 .../libraries/matrix/impl/auth/OidcConfigurationProvider.kt   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
index 428946e2e79..993de60d93b 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
@@ -24,9 +24,7 @@ object OidcConfig {
     // Note: host must match with the host of CLIENT_URI
     const val POLICY_URI = "https://element.io/privacy"
 
-    val CONTACTS = listOf(
-        "support@element.io",
-    )
+    const val CONTACT = "support@element.io"
 
     // Some homeservers/auth issuers don't support dynamic client registration, and have to be registered manually
     val STATIC_REGISTRATIONS = mapOf(
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
index 5b2546ddcc4..12c6512be5f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
@@ -22,7 +22,7 @@ class OidcConfigurationProvider @Inject constructor(
         logoUri = OidcConfig.LOGO_URI,
         tosUri = OidcConfig.TOS_URI,
         policyUri = OidcConfig.POLICY_URI,
-        contacts = OidcConfig.CONTACTS,
+        contacts = listOf(OidcConfig.CONTACT),
         staticRegistrations = OidcConfig.STATIC_REGISTRATIONS,
     )
 }

From 3cdc38db3c14519e16d266e5520b8fc1ee6d1fc1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 22 Apr 2025 16:07:18 +0200
Subject: [PATCH 6/9] Oidc: Move configuration to BuildConfig file.

---
 libraries/matrix/api/build.gradle.kts         | 32 +++++++++++++++++++
 .../libraries/matrix/api/auth/OidcConfig.kt   | 14 ++++----
 .../src/main/kotlin/config/BuildTimeConfig.kt |  1 +
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/libraries/matrix/api/build.gradle.kts b/libraries/matrix/api/build.gradle.kts
index d96613b1e7c..f9520ec2313 100644
--- a/libraries/matrix/api/build.gradle.kts
+++ b/libraries/matrix/api/build.gradle.kts
@@ -1,3 +1,5 @@
+import config.BuildTimeConfig
+import extension.buildConfigFieldStr
 import extension.setupAnvil
 
 /*
@@ -19,6 +21,36 @@ android {
     buildFeatures {
         buildConfig = true
     }
+
+    defaultConfig {
+        buildConfigFieldStr(
+            name = "CLIENT_URI",
+            value = BuildTimeConfig.URL_WEBSITE ?: "https://element.io"
+        )
+        buildConfigFieldStr(
+            name = "REDIRECT_URI",
+            value = buildString {
+                append(BuildTimeConfig.METADATA_HOST_REVERSED ?: "io.element")
+                append(":/callback")
+            }
+        )
+        buildConfigFieldStr(
+            name = "LOGO_URI",
+            value = BuildTimeConfig.URL_LOGO ?: "https://element.io/mobile-icon.png"
+        )
+        buildConfigFieldStr(
+            name = "TOS_URI",
+            value = BuildTimeConfig.URL_ACCEPTABLE_USE ?: "https://element.io/acceptable-use-policy-terms"
+        )
+        buildConfigFieldStr(
+            name = "POLICY_URI",
+            value = BuildTimeConfig.URL_POLICY ?: "https://element.io/privacy"
+        )
+        buildConfigFieldStr(
+            name = "CONTACT",
+            value = BuildTimeConfig.SUPPORT_EMAIL_ADDRESS ?: "support@element.io"
+        )
+    }
 }
 
 setupAnvil()
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
index 993de60d93b..d6e001f58c8 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
@@ -7,24 +7,26 @@
 
 package io.element.android.libraries.matrix.api.auth
 
+import io.element.android.libraries.matrix.api.BuildConfig
+
 object OidcConfig {
-    const val CLIENT_URI = "https://element.io"
+    const val CLIENT_URI = BuildConfig.CLIENT_URI
 
     // Notes:
     // 1. the scheme must match the value declared in the AndroidManifest.xml
     // 2. the scheme must be the reverse of the host of CLIENT_URI
-    const val REDIRECT_URI = "io.element:/callback"
+    const val REDIRECT_URI = BuildConfig.REDIRECT_URI
 
     // Note: host must match with the host of CLIENT_URI
-    const val LOGO_URI = "https://element.io/mobile-icon.png"
+    const val LOGO_URI = BuildConfig.LOGO_URI
 
     // Note: host must match with the host of CLIENT_URI
-    const val TOS_URI = "https://element.io/acceptable-use-policy-terms"
+    const val TOS_URI = BuildConfig.TOS_URI
 
     // Note: host must match with the host of CLIENT_URI
-    const val POLICY_URI = "https://element.io/privacy"
+    const val POLICY_URI = BuildConfig.POLICY_URI
 
-    const val CONTACT = "support@element.io"
+    const val CONTACT = BuildConfig.CONTACT
 
     // Some homeservers/auth issuers don't support dynamic client registration, and have to be registered manually
     val STATIC_REGISTRATIONS = mapOf(
diff --git a/plugins/src/main/kotlin/config/BuildTimeConfig.kt b/plugins/src/main/kotlin/config/BuildTimeConfig.kt
index e1fd78c4bb8..8bd22e6f92a 100644
--- a/plugins/src/main/kotlin/config/BuildTimeConfig.kt
+++ b/plugins/src/main/kotlin/config/BuildTimeConfig.kt
@@ -15,6 +15,7 @@ object BuildTimeConfig {
     const val GOOGLE_APP_ID_NIGHTLY = "1:912726360885:android:e17435e0beb0303000427c"
 
     val METADATA_HOST: String? = null
+    val METADATA_HOST_REVERSED: String? = null
     val URL_WEBSITE: String? = null
     val URL_LOGO: String? = null
     val URL_COPYRIGHT: String? = null

From 9cc1cc5b08b04af712dbffe833ee6172b5779629 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 22 Apr 2025 16:59:59 +0200
Subject: [PATCH 7/9] Remove unused const.

---
 plugins/src/main/kotlin/config/BuildTimeConfig.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/src/main/kotlin/config/BuildTimeConfig.kt b/plugins/src/main/kotlin/config/BuildTimeConfig.kt
index 8bd22e6f92a..6ed3f632e41 100644
--- a/plugins/src/main/kotlin/config/BuildTimeConfig.kt
+++ b/plugins/src/main/kotlin/config/BuildTimeConfig.kt
@@ -14,7 +14,6 @@ object BuildTimeConfig {
     const val GOOGLE_APP_ID_DEBUG = "1:912726360885:android:def0a4e454042e9b00427c"
     const val GOOGLE_APP_ID_NIGHTLY = "1:912726360885:android:e17435e0beb0303000427c"
 
-    val METADATA_HOST: String? = null
     val METADATA_HOST_REVERSED: String? = null
     val URL_WEBSITE: String? = null
     val URL_LOGO: String? = null

From c750287b4d694908764eaeb9c112dca163a62e4e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 23 Apr 2025 09:16:41 +0200
Subject: [PATCH 8/9] Add missing test on Exception mapping

---
 .../auth/AuthenticationExceptionMappingTest.kt    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
index d6666afdc0f..c73ba1424b8 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
@@ -12,6 +12,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
 import org.junit.Test
 import org.matrix.rustcomponents.sdk.ClientBuildException
+import org.matrix.rustcomponents.sdk.OidcException
 
 class AuthenticationExceptionMappingTest {
     @Test
@@ -56,6 +57,20 @@ class AuthenticationExceptionMappingTest {
             .isException<AuthenticationException.Generic>("EventCache error")
     }
 
+    @Test
+    fun `mapping Oidc exceptions map to the Oidc Kotlin`() {
+        assertThat(OidcException.Generic("Generic").mapAuthenticationException())
+            .isException<AuthenticationException.Oidc>("Generic")
+        assertThat(OidcException.CallbackUrlInvalid("CallbackUrlInvalid").mapAuthenticationException())
+            .isException<AuthenticationException.Oidc>("CallbackUrlInvalid")
+        assertThat(OidcException.Cancelled("Cancelled").mapAuthenticationException())
+            .isException<AuthenticationException.Oidc>("Cancelled")
+        assertThat(OidcException.MetadataInvalid("MetadataInvalid").mapAuthenticationException())
+            .isException<AuthenticationException.Oidc>("MetadataInvalid")
+        assertThat(OidcException.NotSupported("NotSupported").mapAuthenticationException())
+            .isException<AuthenticationException.Oidc>("NotSupported")
+    }
+
     private inline fun <reified T> ThrowableSubject.isException(message: String) {
         isInstanceOf(T::class.java)
         hasMessageThat().isEqualTo(message)

From 4960065443eaca6c1086548d80c1dbb3f4466183 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 23 Apr 2025 09:24:08 +0200
Subject: [PATCH 9/9] Remove contacts from OidcConfiguration.

https://github.com/matrix-org/matrix-rust-sdk/pull/4958
---
 libraries/matrix/api/build.gradle.kts                         | 4 ----
 .../element/android/libraries/matrix/api/auth/OidcConfig.kt   | 2 --
 .../libraries/matrix/impl/auth/OidcConfigurationProvider.kt   | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/libraries/matrix/api/build.gradle.kts b/libraries/matrix/api/build.gradle.kts
index f9520ec2313..f2059e1580e 100644
--- a/libraries/matrix/api/build.gradle.kts
+++ b/libraries/matrix/api/build.gradle.kts
@@ -46,10 +46,6 @@ android {
             name = "POLICY_URI",
             value = BuildTimeConfig.URL_POLICY ?: "https://element.io/privacy"
         )
-        buildConfigFieldStr(
-            name = "CONTACT",
-            value = BuildTimeConfig.SUPPORT_EMAIL_ADDRESS ?: "support@element.io"
-        )
     }
 }
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
index d6e001f58c8..2ede86a494c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
@@ -26,8 +26,6 @@ object OidcConfig {
     // Note: host must match with the host of CLIENT_URI
     const val POLICY_URI = BuildConfig.POLICY_URI
 
-    const val CONTACT = BuildConfig.CONTACT
-
     // Some homeservers/auth issuers don't support dynamic client registration, and have to be registered manually
     val STATIC_REGISTRATIONS = mapOf(
         "https://id.thirdroom.io/realms/thirdroom" to "elementx",
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
index 12c6512be5f..be8b2c9eea2 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
@@ -22,7 +22,7 @@ class OidcConfigurationProvider @Inject constructor(
         logoUri = OidcConfig.LOGO_URI,
         tosUri = OidcConfig.TOS_URI,
         policyUri = OidcConfig.POLICY_URI,
-        contacts = listOf(OidcConfig.CONTACT),
+        contacts = null,
         staticRegistrations = OidcConfig.STATIC_REGISTRATIONS,
     )
 }