diff --git a/app/app-shell/src/jvmTest/kotlin/com/hedvig/android/app/navigation/SessionReconcilerTest.kt b/app/app-shell/src/jvmTest/kotlin/com/hedvig/android/app/navigation/SessionReconcilerTest.kt index 137c8c1b6c..897ac01ca2 100644 --- a/app/app-shell/src/jvmTest/kotlin/com/hedvig/android/app/navigation/SessionReconcilerTest.kt +++ b/app/app-shell/src/jvmTest/kotlin/com/hedvig/android/app/navigation/SessionReconcilerTest.kt @@ -8,7 +8,7 @@ import assertk.assertions.containsExactly import com.hedvig.android.auth.AuthStatus import com.hedvig.android.auth.AuthTokenService import com.hedvig.android.auth.MemberIdService -import com.hedvig.android.auth.storage.AuthTokenStorage +import com.hedvig.android.auth.storage.DataStoreAuthTokenStorage import com.hedvig.android.auth.token.AuthTokens import com.hedvig.android.auth.token.LocalAccessToken import com.hedvig.android.auth.token.LocalRefreshToken @@ -98,7 +98,7 @@ internal class SessionReconcilerTest { controller: BackstackController, isDemoMode: Boolean = false, ): SessionReconciler { - val authTokenStorage = AuthTokenStorage( + val authTokenStorage = DataStoreAuthTokenStorage( TestPreferencesDataStore( datastoreTestFileDirectory = testFolder.newFolder(), coroutineScope = backgroundScope, diff --git a/app/auth/auth-core-public/src/commonMain/kotlin/com/hedvig/android/auth/LogoutUseCase.kt b/app/auth/auth-core-public/src/commonMain/kotlin/com/hedvig/android/auth/LogoutUseCase.kt index 628688402c..14a6be388d 100644 --- a/app/auth/auth-core-public/src/commonMain/kotlin/com/hedvig/android/auth/LogoutUseCase.kt +++ b/app/auth/auth-core-public/src/commonMain/kotlin/com/hedvig/android/auth/LogoutUseCase.kt @@ -1,26 +1,5 @@ package com.hedvig.android.auth -import com.hedvig.android.core.common.ApplicationScope -import com.hedvig.android.core.common.di.AppScope -import com.hedvig.android.logger.logcat -import dev.zacsweers.metro.ContributesBinding -import dev.zacsweers.metro.Inject -import dev.zacsweers.metro.SingleIn -import kotlinx.coroutines.launch - interface LogoutUseCase { fun invoke() } - -@ContributesBinding(AppScope::class) -@SingleIn(AppScope::class) -@Inject -internal class LogoutUseCaseImpl( - private val authTokenService: AuthTokenService, - private val applicationScope: ApplicationScope, -) : LogoutUseCase { - override fun invoke() { - logcat { "Logout usecase called" } - applicationScope.launch { authTokenService.logoutAndInvalidateTokens() } - } -} diff --git a/app/auth/auth-core-public/src/commonMain/kotlin/com/hedvig/android/auth/storage/AuthTokenStorage.kt b/app/auth/auth-core-public/src/commonMain/kotlin/com/hedvig/android/auth/storage/AuthTokenStorage.kt index 6934a5f460..4cc3cfcf57 100644 --- a/app/auth/auth-core-public/src/commonMain/kotlin/com/hedvig/android/auth/storage/AuthTokenStorage.kt +++ b/app/auth/auth-core-public/src/commonMain/kotlin/com/hedvig/android/auth/storage/AuthTokenStorage.kt @@ -1,84 +1,14 @@ package com.hedvig.android.auth.storage -import androidx.datastore.core.DataStore -import androidx.datastore.preferences.core.Preferences -import androidx.datastore.preferences.core.edit -import androidx.datastore.preferences.core.stringPreferencesKey import com.hedvig.android.auth.token.AuthTokens -import com.hedvig.android.auth.token.LocalAccessToken -import com.hedvig.android.auth.token.LocalRefreshToken import com.hedvig.android.authlib.AccessToken import com.hedvig.android.authlib.RefreshToken -import com.hedvig.android.core.common.di.AppScope -import com.hedvig.android.logger.LogPriority -import com.hedvig.android.logger.logcat -import dev.zacsweers.metro.Inject -import dev.zacsweers.metro.SingleIn -import kotlin.time.Clock -import kotlin.time.Duration.Companion.seconds -import kotlin.time.Instant import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.map -@SingleIn(AppScope::class) -@Inject -class AuthTokenStorage( - private val dataStore: DataStore, - private val clock: Clock = Clock.System, -) { - fun getTokens(): Flow { - return dataStore.data - .map { preferences -> - val accessTokenString = preferences[accessTokenPreferenceKey] ?: return@map null - val accessTokenExpirationIso8601 = preferences[accessTokenExpirationIso8601PreferenceKey] ?: return@map null - val accessTokenExpirationInstant = Instant.parse(accessTokenExpirationIso8601) +interface AuthTokenStorage { + fun getTokens(): Flow - val refreshTokenString = preferences[refreshTokenPreferenceKey] ?: return@map null - val refreshTokenExpirationIso8601 = preferences[refreshTokenExpirationIso8601PreferenceKey] ?: return@map null - val refreshTokenExpirationInstant = Instant.parse(refreshTokenExpirationIso8601) + suspend fun updateTokens(accessToken: AccessToken, refreshToken: RefreshToken) - AuthTokens( - LocalAccessToken(accessTokenString, accessTokenExpirationInstant), - LocalRefreshToken(refreshTokenString, refreshTokenExpirationInstant), - ) - } - } - - suspend fun updateTokens(accessToken: AccessToken, refreshToken: RefreshToken) { - dataStore.edit { preferences -> - val now = clock.now() - - preferences[accessTokenPreferenceKey] = accessToken.token - val accessTokenExpirationInstant = now + accessToken.expiryInSeconds.seconds - preferences[accessTokenExpirationIso8601PreferenceKey] = accessTokenExpirationInstant.toString() - - preferences[refreshTokenPreferenceKey] = refreshToken.token - val refreshTokenExpirationInstant = now + refreshToken.expiryInSeconds.seconds - preferences[refreshTokenExpirationIso8601PreferenceKey] = refreshTokenExpirationInstant.toString() - logcat(LogPriority.VERBOSE) { - buildString { - append("Saved tokens with expiration instants: ") - append("Access token:$accessTokenExpirationInstant") - append(" | ") - append("Refresh token:$refreshTokenExpirationInstant") - } - } - } - } - - suspend fun clearTokens() { - dataStore.edit { preferences -> - preferences.remove(accessTokenPreferenceKey) - preferences.remove(refreshTokenPreferenceKey) - } - } - - companion object { - private val accessTokenPreferenceKey = stringPreferencesKey("com.hedvig.android.auth.storage.ACCESS_TOKEN") - private val accessTokenExpirationIso8601PreferenceKey = - stringPreferencesKey("com.hedvig.android.auth.storage.ACCESS_TOKEN_EXPIRATION_ISO_8601") - private val refreshTokenPreferenceKey = stringPreferencesKey("com.hedvig.android.auth.storage.REFRESH_TOKEN") - private val refreshTokenExpirationIso8601PreferenceKey = - stringPreferencesKey("com.hedvig.android.auth.storage.REFRESH_TOKEN_EXPIRATION_ISO_8601") - } + suspend fun clearTokens() } diff --git a/app/auth/auth-core-public/src/commonMain/kotlin/com/hedvig/android/auth/AndroidAccessTokenProvider.kt b/app/auth/auth-core-public/src/jvmMain/kotlin/com/hedvig/android/auth/AndroidAccessTokenProvider.kt similarity index 100% rename from app/auth/auth-core-public/src/commonMain/kotlin/com/hedvig/android/auth/AndroidAccessTokenProvider.kt rename to app/auth/auth-core-public/src/jvmMain/kotlin/com/hedvig/android/auth/AndroidAccessTokenProvider.kt diff --git a/app/auth/auth-core-public/src/jvmMain/kotlin/com/hedvig/android/auth/LogoutUseCaseImpl.kt b/app/auth/auth-core-public/src/jvmMain/kotlin/com/hedvig/android/auth/LogoutUseCaseImpl.kt new file mode 100644 index 0000000000..da5b49e747 --- /dev/null +++ b/app/auth/auth-core-public/src/jvmMain/kotlin/com/hedvig/android/auth/LogoutUseCaseImpl.kt @@ -0,0 +1,22 @@ +package com.hedvig.android.auth + +import com.hedvig.android.core.common.ApplicationScope +import com.hedvig.android.core.common.di.AppScope +import com.hedvig.android.logger.logcat +import dev.zacsweers.metro.ContributesBinding +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.SingleIn +import kotlinx.coroutines.launch + +@ContributesBinding(AppScope::class) +@SingleIn(AppScope::class) +@Inject +internal class LogoutUseCaseImpl( + private val authTokenService: AuthTokenService, + private val applicationScope: ApplicationScope, +) : LogoutUseCase { + override fun invoke() { + logcat { "Logout usecase called" } + applicationScope.launch { authTokenService.logoutAndInvalidateTokens() } + } +} diff --git a/app/auth/auth-core-public/src/jvmMain/kotlin/com/hedvig/android/auth/storage/DataStoreAuthTokenStorage.kt b/app/auth/auth-core-public/src/jvmMain/kotlin/com/hedvig/android/auth/storage/DataStoreAuthTokenStorage.kt new file mode 100644 index 0000000000..5a831b208d --- /dev/null +++ b/app/auth/auth-core-public/src/jvmMain/kotlin/com/hedvig/android/auth/storage/DataStoreAuthTokenStorage.kt @@ -0,0 +1,86 @@ +package com.hedvig.android.auth.storage + +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.stringPreferencesKey +import com.hedvig.android.auth.token.AuthTokens +import com.hedvig.android.auth.token.LocalAccessToken +import com.hedvig.android.auth.token.LocalRefreshToken +import com.hedvig.android.authlib.AccessToken +import com.hedvig.android.authlib.RefreshToken +import com.hedvig.android.core.common.di.AppScope +import com.hedvig.android.logger.LogPriority +import com.hedvig.android.logger.logcat +import dev.zacsweers.metro.ContributesBinding +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.SingleIn +import kotlin.time.Clock +import kotlin.time.Duration.Companion.seconds +import kotlin.time.Instant +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map + +@ContributesBinding(AppScope::class) +@SingleIn(AppScope::class) +@Inject +class DataStoreAuthTokenStorage( + private val dataStore: DataStore, + private val clock: Clock = Clock.System, +) : AuthTokenStorage { + override fun getTokens(): Flow { + return dataStore.data + .map { preferences -> + val accessTokenString = preferences[accessTokenPreferenceKey] ?: return@map null + val accessTokenExpirationIso8601 = preferences[accessTokenExpirationIso8601PreferenceKey] ?: return@map null + val accessTokenExpirationInstant = Instant.parse(accessTokenExpirationIso8601) + + val refreshTokenString = preferences[refreshTokenPreferenceKey] ?: return@map null + val refreshTokenExpirationIso8601 = preferences[refreshTokenExpirationIso8601PreferenceKey] ?: return@map null + val refreshTokenExpirationInstant = Instant.parse(refreshTokenExpirationIso8601) + + AuthTokens( + LocalAccessToken(accessTokenString, accessTokenExpirationInstant), + LocalRefreshToken(refreshTokenString, refreshTokenExpirationInstant), + ) + } + } + + override suspend fun updateTokens(accessToken: AccessToken, refreshToken: RefreshToken) { + dataStore.edit { preferences -> + val now = clock.now() + + preferences[accessTokenPreferenceKey] = accessToken.token + val accessTokenExpirationInstant = now + accessToken.expiryInSeconds.seconds + preferences[accessTokenExpirationIso8601PreferenceKey] = accessTokenExpirationInstant.toString() + + preferences[refreshTokenPreferenceKey] = refreshToken.token + val refreshTokenExpirationInstant = now + refreshToken.expiryInSeconds.seconds + preferences[refreshTokenExpirationIso8601PreferenceKey] = refreshTokenExpirationInstant.toString() + logcat(LogPriority.VERBOSE) { + buildString { + append("Saved tokens with expiration instants: ") + append("Access token:$accessTokenExpirationInstant") + append(" | ") + append("Refresh token:$refreshTokenExpirationInstant") + } + } + } + } + + override suspend fun clearTokens() { + dataStore.edit { preferences -> + preferences.remove(accessTokenPreferenceKey) + preferences.remove(refreshTokenPreferenceKey) + } + } + + companion object { + private val accessTokenPreferenceKey = stringPreferencesKey("com.hedvig.android.auth.storage.ACCESS_TOKEN") + private val accessTokenExpirationIso8601PreferenceKey = + stringPreferencesKey("com.hedvig.android.auth.storage.ACCESS_TOKEN_EXPIRATION_ISO_8601") + private val refreshTokenPreferenceKey = stringPreferencesKey("com.hedvig.android.auth.storage.REFRESH_TOKEN") + private val refreshTokenExpirationIso8601PreferenceKey = + stringPreferencesKey("com.hedvig.android.auth.storage.REFRESH_TOKEN_EXPIRATION_ISO_8601") + } +} diff --git a/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/AuthTokenServiceImplTest.kt b/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/AuthTokenServiceImplTest.kt index f95869a7ff..20412b0c31 100644 --- a/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/AuthTokenServiceImplTest.kt +++ b/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/AuthTokenServiceImplTest.kt @@ -7,6 +7,7 @@ import assertk.assertions.isNotNull import assertk.assertions.isNull import com.hedvig.android.auth.event.AuthEventStorage import com.hedvig.android.auth.storage.AuthTokenStorage +import com.hedvig.android.auth.storage.DataStoreAuthTokenStorage import com.hedvig.android.auth.test.FakeAuthRepository import com.hedvig.android.authlib.AccessToken import com.hedvig.android.authlib.AuthRepository @@ -128,7 +129,7 @@ internal class AuthTokenServiceImplTest { clock, ) - private fun TestScope.authTokenStorage(clock: Clock) = AuthTokenStorage( + private fun TestScope.authTokenStorage(clock: Clock) = DataStoreAuthTokenStorage( TestPreferencesDataStore( datastoreTestFileDirectory = testFolder.newFolder("datastoreTempFolder"), coroutineScope = backgroundScope, diff --git a/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/interceptor/AndroidAccessTokenProviderTest.kt b/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/interceptor/AndroidAccessTokenProviderTest.kt index 31143b8e23..fb2f050cff 100644 --- a/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/interceptor/AndroidAccessTokenProviderTest.kt +++ b/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/interceptor/AndroidAccessTokenProviderTest.kt @@ -8,6 +8,7 @@ import com.hedvig.android.auth.AuthTokenService import com.hedvig.android.auth.AuthTokenServiceImpl import com.hedvig.android.auth.event.AuthEventStorage import com.hedvig.android.auth.storage.AuthTokenStorage +import com.hedvig.android.auth.storage.DataStoreAuthTokenStorage import com.hedvig.android.auth.test.FakeAuthRepository import com.hedvig.android.authlib.AccessToken import com.hedvig.android.authlib.AuthTokenResult @@ -193,7 +194,7 @@ class AndroidAccessTokenProviderTest { ) } - private fun TestScope.authTokenStorage(clock: Clock) = AuthTokenStorage( + private fun TestScope.authTokenStorage(clock: Clock) = DataStoreAuthTokenStorage( TestPreferencesDataStore( datastoreTestFileDirectory = testFolder.newFolder("datastoreTempFolder"), coroutineScope = backgroundScope, diff --git a/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/storage/AuthTokenStorageTest.kt b/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/storage/AuthTokenStorageTest.kt index f7a0a5c279..a93afda1db 100644 --- a/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/storage/AuthTokenStorageTest.kt +++ b/app/auth/auth-core-public/src/jvmTest/kotlin/com/hedvig/android/auth/storage/AuthTokenStorageTest.kt @@ -44,7 +44,7 @@ internal class AuthTokenStorageTest { } private fun TestScope.authTokenStorage(clock: Clock): AuthTokenStorage { - return AuthTokenStorage( + return DataStoreAuthTokenStorage( TestPreferencesDataStore( datastoreTestFileDirectory = testFolder.newFolder("datastoreTempFolder"), coroutineScope = backgroundScope, diff --git a/app/core/core-build-constants/src/commonMain/kotlin/com/hedvig/android/core/buildconstants/CommonHedvigBuildConstants.kt b/app/core/core-build-constants/src/commonMain/kotlin/com/hedvig/android/core/buildconstants/CommonHedvigBuildConstants.kt index 1732261d82..8a31c90bda 100644 --- a/app/core/core-build-constants/src/commonMain/kotlin/com/hedvig/android/core/buildconstants/CommonHedvigBuildConstants.kt +++ b/app/core/core-build-constants/src/commonMain/kotlin/com/hedvig/android/core/buildconstants/CommonHedvigBuildConstants.kt @@ -36,31 +36,12 @@ internal class CommonHedvigBuildConstants( override val buildApiVersion: Int = appBuildConfig.osSdkVersion override val platformName: String = appBuildConfig.platformName override val userAgent: String - get() = makeUserAgent(languageService.getLanguage().toBcp47Format(), appBuildConfig) + get() = platformUserAgent(languageService.getLanguage().toBcp47Format(), appBuildConfig) override val model: String = "${appBuildConfig.manufacturer} ${appBuildConfig.model}" } internal expect val defaultPlatformName: String -private fun makeUserAgent(languageBCP47: String, appBuildConfig: AppBuildConfig): String = buildString { - append(appBuildConfig.applicationId) - append(" ") - append(appBuildConfig.versionName) - append(" ") - append("(Android") - append(" ") - append(appBuildConfig.osReleaseVersion) - append("; ") - append(appBuildConfig.brand) - append(" ") - append(appBuildConfig.model) - append("; ") - append(appBuildConfig.device) - append("; ") - append(languageBCP47) - append(")") -} - private interface UrlHolder { fun urlGraphqlOctopus(flavor: Flavor): String diff --git a/app/core/core-build-constants/src/commonMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.kt b/app/core/core-build-constants/src/commonMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.kt new file mode 100644 index 0000000000..3d64b130ff --- /dev/null +++ b/app/core/core-build-constants/src/commonMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.kt @@ -0,0 +1,6 @@ +package com.hedvig.android.core.buildconstants + +/** + * The value of the `User-Agent` header, in the format the platform's app sends. + */ +internal expect fun platformUserAgent(languageBCP47: String, appBuildConfig: AppBuildConfig): String diff --git a/app/core/core-build-constants/src/jvmAndAndroidMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.jvmAndAndroid.kt b/app/core/core-build-constants/src/jvmAndAndroidMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.jvmAndAndroid.kt new file mode 100644 index 0000000000..2bd9badc71 --- /dev/null +++ b/app/core/core-build-constants/src/jvmAndAndroidMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.jvmAndAndroid.kt @@ -0,0 +1,20 @@ +package com.hedvig.android.core.buildconstants + +internal actual fun platformUserAgent(languageBCP47: String, appBuildConfig: AppBuildConfig): String = buildString { + append(appBuildConfig.applicationId) + append(" ") + append(appBuildConfig.versionName) + append(" ") + append("(Android") + append(" ") + append(appBuildConfig.osReleaseVersion) + append("; ") + append(appBuildConfig.brand) + append(" ") + append(appBuildConfig.model) + append("; ") + append(appBuildConfig.device) + append("; ") + append(languageBCP47) + append(")") +} diff --git a/app/core/core-build-constants/src/nativeMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.native.kt b/app/core/core-build-constants/src/nativeMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.native.kt new file mode 100644 index 0000000000..30fb89273e --- /dev/null +++ b/app/core/core-build-constants/src/nativeMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.native.kt @@ -0,0 +1,4 @@ +package com.hedvig.android.core.buildconstants + +internal actual fun platformUserAgent(languageBCP47: String, appBuildConfig: AppBuildConfig): String = + "${appBuildConfig.applicationId} ${appBuildConfig.versionName} (iOS ${appBuildConfig.osReleaseVersion})" diff --git a/app/core/core-build-constants/src/nativeTest/kotlin/com/hedvig/android/core/buildconstants/NativeUserAgentTest.kt b/app/core/core-build-constants/src/nativeTest/kotlin/com/hedvig/android/core/buildconstants/NativeUserAgentTest.kt new file mode 100644 index 0000000000..1aa14d20b9 --- /dev/null +++ b/app/core/core-build-constants/src/nativeTest/kotlin/com/hedvig/android/core/buildconstants/NativeUserAgentTest.kt @@ -0,0 +1,26 @@ +package com.hedvig.android.core.buildconstants + +import kotlin.test.Test +import kotlin.test.assertEquals + +class NativeUserAgentTest { + @Test + fun `user agent matches the iOS format`() { + val config = object : AppBuildConfig { + override val debug: Boolean = true + override val applicationId: String = "com.hedvig.test" + override val buildType: String = "debug" + override val versionCode: Int = 1 + override val versionName: String = "14.6.3" + override val appFlavor: Flavor = Flavor.Develop + override val osReleaseVersion: String = "26.4" + override val osSdkVersion: Int = 0 + override val brand: String = "Apple" + override val model: String = "iPhone" + override val device: String = "iPhone18,1" + override val manufacturer: String = "Apple" + } + + assertEquals("com.hedvig.test 14.6.3 (iOS 26.4)", platformUserAgent("en-SE", config)) + } +} diff --git a/app/core/core-demo-mode/build.gradle.kts b/app/core/core-demo-mode/build.gradle.kts index a190b3f485..6c45593caa 100644 --- a/app/core/core-demo-mode/build.gradle.kts +++ b/app/core/core-demo-mode/build.gradle.kts @@ -6,11 +6,13 @@ plugins { kotlin { sourceSets { commonMain.dependencies { - implementation(libs.androidx.datastore.core) - implementation(libs.androidx.datastore.preferencesCore) implementation(libs.coroutines.core) implementation(projects.authEventCore) implementation(projects.coreCommonPublic) } + jvmMain.dependencies { + implementation(libs.androidx.datastore.core) + implementation(libs.androidx.datastore.preferencesCore) + } } } diff --git a/app/core/core-demo-mode/src/commonMain/kotlin/com/hedvig/android/core/demomode/DemoManager.kt b/app/core/core-demo-mode/src/commonMain/kotlin/com/hedvig/android/core/demomode/DemoManager.kt index 77c899f047..e6f1b0d016 100644 --- a/app/core/core-demo-mode/src/commonMain/kotlin/com/hedvig/android/core/demomode/DemoManager.kt +++ b/app/core/core-demo-mode/src/commonMain/kotlin/com/hedvig/android/core/demomode/DemoManager.kt @@ -1,48 +1,9 @@ package com.hedvig.android.core.demomode -import androidx.datastore.core.DataStore -import androidx.datastore.preferences.core.Preferences -import androidx.datastore.preferences.core.booleanPreferencesKey -import androidx.datastore.preferences.core.edit -import com.hedvig.android.core.common.di.AppScope -import com.hedvig.android.logger.LogPriority -import com.hedvig.android.logger.logcat -import dev.zacsweers.metro.ContributesBinding -import dev.zacsweers.metro.Inject -import dev.zacsweers.metro.SingleIn import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.onEach interface DemoManager { fun isDemoMode(): Flow suspend fun setDemoMode(demoMode: Boolean) } - -@ContributesBinding(AppScope::class) -@SingleIn(AppScope::class) -@Inject -internal class DataStoreDemoManager( - private val dataStore: DataStore, -) : DemoManager { - override fun isDemoMode(): Flow { - return dataStore.data.map { - it[demoModeKey] ?: false - }.distinctUntilChanged().onEach { - logcat(LogPriority.DEBUG) { "DemoManager: isDemoMode:$it" } - } - } - - override suspend fun setDemoMode(demoMode: Boolean) { - logcat { "DemoManager: setDemoMode:$demoMode" } - dataStore.edit { - it[demoModeKey] = demoMode - } - } - - companion object { - private val demoModeKey = booleanPreferencesKey("com.hedvig.android.core.demomode.demo-mode") - } -} diff --git a/app/core/core-demo-mode/src/jvmMain/kotlin/com/hedvig/android/core/demomode/DataStoreDemoManager.kt b/app/core/core-demo-mode/src/jvmMain/kotlin/com/hedvig/android/core/demomode/DataStoreDemoManager.kt new file mode 100644 index 0000000000..7599be1c81 --- /dev/null +++ b/app/core/core-demo-mode/src/jvmMain/kotlin/com/hedvig/android/core/demomode/DataStoreDemoManager.kt @@ -0,0 +1,42 @@ +package com.hedvig.android.core.demomode + +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.booleanPreferencesKey +import androidx.datastore.preferences.core.edit +import com.hedvig.android.core.common.di.AppScope +import com.hedvig.android.logger.LogPriority +import com.hedvig.android.logger.logcat +import dev.zacsweers.metro.ContributesBinding +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.SingleIn +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onEach + +@ContributesBinding(AppScope::class) +@SingleIn(AppScope::class) +@Inject +internal class DataStoreDemoManager( + private val dataStore: DataStore, +) : DemoManager { + override fun isDemoMode(): Flow { + return dataStore.data.map { + it[demoModeKey] ?: false + }.distinctUntilChanged().onEach { + logcat(LogPriority.DEBUG) { "DemoManager: isDemoMode:$it" } + } + } + + override suspend fun setDemoMode(demoMode: Boolean) { + logcat { "DemoManager: setDemoMode:$demoMode" } + dataStore.edit { + it[demoModeKey] = demoMode + } + } + + companion object { + private val demoModeKey = booleanPreferencesKey("com.hedvig.android.core.demomode.demo-mode") + } +} diff --git a/app/language/language-core/src/commonMain/kotlin/com/hedvig/android/language/LanguageLabel.kt b/app/feature/feature-login/src/commonMain/kotlin/com/hedvig/android/feature/login/marketing/LanguageLabel.kt similarity index 71% rename from app/language/language-core/src/commonMain/kotlin/com/hedvig/android/language/LanguageLabel.kt rename to app/feature/feature-login/src/commonMain/kotlin/com/hedvig/android/feature/login/marketing/LanguageLabel.kt index bee097fc54..94d4311bd3 100644 --- a/app/language/language-core/src/commonMain/kotlin/com/hedvig/android/language/LanguageLabel.kt +++ b/app/feature/feature-login/src/commonMain/kotlin/com/hedvig/android/feature/login/marketing/LanguageLabel.kt @@ -1,5 +1,6 @@ -package com.hedvig.android.language +package com.hedvig.android.feature.login.marketing +import com.hedvig.android.language.Language import com.hedvig.android.language.Language.EN_SE import com.hedvig.android.language.Language.SV_SE import hedvig.resources.Res @@ -7,7 +8,7 @@ import hedvig.resources.english_swedish import hedvig.resources.swedish import org.jetbrains.compose.resources.StringResource -val Language.label: StringResource +internal val Language.label: StringResource get() = when (this) { SV_SE -> Res.string.swedish EN_SE -> Res.string.english_swedish diff --git a/app/feature/feature-login/src/commonMain/kotlin/com/hedvig/android/feature/login/marketing/MarketingDestination.kt b/app/feature/feature-login/src/commonMain/kotlin/com/hedvig/android/feature/login/marketing/MarketingDestination.kt index ccea67a799..d4a9f47144 100644 --- a/app/feature/feature-login/src/commonMain/kotlin/com/hedvig/android/feature/login/marketing/MarketingDestination.kt +++ b/app/feature/feature-login/src/commonMain/kotlin/com/hedvig/android/feature/login/marketing/MarketingDestination.kt @@ -55,7 +55,6 @@ import com.hedvig.android.design.system.hedvig.rememberHedvigBottomSheetState import com.hedvig.android.design.system.hedvig.show import com.hedvig.android.feature.login.marketing.ui.LoginBackgroundVideo import com.hedvig.android.language.Language -import com.hedvig.android.language.label import hedvig.resources.MARKETING_GET_HEDVIG import hedvig.resources.PROFILE_ABOUT_APP_VERSION import hedvig.resources.Res diff --git a/app/feature/feature-profile/src/commonMain/kotlin/com/hedvig/android/feature/profile/settings/LanguageLabel.kt b/app/feature/feature-profile/src/commonMain/kotlin/com/hedvig/android/feature/profile/settings/LanguageLabel.kt new file mode 100644 index 0000000000..7fe950c314 --- /dev/null +++ b/app/feature/feature-profile/src/commonMain/kotlin/com/hedvig/android/feature/profile/settings/LanguageLabel.kt @@ -0,0 +1,15 @@ +package com.hedvig.android.feature.profile.settings + +import com.hedvig.android.language.Language +import com.hedvig.android.language.Language.EN_SE +import com.hedvig.android.language.Language.SV_SE +import hedvig.resources.Res +import hedvig.resources.english_swedish +import hedvig.resources.swedish +import org.jetbrains.compose.resources.StringResource + +internal val Language.label: StringResource + get() = when (this) { + SV_SE -> Res.string.swedish + EN_SE -> Res.string.english_swedish + } diff --git a/app/feature/feature-profile/src/commonMain/kotlin/com/hedvig/android/feature/profile/settings/SettingsDestination.kt b/app/feature/feature-profile/src/commonMain/kotlin/com/hedvig/android/feature/profile/settings/SettingsDestination.kt index 9962ba782d..5d018c1c69 100644 --- a/app/feature/feature-profile/src/commonMain/kotlin/com/hedvig/android/feature/profile/settings/SettingsDestination.kt +++ b/app/feature/feature-profile/src/commonMain/kotlin/com/hedvig/android/feature/profile/settings/SettingsDestination.kt @@ -38,7 +38,6 @@ import com.hedvig.android.feature.profile.settings.SettingsUiState.Loaded import com.hedvig.android.language.Language import com.hedvig.android.language.Language.EN_SE import com.hedvig.android.language.Language.SV_SE -import com.hedvig.android.language.label import com.hedvig.android.memberreminders.ui.ReminderCardEnableNotifications import com.hedvig.android.notification.permission.NotificationPermissionDialog import com.hedvig.android.notification.permission.NotificationPermissionState diff --git a/app/language/language-core/build.gradle.kts b/app/language/language-core/build.gradle.kts index fa28b36e9e..f63ecd8339 100644 --- a/app/language/language-core/build.gradle.kts +++ b/app/language/language-core/build.gradle.kts @@ -11,7 +11,6 @@ kotlin { implementation(libs.androidx.annotation) implementation(projects.coreCommonPublic) implementation(projects.coreLocale) - implementation(projects.coreResources) } commonTest.dependencies { implementation(libs.assertK) diff --git a/app/network/network-clients/build.gradle.kts b/app/network/network-clients/build.gradle.kts index 88662c2435..b519a71b0b 100644 --- a/app/network/network-clients/build.gradle.kts +++ b/app/network/network-clients/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi - plugins { id("hedvig.multiplatform.library.ios") id("hedvig.multiplatform.library.android") @@ -10,15 +8,6 @@ hedvig { } kotlin { - @OptIn(ExperimentalKotlinGradlePluginApi::class) - applyDefaultHierarchyTemplate { - common { - group("mobile") { - withAndroidLibraryTarget() - withNative() - } - } - } sourceSets { commonMain.dependencies { implementation(libs.apollo.api) @@ -39,14 +28,10 @@ kotlin { implementation(projects.languageCore) implementation(projects.trackingCore) } - getByName("mobileMain") { - dependencies { - implementation(libs.datadog.sdk.ktor) - implementation(projects.datadogCore) - } - } androidMain.dependencies { + implementation(libs.datadog.sdk.ktor) implementation(libs.ktor.client.okhttp) + implementation(projects.datadogCore) } jvmMain.dependencies { implementation(libs.ktor.client.okhttp) diff --git a/app/network/network-clients/src/mobileMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.mobile.kt b/app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/di/DatadogKtorPlugin.android.kt similarity index 100% rename from app/network/network-clients/src/mobileMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.mobile.kt rename to app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/di/DatadogKtorPlugin.android.kt diff --git a/app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.android.kt b/app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.android.kt new file mode 100644 index 0000000000..0c80c87c20 --- /dev/null +++ b/app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.android.kt @@ -0,0 +1,9 @@ +package com.hedvig.android.network.clients.di + +import io.ktor.http.HeadersBuilder + +internal actual fun HeadersBuilder.appendPlatformHeaders() { + // no-op +} + +internal actual fun platformClientName(appPackageId: String): String = appPackageId diff --git a/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/LoggingInterceptor.kt b/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/LoggingInterceptor.kt index 72c52c2822..cf133732ac 100644 --- a/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/LoggingInterceptor.kt +++ b/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/LoggingInterceptor.kt @@ -24,15 +24,14 @@ import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.flow.onEach /** - * The app's Apollo interceptors, the same on every platform and in this order: a member whose session the backend - * rejects is logged out first, then the request is logged. + * Adds [platformInterceptors] in order, then [LoggingInterceptor], so a request is logged after every other + * interceptor has seen its response. */ internal fun ApolloClient.Builder.addHedvigInterceptors( - authTokenService: AuthTokenService, - demoManager: DemoManager, + platformInterceptors: List, logMemberData: Boolean, ): ApolloClient.Builder = this - .addInterceptor(LogoutOnUnauthenticatedInterceptor(authTokenService, demoManager)) + .apply { platformInterceptors.forEach(::addInterceptor) } .addInterceptor(LoggingInterceptor(logMemberData)) internal class LoggingInterceptor( diff --git a/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.kt b/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.kt index 0a764aea4d..aa0cec2d29 100644 --- a/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.kt +++ b/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.kt @@ -1,15 +1,14 @@ package com.hedvig.android.network.clients.di import com.apollographql.apollo.ApolloClient +import com.apollographql.apollo.interceptor.ApolloInterceptor import com.apollographql.cache.normalized.api.NormalizedCacheFactory import com.apollographql.cache.normalized.memory.MemoryCacheFactory import com.apollographql.ktor.ktorClient -import com.hedvig.android.auth.AuthTokenService import com.hedvig.android.core.buildconstants.HedvigBuildConstants import com.hedvig.android.core.common.di.AppScope import com.hedvig.android.core.common.di.BaseHttpClient import com.hedvig.android.core.datastore.DeviceIdFetcher -import com.hedvig.android.core.demomode.DemoManager import com.hedvig.android.language.LanguageService import com.hedvig.android.logger.logcat import com.hedvig.android.network.clients.AccessTokenFetcher @@ -63,23 +62,24 @@ interface NetworkMetroProviders { @Provides @SingleIn(AppScope::class) fun provideNormalizedCacheFactory(): NormalizedCacheFactory = MemoryCacheFactory(maxSizeBytes = 10 * 1024 * 1024) +} - @Provides - @SingleIn(AppScope::class) - fun provideApolloClient( - authTokenService: AuthTokenService, - demoManager: DemoManager, - normalizedCacheFactory: NormalizedCacheFactory, - httpClient: HttpClient, - hedvigBuildConstants: HedvigBuildConstants, - ): ApolloClient = with(Cache) { - ApolloClient.Builder() - .cache(normalizedCacheFactory) - .ktorClient(httpClient) - .httpServerUrl(hedvigBuildConstants.urlGraphqlOctopus) - .addHedvigInterceptors(authTokenService, demoManager, logMemberData = !hedvigBuildConstants.isProduction) - .build() - } +/** + * The app's Apollo client: the normalized cache, [httpClient] with its headers, the Octopus URL, and the interceptor + * chain of [addHedvigInterceptors] with [platformInterceptors] ahead of logging. + */ +internal fun buildHedvigApolloClient( + normalizedCacheFactory: NormalizedCacheFactory, + httpClient: HttpClient, + hedvigBuildConstants: HedvigBuildConstants, + platformInterceptors: List, +): ApolloClient = with(Cache) { + ApolloClient.Builder() + .cache(normalizedCacheFactory) + .ktorClient(httpClient) + .httpServerUrl(hedvigBuildConstants.urlGraphqlOctopus) + .addHedvigInterceptors(platformInterceptors, logMemberData = !hedvigBuildConstants.isProduction) + .build() } internal fun buildKtorClient( @@ -122,7 +122,7 @@ private fun DefaultRequest.DefaultRequestBuilder.commonHeaders( append("User-Agent", hedvigBuildConstants.userAgent) append("Accept-Language", languageTag) append("hedvig-language", languageTag) - append("apollographql-client-name", hedvigBuildConstants.appPackageId) + append("apollographql-client-name", platformClientName(hedvigBuildConstants.appPackageId)) append("apollographql-client-version", hedvigBuildConstants.appVersionName) append("X-Build-Version", hedvigBuildConstants.appVersionCode) append("X-App-Version", hedvigBuildConstants.appVersionName) @@ -133,6 +133,7 @@ private fun DefaultRequest.DefaultRequestBuilder.commonHeaders( "Hedvig-App-Version", "${hedvigBuildConstants.platformName.lowercase()};${hedvigBuildConstants.appVersionName}", ) + appendPlatformHeaders() } } diff --git a/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.kt b/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.kt new file mode 100644 index 0000000000..a7f043805e --- /dev/null +++ b/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.kt @@ -0,0 +1,13 @@ +package com.hedvig.android.network.clients.di + +import io.ktor.http.HeadersBuilder + +/** + * Appends the headers only one platform sends, after the headers every platform sends. + */ +internal expect fun HeadersBuilder.appendPlatformHeaders() + +/** + * The value of the `apollographql-client-name` header, in the format the platform's app sends. + */ +internal expect fun platformClientName(appPackageId: String): String diff --git a/app/network/network-clients/src/jvmAndAndroidMain/kotlin/com/hedvig/android/network/clients/di/ApolloClientMetroProviders.kt b/app/network/network-clients/src/jvmAndAndroidMain/kotlin/com/hedvig/android/network/clients/di/ApolloClientMetroProviders.kt new file mode 100644 index 0000000000..cef0dfccc2 --- /dev/null +++ b/app/network/network-clients/src/jvmAndAndroidMain/kotlin/com/hedvig/android/network/clients/di/ApolloClientMetroProviders.kt @@ -0,0 +1,39 @@ +package com.hedvig.android.network.clients.di + +import com.apollographql.apollo.ApolloClient +import com.apollographql.apollo.interceptor.ApolloInterceptor +import com.apollographql.cache.normalized.api.NormalizedCacheFactory +import com.hedvig.android.auth.AuthTokenService +import com.hedvig.android.core.buildconstants.HedvigBuildConstants +import com.hedvig.android.core.common.di.AppScope +import com.hedvig.android.core.demomode.DemoManager +import com.hedvig.android.network.clients.apollo.LogoutOnUnauthenticatedInterceptor +import dev.zacsweers.metro.ContributesTo +import dev.zacsweers.metro.Provides +import dev.zacsweers.metro.SingleIn +import io.ktor.client.HttpClient + +@ContributesTo(AppScope::class) +interface ApolloClientMetroProviders { + /** The interceptor chain is [LogoutOnUnauthenticatedInterceptor], then logging. */ + @Provides + @SingleIn(AppScope::class) + fun provideApolloClient( + authTokenService: AuthTokenService, + demoManager: DemoManager, + normalizedCacheFactory: NormalizedCacheFactory, + httpClient: HttpClient, + hedvigBuildConstants: HedvigBuildConstants, + ): ApolloClient = buildHedvigApolloClient( + normalizedCacheFactory, + httpClient, + hedvigBuildConstants, + apolloPlatformInterceptors(authTokenService, demoManager), + ) +} + +/** A member whose session the backend rejects is logged out, unless in demo mode. */ +internal fun apolloPlatformInterceptors( + authTokenService: AuthTokenService, + demoManager: DemoManager, +): List = listOf(LogoutOnUnauthenticatedInterceptor(authTokenService, demoManager)) diff --git a/app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.jvm.kt b/app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.jvm.kt new file mode 100644 index 0000000000..0c80c87c20 --- /dev/null +++ b/app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.jvm.kt @@ -0,0 +1,9 @@ +package com.hedvig.android.network.clients.di + +import io.ktor.http.HeadersBuilder + +internal actual fun HeadersBuilder.appendPlatformHeaders() { + // no-op +} + +internal actual fun platformClientName(appPackageId: String): String = appPackageId diff --git a/app/network/network-clients/src/jvmTest/kotlin/com/hedvig/android/network/clients/apollo/ApolloInterceptorsTest.kt b/app/network/network-clients/src/jvmTest/kotlin/com/hedvig/android/network/clients/apollo/ApolloInterceptorsTest.kt index 1f96253fd0..0772b5e132 100644 --- a/app/network/network-clients/src/jvmTest/kotlin/com/hedvig/android/network/clients/apollo/ApolloInterceptorsTest.kt +++ b/app/network/network-clients/src/jvmTest/kotlin/com/hedvig/android/network/clients/apollo/ApolloInterceptorsTest.kt @@ -23,6 +23,7 @@ import com.hedvig.android.core.tracking.ActionType import com.hedvig.android.core.tracking.ErrorSource import com.hedvig.android.core.tracking.RumLogger import com.hedvig.android.logger.TestLogcatLoggingRule +import com.hedvig.android.network.clients.di.apolloPlatformInterceptors import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.test.runTest @@ -30,8 +31,8 @@ import org.junit.Rule import org.junit.Test /** - * Runs queued GraphQL responses through an [ApolloClient] carrying [addHedvigInterceptors], the chain the provided - * Apollo client is built with. + * Runs queued GraphQL responses through an [ApolloClient] carrying [addHedvigInterceptors] with + * [apolloPlatformInterceptors], the chain the provided Android and JVM Apollo client is built with. */ @OptIn(ApolloExperimental::class) internal class ApolloInterceptorsTest { @@ -90,8 +91,7 @@ internal class ApolloInterceptorsTest { return ApolloClient.Builder() .networkTransport(QueueTestNetworkTransport()) .addHedvigInterceptors( - authTokenService = authTokenService, - demoManager = FakeDemoManager(isDemoMode), + apolloPlatformInterceptors(authTokenService, FakeDemoManager(isDemoMode)), logMemberData = false, ) .build() diff --git a/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/DatadogKtorPlugin.native.kt b/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/DatadogKtorPlugin.native.kt new file mode 100644 index 0000000000..57a877c99b --- /dev/null +++ b/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/DatadogKtorPlugin.native.kt @@ -0,0 +1,8 @@ +package com.hedvig.android.network.clients.di + +import com.hedvig.android.core.buildconstants.HedvigBuildConstants +import io.ktor.client.HttpClientConfig + +internal actual fun HttpClientConfig<*>.installDatadogKtorPlugin(hedvigBuildConstants: HedvigBuildConstants) { + // no-op +} diff --git a/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.native.kt b/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.native.kt index 87996b689b..38be0aeaee 100644 --- a/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.native.kt +++ b/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.native.kt @@ -1,11 +1,15 @@ package com.hedvig.android.network.clients.di +import com.apollographql.apollo.ApolloClient +import com.apollographql.cache.normalized.api.NormalizedCacheFactory +import com.hedvig.android.core.buildconstants.HedvigBuildConstants import com.hedvig.android.core.common.di.AppScope import com.hedvig.android.network.clients.ExtraKtorClientConfiguration import com.hedvig.android.network.clients.NoopExtraKtorClientConfiguration import dev.zacsweers.metro.ContributesTo import dev.zacsweers.metro.Provides import dev.zacsweers.metro.SingleIn +import io.ktor.client.HttpClient import io.ktor.client.engine.HttpClientEngineFactory import io.ktor.client.engine.darwin.Darwin @@ -14,6 +18,18 @@ interface NativeNetworkMetroProviders { @Provides @SingleIn(AppScope::class) fun provideExtraKtorClientConfiguration(): ExtraKtorClientConfiguration = NoopExtraKtorClientConfiguration() + + /** + * The interceptor chain is logging only: an `UNAUTHENTICATED` response is an ordinary error, and the session is + * owned by the iOS app. + */ + @Provides + @SingleIn(AppScope::class) + fun provideApolloClient( + normalizedCacheFactory: NormalizedCacheFactory, + httpClient: HttpClient, + hedvigBuildConstants: HedvigBuildConstants, + ): ApolloClient = buildHedvigApolloClient(normalizedCacheFactory, httpClient, hedvigBuildConstants, emptyList()) } internal actual fun httpClientEngineFactory(): HttpClientEngineFactory<*> = Darwin diff --git a/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.native.kt b/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.native.kt new file mode 100644 index 0000000000..2e8611bfe7 --- /dev/null +++ b/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.native.kt @@ -0,0 +1,10 @@ +package com.hedvig.android.network.clients.di + +import io.ktor.http.HeadersBuilder +import kotlinx.datetime.TimeZone + +internal actual fun HeadersBuilder.appendPlatformHeaders() { + append("Hedvig-TimeZone", TimeZone.currentSystemDefault().id) +} + +internal actual fun platformClientName(appPackageId: String): String = "iOS:$appPackageId" diff --git a/app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/di/NativeApolloClientTest.kt b/app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/di/NativeApolloClientTest.kt new file mode 100644 index 0000000000..0e3073037c --- /dev/null +++ b/app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/di/NativeApolloClientTest.kt @@ -0,0 +1,44 @@ +package com.hedvig.android.network.clients.di + +import com.apollographql.cache.normalized.memory.MemoryCacheFactory +import com.hedvig.android.core.buildconstants.HedvigBuildConstants +import io.ktor.client.HttpClient +import io.ktor.client.engine.darwin.Darwin +import kotlin.test.Test +import kotlin.test.assertEquals + +class NativeApolloClientTest { + @Test + fun `the provided Apollo client only logs`() { + val httpClient = HttpClient(Darwin) + val apolloClient = object : NativeNetworkMetroProviders {}.provideApolloClient( + normalizedCacheFactory = MemoryCacheFactory(), + httpClient = httpClient, + hedvigBuildConstants = FakeHedvigBuildConstants, + ) + + assertEquals(listOf("LoggingInterceptor"), apolloClient.interceptors.map { it::class.simpleName }) + apolloClient.close() + httpClient.close() + } +} + +private object FakeHedvigBuildConstants : HedvigBuildConstants { + override val urlGraphqlOctopus: String = "https://example.test" + override val urlBaseWeb: String = "" + override val urlOdyssey: String = "" + override val urlHedvigGateway: String = "" + override val urlAuthService: String = "" + override val urlBotService: String = "" + override val urlClaimsService: String = "" + override val deepLinkHosts: List = emptyList() + override val appVersionName: String = "" + override val appVersionCode: String = "" + override val appPackageId: String = "" + override val isDebug: Boolean = true + override val isProduction: Boolean = false + override val buildApiVersion: Int = 0 + override val platformName: String = "ios" + override val model: String = "" + override val userAgent: String = "" +} diff --git a/app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/di/NativePlatformHeadersTest.kt b/app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/di/NativePlatformHeadersTest.kt new file mode 100644 index 0000000000..94f72bbd9b --- /dev/null +++ b/app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/di/NativePlatformHeadersTest.kt @@ -0,0 +1,11 @@ +package com.hedvig.android.network.clients.di + +import kotlin.test.Test +import kotlin.test.assertEquals + +class NativePlatformHeadersTest { + @Test + fun `the client name matches the iOS format`() { + assertEquals("iOS:com.hedvig.test", platformClientName("com.hedvig.test")) + } +} diff --git a/app/umbrella/build.gradle.kts b/app/umbrella/build.gradle.kts index 0a79395154..2a5fa249e3 100644 --- a/app/umbrella/build.gradle.kts +++ b/app/umbrella/build.gradle.kts @@ -1,3 +1,4 @@ +import com.hedvig.android.registerUmbrellaClasspathGuard import org.gradle.api.internal.catalog.DelegatingProjectDependency import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework @@ -49,3 +50,5 @@ kotlin { } } } + +registerUmbrellaClasspathGuard() diff --git a/build-logic/convention/src/main/kotlin/com/hedvig/android/CommonMainImportGuard.kt b/build-logic/convention/src/main/kotlin/com/hedvig/android/CommonMainImportGuard.kt index 782fc23333..8368b0db47 100644 --- a/build-logic/convention/src/main/kotlin/com/hedvig/android/CommonMainImportGuard.kt +++ b/build-logic/convention/src/main/kotlin/com/hedvig/android/CommonMainImportGuard.kt @@ -60,29 +60,34 @@ val forbiddenCommonMainNames: List = listOf( val allowedCommonMainSubPackages: List = emptyList() /** - * Returns the entry of [forbiddenCommonMainNames] that [name] is, or lies inside, or null. A name inside one of + * Returns the entry of [forbiddenNames] that [name] is, or lies inside, or null. A name inside one of * [allowedSubPackages] is never forbidden. */ -fun forbiddenEntryOf(name: String, allowedSubPackages: List = allowedCommonMainSubPackages): String? { +fun forbiddenEntryOf( + name: String, + allowedSubPackages: List = allowedCommonMainSubPackages, + forbiddenNames: List = forbiddenCommonMainNames, +): String? { val plain = name.replace("`", "") fun String.isOrIsInside(prefix: String) = this == prefix || startsWith("$prefix.") if (allowedSubPackages.any { plain.isOrIsInside(it) }) return null - return forbiddenCommonMainNames.firstOrNull { plain.isOrIsInside(it) } + return forbiddenNames.firstOrNull { plain.isOrIsInside(it) } } private val importedName = Regex("""^\s*import\s+([\w.`*]+)""") /** - * Returns the 1-based line number and imported name of every import in [source] that names a - * [forbiddenCommonMainNames] entry or something inside it. + * Returns the 1-based line number and imported name of every import in [source] that names a [forbiddenNames] entry + * or something inside it. */ fun findForbiddenImports( source: String, allowedSubPackages: List = allowedCommonMainSubPackages, + forbiddenNames: List = forbiddenCommonMainNames, ): List> { return source.lineSequence().mapIndexedNotNull { index, line -> importedName.find(line)?.groupValues?.get(1) - ?.takeIf { forbiddenEntryOf(it, allowedSubPackages) != null } + ?.takeIf { forbiddenEntryOf(it, allowedSubPackages, forbiddenNames) != null } ?.let { index + 1 to it } }.toList() } diff --git a/build-logic/convention/src/main/kotlin/com/hedvig/android/HedvigGradlePluginExtension.kt b/build-logic/convention/src/main/kotlin/com/hedvig/android/HedvigGradlePluginExtension.kt index 50727ab99d..235777e961 100644 --- a/build-logic/convention/src/main/kotlin/com/hedvig/android/HedvigGradlePluginExtension.kt +++ b/build-logic/convention/src/main/kotlin/com/hedvig/android/HedvigGradlePluginExtension.kt @@ -54,6 +54,8 @@ abstract class HedvigGradlePluginExtension @Inject constructor( project.objects.newInstance() private val viewModelsHandler: ViewModelsHandler = project.objects.newInstance() + private var isSharedWithIos = false + private var viewModelsConfigured = false fun apolloSchema(apolloServiceAction: Action) { apolloSchemaHandler.configure(project, apolloServiceAction) @@ -109,7 +111,27 @@ abstract class HedvigGradlePluginExtension @Inject constructor( * from JVM-plus-Android KMP modules and plain JVM libraries. */ fun viewModels() { - viewModelsHandler.configure(project, pluginManager, libs) + viewModelsConfigured = true + viewModelsHandler.configure(project, pluginManager, libs, isSharedWithIos) + } + + /** + * Marks this module's `commonMain` as shared with iOS: it registers the module's `checkCommonMainImports`, which + * forbids Compose UI, the design system and compose resources in `commonMain` (see [registerSharedCommonMainGuard]), + * and makes [viewModels] put `metrox-viewmodel-compose` in `jvmAndAndroidMain`. + */ + fun sharedWithIos() { + if (viewModelsConfigured) { + throw GradleException("${project.path}: call sharedWithIos() before viewModels().") + } + val kotlin = project.extensions.findByType() + if (kotlin?.sourceSets?.findByName("jvmAndAndroidMain") == null) { + throw GradleException( + "${project.path}: sharedWithIos() needs a jvmAndAndroidMain source set for the code iOS does not share.", + ) + } + isSharedWithIos = true + project.registerSharedCommonMainGuard() } companion object { @@ -364,7 +386,7 @@ private abstract class NavKeysHandler { private const val VIEW_MODEL_PASS_OPTION = "hedvig.viewmodel.pass" private abstract class ViewModelsHandler { - fun configure(project: Project, pluginManager: PluginManager, libs: LibrariesForLibs) { + fun configure(project: Project, pluginManager: PluginManager, libs: LibrariesForLibs, isSharedWithIos: Boolean) { pluginManager.apply(libs.plugins.ksp.get().pluginId) val processor = project.dependencies.project(":viewmodel-processor") val isMultiplatform = project.extensions.findByType() != null @@ -383,9 +405,11 @@ private abstract class ViewModelsHandler { add("kspCommonMainMetadata", processor) add("kspAndroid", processor) // Android-library modules get these from configureMetro through the AGP plugin; a KMP module's - // ViewModels live in commonMain, so the artifacts go there. + // ViewModels live in commonMain, so the artifacts go there. A module shared with iOS keeps the Compose half in + // jvmAndAndroidMain, where its UI is. add("commonMainImplementation", libs.metro.viewmodel) - add("commonMainImplementation", libs.metro.viewmodel.compose) + val composeConfiguration = if (isSharedWithIos) "jvmAndAndroidMainImplementation" else "commonMainImplementation" + add(composeConfiguration, libs.metro.viewmodel.compose) } project.extensions.configure { sourceSets.getByName("commonMain").kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin") diff --git a/build-logic/convention/src/main/kotlin/com/hedvig/android/SharedCommonMainGuard.kt b/build-logic/convention/src/main/kotlin/com/hedvig/android/SharedCommonMainGuard.kt new file mode 100644 index 0000000000..6b88ecbc09 --- /dev/null +++ b/build-logic/convention/src/main/kotlin/com/hedvig/android/SharedCommonMainGuard.kt @@ -0,0 +1,173 @@ +package com.hedvig.android + +import org.gradle.api.DefaultTask +import org.gradle.api.GradleException +import org.gradle.api.Project +import org.gradle.api.artifacts.ExternalModuleDependency +import org.gradle.api.artifacts.ProjectDependency +import org.gradle.api.file.ConfigurableFileCollection +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.provider.ListProperty +import org.gradle.api.provider.MapProperty +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.InputFiles +import org.gradle.api.tasks.Internal +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.PathSensitive +import org.gradle.api.tasks.PathSensitivity +import org.gradle.api.tasks.TaskAction +import org.gradle.kotlin.dsl.register +import org.gradle.language.base.plugins.LifecycleBasePlugin + +/** + * Packages that `commonMain` of a module shared with iOS must not import: Compose UI and the libraries built on it, + * the design system and compose resources. Their code stays in `jvmAndAndroidMain`, so the iOS framework links none + * of it. `androidx.compose.runtime` stays allowed, since presenters are written against it. + */ +val forbiddenSharedCommonMainNames: List = listOf( + "androidx.compose.ui", + "androidx.compose.foundation", + "androidx.compose.material", + "androidx.compose.material3", + "androidx.compose.animation", + "com.hedvig.android.design.system", + "hedvig.resources", + "org.jetbrains.compose.resources", + "coil", + "coil3", + "androidx.paging.compose", + "androidx.navigation3.ui", +) + +private val forbiddenSharedProjectPaths = setOf( + ":core-resources", + ":navigation-compose", + ":compose-ui", + ":core-icons", + ":placeholder", + ":pullrefresh", +) + +private val forbiddenSharedGroups = setOf( + "org.jetbrains.compose.ui", + "org.jetbrains.compose.foundation", + "org.jetbrains.compose.material", + "org.jetbrains.compose.material3", + "org.jetbrains.compose.components", + "org.jetbrains.compose.animation", + "androidx.compose.ui", + "androidx.compose.foundation", + "androidx.compose.material", + "androidx.compose.material3", + "androidx.compose.animation", + "io.coil-kt", + "io.coil-kt.coil3", +) + +private val forbiddenSharedModules = setOf( + "androidx.paging:paging-compose", + "org.jetbrains.androidx.navigation3:navigation3-ui", + "org.jetbrains.androidx.navigationevent:navigationevent-compose", + "dev.zacsweers.metro:metrox-viewmodel-compose", +) + +/** + * Whether a module shared with iOS may not declare [dependency] in `commonMain`. [dependency] is a project path + * (`:design-system-hedvig`) or `group:name`, and [projectDirectory] is a project dependency's directory relative to + * the root project. + */ +fun isForbiddenSharedCommonMainDependency(dependency: String, projectDirectory: String? = null): Boolean { + if (dependency.startsWith(":")) { + return dependency in forbiddenSharedProjectPaths || + dependency.startsWith(":design-system-") || + projectDirectory?.replace('\\', '/')?.startsWith("app/ui/") == true + } + if (dependency in forbiddenSharedModules) return true + return dependency.substringBefore(":") in forbiddenSharedGroups +} + +private val sharedCommonMainDependencyConfigurations = + listOf("commonMainImplementation", "commonMainApi", "commonMainCompileOnly") + +/** + * Registers this module's `checkCommonMainImports`, which fails on Compose UI imports in `src/commonMain` and on UI + * dependencies declared for `commonMain`, and makes the module's `check` depend on it. It shares its name with the + * root task so that `./gradlew checkCommonMainImports` runs both. + */ +internal fun Project.registerSharedCommonMainGuard() { + val declared = provider { + sharedCommonMainDependencyConfigurations + .mapNotNull { configurations.findByName(it) } + .flatMap { it.dependencies } + .mapNotNull { dependency -> + when (dependency) { + is ProjectDependency -> { + val directory = rootProject.findProject(dependency.path)?.projectDir + ?.relativeTo(rootDir)?.invariantSeparatorsPath + dependency.path to directory.orEmpty() + } + is ExternalModuleDependency -> "${dependency.group}:${dependency.name}" to "" + else -> null + } + } + .distinct() + } + val guard = tasks.register("checkCommonMainImports") { + group = LifecycleBasePlugin.VERIFICATION_GROUP + description = "Fails when commonMain imports or declares Compose UI, the design system or compose resources." + sources.from( + fileTree("src/commonMain") { + include("**/*.kt") + }, + ) + declaredDependencies.set(declared.map { pairs -> pairs.map { it.first } }) + projectDirectories.set(declared.map { pairs -> pairs.filter { it.second.isNotEmpty() }.toMap() }) + rootDirectory.set(rootProject.layout.projectDirectory) + marker.set(layout.buildDirectory.file("checkCommonMainImports/ok")) + } + tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME).configure { dependsOn(guard) } +} + +abstract class CheckSharedCommonMainTask : DefaultTask() { + @get:InputFiles + @get:PathSensitive(PathSensitivity.RELATIVE) + abstract val sources: ConfigurableFileCollection + + /** Project paths and `group:name` coordinates declared for `commonMain`. */ + @get:Input + abstract val declaredDependencies: ListProperty + + /** Root-relative directory of each project path in [declaredDependencies]. */ + @get:Input + abstract val projectDirectories: MapProperty + + @get:Internal + abstract val rootDirectory: DirectoryProperty + + @get:OutputFile + abstract val marker: RegularFileProperty + + @TaskAction + fun check() { + val root = rootDirectory.get().asFile + val importViolations = sources.files.sorted().flatMap { file -> + val path = file.relativeTo(root).invariantSeparatorsPath + findForbiddenImports(file.readText(), forbiddenNames = forbiddenSharedCommonMainNames) + .map { (line, import) -> "$path:$line: $import" } + } + val directories = projectDirectories.get() + val dependencyViolations = declaredDependencies.get() + .filter { isForbiddenSharedCommonMainDependency(it, directories[it]) } + .map { "commonMain declares $it" } + val violations = importViolations + dependencyViolations + if (violations.isNotEmpty()) { + throw GradleException( + "commonMain of a module shared with iOS must not use Compose UI, the design system or compose " + + "resources: move that code and its dependencies to jvmAndAndroidMain.\n" + + violations.joinToString("\n"), + ) + } + marker.get().asFile.writeText("OK\n") + } +} diff --git a/build-logic/convention/src/main/kotlin/com/hedvig/android/UmbrellaClasspathGuard.kt b/build-logic/convention/src/main/kotlin/com/hedvig/android/UmbrellaClasspathGuard.kt new file mode 100644 index 0000000000..50b8cebcbf --- /dev/null +++ b/build-logic/convention/src/main/kotlin/com/hedvig/android/UmbrellaClasspathGuard.kt @@ -0,0 +1,95 @@ +package com.hedvig.android + +import org.gradle.api.DefaultTask +import org.gradle.api.GradleException +import org.gradle.api.Project +import org.gradle.api.artifacts.component.ModuleComponentIdentifier +import org.gradle.api.artifacts.result.ResolvedComponentResult +import org.gradle.api.artifacts.result.ResolvedDependencyResult +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.provider.MapProperty +import org.gradle.api.provider.Property +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.Internal +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction +import org.gradle.kotlin.dsl.register +import org.gradle.language.base.plugins.LifecycleBasePlugin + +private val umbrellaClasspathConfigurations = listOf( + "iosArm64CompileKlibraries", + "iosSimulatorArm64CompileKlibraries", +) + +/** + * Returns the `group:name` coordinates in [coordinates] that must not reach the iOS framework: Skiko, which links + * Skia, ICU and HarfBuzz into the app, and compose resources, which pulls Skiko in through Compose foundation. + */ +fun findForbiddenUmbrellaArtifacts(coordinates: Collection): List = coordinates.filter { + val group = it.substringBefore(":") + val name = it.substringAfter(":") + group == "org.jetbrains.skiko" || + (group == "org.jetbrains.compose.components" && name.startsWith("components-resources")) +}.distinct().sorted() + +/** + * Registers `checkUmbrellaClasspath`, which fails when the iOS compile classpath of this module contains an artifact + * reported by [findForbiddenUmbrellaArtifacts], and makes the module's `check` depend on it. + */ +fun Project.registerUmbrellaClasspathGuard() { + val guard = tasks.register("checkUmbrellaClasspath") { + group = LifecycleBasePlugin.VERIFICATION_GROUP + description = "Fails when the iOS framework's compile classpath contains Skiko or compose resources." + for (name in umbrellaClasspathConfigurations) { + val configuration = configurations.named(name) + resolvedModules.put( + name, + configuration.flatMap { it.incoming.resolutionResult.rootComponent }.map { it.moduleCoordinates() }, + ) + } + projectPath.set(this@registerUmbrellaClasspathGuard.path) + marker.set(layout.buildDirectory.file("checkUmbrellaClasspath/ok")) + } + tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME).configure { dependsOn(guard) } +} + +private fun ResolvedComponentResult.moduleCoordinates(): List { + val seen = mutableSetOf() + val pending = ArrayDeque(listOf(this)) + val coordinates = mutableListOf() + while (pending.isNotEmpty()) { + val component = pending.removeFirst() + if (!seen.add(component)) continue + val id = component.id + if (id is ModuleComponentIdentifier) coordinates += "${id.group}:${id.module}" + component.dependencies.filterIsInstance().forEach { pending += it.selected } + } + return coordinates +} + +abstract class CheckUmbrellaClasspathTask : DefaultTask() { + /** Every resolved `group:name` per checked configuration. */ + @get:Input + abstract val resolvedModules: MapProperty> + + @get:Internal + abstract val projectPath: Property + + @get:OutputFile + abstract val marker: RegularFileProperty + + @TaskAction + fun check() { + val violations = resolvedModules.get().flatMap { (configuration, coordinates) -> + findForbiddenUmbrellaArtifacts(coordinates).map { "$configuration contains $it" } + } + if (violations.isNotEmpty()) { + throw GradleException( + "The iOS framework must not link Skiko or compose resources. Find the module that brings it in with " + + "`./gradlew ${projectPath.get()}:dependencies --configuration ` and keep its UI code out of " + + "the shared modules.\n" + violations.joinToString("\n"), + ) + } + marker.get().asFile.writeText("OK\n") + } +} diff --git a/build-logic/convention/src/test/kotlin/com/hedvig/android/SharedCommonMainGuardTest.kt b/build-logic/convention/src/test/kotlin/com/hedvig/android/SharedCommonMainGuardTest.kt new file mode 100644 index 0000000000..954b2cfd3c --- /dev/null +++ b/build-logic/convention/src/test/kotlin/com/hedvig/android/SharedCommonMainGuardTest.kt @@ -0,0 +1,86 @@ +package com.hedvig.android + +import assertk.assertThat +import assertk.assertions.containsExactly +import assertk.assertions.isFalse +import assertk.assertions.isTrue +import org.junit.Test + +class SharedCommonMainGuardTest { + @Test + fun `flags Compose UI, design system, resources, Coil, paging and nav3 UI imports`() { + val source = """ + package a + import androidx.compose.ui.Modifier + import androidx.compose.foundation.layout.Column + import androidx.compose.material3.Text + import com.hedvig.android.design.system.hedvig.HedvigText + import hedvig.resources.Res + import org.jetbrains.compose.resources.StringResource + import coil3.compose.AsyncImage + import androidx.paging.compose.LazyPagingItems + import androidx.navigation3.ui.NavDisplay + import androidx.compose.animation.AnimatedContent + import androidx.compose.runtime.Composable + import androidx.compose.runtime.saveable.rememberSaveable + import androidx.lifecycle.viewmodel.compose.viewModel + import androidx.lifecycle.ViewModel + import com.hedvig.android.molecule.public.MoleculeViewModel + """.trimIndent() + assertThat(findForbiddenImports(source, forbiddenNames = forbiddenSharedCommonMainNames)).containsExactly( + 2 to "androidx.compose.ui.Modifier", + 3 to "androidx.compose.foundation.layout.Column", + 4 to "androidx.compose.material3.Text", + 5 to "com.hedvig.android.design.system.hedvig.HedvigText", + 6 to "hedvig.resources.Res", + 7 to "org.jetbrains.compose.resources.StringResource", + 8 to "coil3.compose.AsyncImage", + 9 to "androidx.paging.compose.LazyPagingItems", + 10 to "androidx.navigation3.ui.NavDisplay", + 11 to "androidx.compose.animation.AnimatedContent", + ) + } + + @Test + fun `flags UI dependencies and allows the shared layer`() { + val forbidden = listOf( + ":design-system-hedvig", + ":core-resources", + ":navigation-compose", + "org.jetbrains.compose.ui:ui-tooling-preview", + "org.jetbrains.compose.components:components-resources", + "io.coil-kt.coil3:coil-compose", + "androidx.paging:paging-compose", + "org.jetbrains.compose.animation:animation", + "androidx.compose.ui:ui-tooling-preview", + "androidx.compose.foundation:foundation-layout", + "androidx.compose.material:material-ripple", + "androidx.compose.material3:material3", + "androidx.compose.animation:animation-core", + "org.jetbrains.androidx.navigationevent:navigationevent-compose", + "dev.zacsweers.metro:metrox-viewmodel-compose", + ) + for (dependency in forbidden) { + assertThat(isForbiddenSharedCommonMainDependency(dependency), dependency).isTrue() + } + assertThat(isForbiddenSharedCommonMainDependency(":cross-sells", "app/ui/cross-sells")).isTrue() + val allowed = listOf( + ":molecule-public", + ":apollo-core", + ":core-common-public", + ":navigation-common", + "org.jetbrains.compose.runtime:runtime", + "com.apollographql.apollo:apollo-runtime", + "androidx.compose:compose-bom", + "androidx.compose.runtime:runtime-retain", + "org.jetbrains.compose.runtime:runtime-saveable", + "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", + "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", + "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3", + "dev.zacsweers.metro:metrox-viewmodel", + ) + for (dependency in allowed) { + assertThat(isForbiddenSharedCommonMainDependency(dependency), dependency).isFalse() + } + } +} diff --git a/build-logic/convention/src/test/kotlin/com/hedvig/android/UmbrellaClasspathGuardTest.kt b/build-logic/convention/src/test/kotlin/com/hedvig/android/UmbrellaClasspathGuardTest.kt new file mode 100644 index 0000000000..583025ee72 --- /dev/null +++ b/build-logic/convention/src/test/kotlin/com/hedvig/android/UmbrellaClasspathGuardTest.kt @@ -0,0 +1,38 @@ +package com.hedvig.android + +import assertk.assertThat +import assertk.assertions.containsExactly +import assertk.assertions.isEmpty +import org.junit.Test + +class UmbrellaClasspathGuardTest { + @Test + fun `flags Skiko and compose resources`() { + val coordinates = listOf( + "org.jetbrains.skiko:skiko", + "org.jetbrains.skiko:skiko-iosarm64", + "org.jetbrains.compose.components:components-resources", + "org.jetbrains.compose.components:components-resources-iossimulatorarm64", + "org.jetbrains.compose.runtime:runtime", + ) + assertThat(findForbiddenUmbrellaArtifacts(coordinates)).containsExactly( + "org.jetbrains.compose.components:components-resources", + "org.jetbrains.compose.components:components-resources-iossimulatorarm64", + "org.jetbrains.skiko:skiko", + "org.jetbrains.skiko:skiko-iosarm64", + ) + } + + @Test + fun `allows the shared layer`() { + val coordinates = listOf( + "org.jetbrains.compose.runtime:runtime", + "org.jetbrains.compose.runtime:runtime-saveable", + "org.jetbrains.compose.components:components-ui-tooling-preview", + "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel", + "com.apollographql.apollo:apollo-runtime", + "dev.zacsweers.metro:runtime", + ) + assertThat(findForbiddenUmbrellaArtifacts(coordinates)).isEmpty() + } +}