Replace String by AccountProvider to be able to get baseUrl and serverName.

features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/EnterpriseService.kt

@@ -11,6 +11,7 @@ package io.element.android.features.enterprise.api
 import androidx.compose.ui.graphics.Color
 import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.libraries.matrix.api.ClientUrlContentFetcher
+import io.element.android.libraries.matrix.api.accountprovider.AccountProvider
 import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.coroutines.flow.Flow
 
@@ -36,18 +37,21 @@ interface EnterpriseService {
     suspend fun tweakMasUrl(url: String, urlContentFetcher: ClientUrlContentFetcher): String
 
     /**
-     * Returns the list of homeservers the user is allowed to sign in to.
-     *
-     * If the list is empty or contains the special value [ANY_ACCOUNT_PROVIDER], the user is allowed to sign in to any homeserver.
+     * Returns the list of account provider the user is allowed to sign in to.
      */
-    fun homeserverAllowList(): List<String>
+    fun accountProviderAllowList(): List<AccountProvider>
 
     /**
-     * Whether the user is allowed to sign in to a given homeserver, according to [homeserverAllowList].
-     *
-     * @param homeserverUrl the server the user is trying to use.
+     * Whether the user is allowed to sign in to any account provider.
      */
-    suspend fun isAllowedToConnectToHomeserver(homeserverUrl: String): Boolean
+    fun canConnectToAnyAccountProvider(): Boolean
+
+    /**
+     * Whether the user is allowed to sign in to a given homeserver, according to [accountProviderAllowList].
+     *
+     * @param accountProvider the account provider the user is trying to use.
+     */
+    suspend fun isAllowedToConnectToAccountProvider(accountProvider: AccountProvider): Boolean
 
     /**
      * Whether the given homeserver enforces the use of Element Pro or a derived app.
@@ -97,14 +101,4 @@ interface EnterpriseService {
      * @param sessionId the session whose channel is requested.
      */
     fun getNoisyNotificationChannelId(sessionId: SessionId): String?
-
-    companion object {
-        const val ANY_ACCOUNT_PROVIDER = "*"
-    }
-}
-
-fun EnterpriseService.canConnectToAnyHomeserver(): Boolean {
-    return homeserverAllowList().let {
-        it.isEmpty() || it.contains(EnterpriseService.ANY_ACCOUNT_PROVIDER)
-    }
 }

features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseService.kt

@@ -19,6 +19,7 @@ import io.element.android.libraries.core.extensions.mapCatchingExceptions
 import io.element.android.libraries.core.uri.ensureProtocol
 import io.element.android.libraries.matrix.api.ClientUrlContentFetcher
 import io.element.android.libraries.matrix.api.TemporaryMatrixClientFactory
+import io.element.android.libraries.matrix.api.accountprovider.AccountProvider
 import io.element.android.libraries.matrix.api.core.SessionId
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
@@ -33,8 +34,9 @@ class DefaultEnterpriseService(
 ) : EnterpriseService {
     override suspend fun isEnterpriseUser(sessionId: SessionId) = false
     override suspend fun tweakMasUrl(url: String, urlContentFetcher: ClientUrlContentFetcher) = url
-    override fun homeserverAllowList(): List<String> = emptyList()
-    override suspend fun isAllowedToConnectToHomeserver(homeserverUrl: String) = true
+    override fun accountProviderAllowList(): List<AccountProvider> = emptyList()
+    override fun canConnectToAnyAccountProvider(): Boolean = true
+    override suspend fun isAllowedToConnectToAccountProvider(accountProvider: AccountProvider) = true
     override suspend fun isElementProEnforced(serverName: String): Boolean {
         val temporaryMatrixClient = temporaryMatrixClientFactory.create(serverName).getOrElse { return false }
         return temporaryMatrixClient.use { client ->

features/enterprise/impl-foss/src/test/kotlin/io/element/android/features/enterprise/impl/DefaultEnterpriseServiceTest.kt

@@ -18,6 +18,7 @@ import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.FakeTemporaryMatrixClient
 import io.element.android.libraries.matrix.test.FakeTemporaryMatrixClientFactory
+import io.element.android.libraries.matrix.test.accountprovider.anAccountProviderGeneric
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import kotlinx.coroutines.test.runTest
@@ -26,15 +27,21 @@ import org.junit.Test
 
 class DefaultEnterpriseServiceTest {
     @Test
-    fun homeserverWhitelist() {
+    fun accountProviderAllowList() {
         val defaultEnterpriseService = createDefaultEnterpriseService()
-        assertThat(defaultEnterpriseService.homeserverAllowList()).isEmpty()
+        assertThat(defaultEnterpriseService.accountProviderAllowList()).isEmpty()
     }
 
     @Test
-    fun `isAllowedToConnectToHomeserver is true for all homeserver urls`() = runTest {
+    fun `canConnectToAnyAccountProvider is always true`() {
         val defaultEnterpriseService = createDefaultEnterpriseService()
-        assertThat(defaultEnterpriseService.isAllowedToConnectToHomeserver(A_HOMESERVER_URL)).isTrue()
+        assertThat(defaultEnterpriseService.canConnectToAnyAccountProvider()).isTrue()
+    }
+
+    @Test
+    fun `isAllowedToConnectToAccountProvider is true for all account providers`() = runTest {
+        val defaultEnterpriseService = createDefaultEnterpriseService()
+        assertThat(defaultEnterpriseService.isAllowedToConnectToAccountProvider(anAccountProviderGeneric())).isTrue()
     }
 
     @Test

features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeEnterpriseService.kt

@@ -13,6 +13,7 @@ import io.element.android.compound.colors.SemanticColorsLightDark
 import io.element.android.features.enterprise.api.BugReportUrl
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.matrix.api.ClientUrlContentFetcher
+import io.element.android.libraries.matrix.api.accountprovider.AccountProvider
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
@@ -22,8 +23,9 @@ import kotlinx.coroutines.flow.asStateFlow
 
 class FakeEnterpriseService(
     private val isEnterpriseUserResult: (SessionId) -> Boolean = { lambdaError() },
-    private val defaultHomeserverListResult: () -> List<String> = { emptyList() },
-    private val isAllowedToConnectToHomeserverResult: (String) -> Boolean = { lambdaError() },
+    private val accountProviderAllowListResult: () -> List<AccountProvider> = { emptyList() },
+    private val canConnectToAnyAccountProviderResult: () -> Boolean = { true },
+    private val isAllowedToConnectToAccountProviderResult: (AccountProvider) -> Boolean = { lambdaError() },
     initialSemanticColors: SemanticColorsLightDark = SemanticColorsLightDark.default,
     initialBrandColor: Color? = null,
     private val overrideBrandColorResult: (SessionId?, String?) -> Unit = { _, _ -> lambdaError() },
@@ -44,12 +46,16 @@ class FakeEnterpriseService(
         tweakMasUrlResult(url, urlContentFetcher)
     }
 
-    override fun homeserverAllowList(): List<String> {
-        return defaultHomeserverListResult()
+    override fun accountProviderAllowList(): List<AccountProvider> {
+        return accountProviderAllowListResult()
     }
 
-    override suspend fun isAllowedToConnectToHomeserver(homeserverUrl: String): Boolean = simulateLongTask {
-        isAllowedToConnectToHomeserverResult(homeserverUrl)
+    override fun canConnectToAnyAccountProvider(): Boolean {
+        return canConnectToAnyAccountProviderResult()
+    }
+
+    override suspend fun isAllowedToConnectToAccountProvider(accountProvider: AccountProvider): Boolean = simulateLongTask {
+        isAllowedToConnectToAccountProviderResult(accountProvider)
     }
 
     override suspend fun isElementProEnforced(serverName: String): Boolean = simulateLongTask {