From f1d1c27c43ecb372364ce797d9bff64899ca2283 Mon Sep 17 00:00:00 2001 From: stylianosgakis Date: Sat, 14 Nov 2026 00:44:13 +0100 Subject: [PATCH 1/9] Move Language.label next to its marketing screen caller (cherry picked from commit c4ed38e6563d4f457da40bad711c605923029ba8) --- .../com/hedvig/android/feature/login/marketing}/LanguageLabel.kt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/{language/language-core/src/commonMain/kotlin/com/hedvig/android/language => feature/feature-login/src/commonMain/kotlin/com/hedvig/android/feature/login/marketing}/LanguageLabel.kt (100%) 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 100% 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 From dbed7b2a558662a1fe1b5d884032fb4752eed15a Mon Sep 17 00:00:00 2001 From: stylianosgakis Date: Sat, 14 Nov 2026 00:56:27 +0100 Subject: [PATCH 2/9] Give each Language.label caller its own internal copy language-core no longer depends on core-resources, so the data layer's iOS classpath stops pulling in Compose resources. Both callers are Compose UI files, and no UI module both features share can depend on language-core without a cycle, so each keeps a private copy next to it. (cherry picked from commit d191569dc9d64784de665ed5a2927b3c5dd94b34) --- .../feature/login/marketing/LanguageLabel.kt | 5 +++-- .../login/marketing/MarketingDestination.kt | 1 - .../feature/profile/settings/LanguageLabel.kt | 15 +++++++++++++++ .../profile/settings/SettingsDestination.kt | 1 - app/language/language-core/build.gradle.kts | 1 - 5 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 app/feature/feature-profile/src/commonMain/kotlin/com/hedvig/android/feature/profile/settings/LanguageLabel.kt diff --git a/app/feature/feature-login/src/commonMain/kotlin/com/hedvig/android/feature/login/marketing/LanguageLabel.kt b/app/feature/feature-login/src/commonMain/kotlin/com/hedvig/android/feature/login/marketing/LanguageLabel.kt index bee097fc54..94d4311bd3 100644 --- a/app/feature/feature-login/src/commonMain/kotlin/com/hedvig/android/feature/login/marketing/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) From 712a80e695b2ab920496dbbbf8b9f6ca4b2cf2b1 Mon Sep 17 00:00:00 2001 From: stylianosgakis Date: Sat, 14 Nov 2026 01:30:00 +0100 Subject: [PATCH 3/9] Add an opt-in guard against Compose UI in shared commonMain A module calling sharedWithIos() in its hedvig block gets its own checkCommonMainImports task, which fails on Compose UI, design system, compose resources, Coil, paging-compose and Navigation 3 UI imports in src/commonMain and on such dependencies declared for commonMain. The module's check depends on it, and sharing the root task's name means ./gradlew checkCommonMainImports runs both. For an opted module viewModels() puts metrox-viewmodel-compose in jvmAndAndroidMain, so sharedWithIos() must come first. No module opts in yet, so every build is unchanged. (cherry picked from commit 581944335c7fa25517c0a73ed585611c1d8cefaa) --- .../hedvig/android/CommonMainImportGuard.kt | 17 +- .../android/HedvigGradlePluginExtension.kt | 32 +++- .../hedvig/android/SharedCommonMainGuard.kt | 163 ++++++++++++++++++ .../android/SharedCommonMainGuardTest.kt | 68 ++++++++ 4 files changed, 270 insertions(+), 10 deletions(-) create mode 100644 build-logic/convention/src/main/kotlin/com/hedvig/android/SharedCommonMainGuard.kt create mode 100644 build-logic/convention/src/test/kotlin/com/hedvig/android/SharedCommonMainGuardTest.kt 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..168047ca98 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 `metro-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..93205005b6 --- /dev/null +++ b/build-logic/convention/src/main/kotlin/com/hedvig/android/SharedCommonMainGuard.kt @@ -0,0 +1,163 @@ +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", + "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", + "io.coil-kt", + "io.coil-kt.coil3", +) + +private val forbiddenSharedModules = setOf( + "androidx.paging:paging-compose", + "org.jetbrains.androidx.navigation3:navigation3-ui", +) + +/** + * 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") + +/** + * 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 in `commonMainImplementation` and `commonMainApi`. */ + @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/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..a09e7d45ec --- /dev/null +++ b/build-logic/convention/src/test/kotlin/com/hedvig/android/SharedCommonMainGuardTest.kt @@ -0,0 +1,68 @@ +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.runtime.Composable + 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", + ) + } + + @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", + ) + 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", + ) + for (dependency in allowed) { + assertThat(isForbiddenSharedCommonMainDependency(dependency), dependency).isFalse() + } + } +} From 4c561a896285c3f5fc5b42c513469f3c821c5bd9 Mon Sep 17 00:00:00 2001 From: stylianosgakis Date: Mon, 16 Nov 2026 10:27:48 +0100 Subject: [PATCH 4/9] Forbid Compose animation, Jetpack Compose UI and compose-only wrappers in shared commonMain The shared guard now also flags androidx.compose.animation imports, the Jetpack androidx.compose ui, foundation, material, material3 and animation groups, org.jetbrains.compose.animation, navigationevent-compose and metrox-viewmodel-compose, and reads commonMainCompileOnly too. The lifecycle compose artifacts stay allowed: on iOS lifecycle-viewmodel-compose, lifecycle-runtime-compose and lifecycle-viewmodel-navigation3 depend on the Compose runtime, runtime-saveable, savedstate-compose and navigation3-runtime only, with no Compose UI. (cherry picked from commit 7354b6964a67c009eac4d4f1efcf4c7117778e9e) --- .../android/HedvigGradlePluginExtension.kt | 2 +- .../hedvig/android/SharedCommonMainGuard.kt | 14 ++++++++++++-- .../android/SharedCommonMainGuardTest.kt | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) 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 168047ca98..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 @@ -118,7 +118,7 @@ abstract class HedvigGradlePluginExtension @Inject constructor( /** * 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 `metro-viewmodel-compose` in `jvmAndAndroidMain`. + * and makes [viewModels] put `metrox-viewmodel-compose` in `jvmAndAndroidMain`. */ fun sharedWithIos() { if (viewModelsConfigured) { 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 index 93205005b6..6b88ecbc09 100644 --- a/build-logic/convention/src/main/kotlin/com/hedvig/android/SharedCommonMainGuard.kt +++ b/build-logic/convention/src/main/kotlin/com/hedvig/android/SharedCommonMainGuard.kt @@ -30,6 +30,7 @@ val forbiddenSharedCommonMainNames: List = listOf( "androidx.compose.foundation", "androidx.compose.material", "androidx.compose.material3", + "androidx.compose.animation", "com.hedvig.android.design.system", "hedvig.resources", "org.jetbrains.compose.resources", @@ -54,6 +55,12 @@ private val forbiddenSharedGroups = setOf( "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", ) @@ -61,6 +68,8 @@ private val forbiddenSharedGroups = setOf( 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", ) /** @@ -78,7 +87,8 @@ fun isForbiddenSharedCommonMainDependency(dependency: String, projectDirectory: return dependency.substringBefore(":") in forbiddenSharedGroups } -private val sharedCommonMainDependencyConfigurations = listOf("commonMainImplementation", "commonMainApi") +private val sharedCommonMainDependencyConfigurations = + listOf("commonMainImplementation", "commonMainApi", "commonMainCompileOnly") /** * Registers this module's `checkCommonMainImports`, which fails on Compose UI imports in `src/commonMain` and on UI @@ -124,7 +134,7 @@ abstract class CheckSharedCommonMainTask : DefaultTask() { @get:PathSensitive(PathSensitivity.RELATIVE) abstract val sources: ConfigurableFileCollection - /** Project paths and `group:name` coordinates declared in `commonMainImplementation` and `commonMainApi`. */ + /** Project paths and `group:name` coordinates declared for `commonMain`. */ @get:Input abstract val declaredDependencies: ListProperty 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 index a09e7d45ec..954b2cfd3c 100644 --- a/build-logic/convention/src/test/kotlin/com/hedvig/android/SharedCommonMainGuardTest.kt +++ b/build-logic/convention/src/test/kotlin/com/hedvig/android/SharedCommonMainGuardTest.kt @@ -20,7 +20,10 @@ class SharedCommonMainGuardTest { 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() @@ -34,6 +37,7 @@ class SharedCommonMainGuardTest { 8 to "coil3.compose.AsyncImage", 9 to "androidx.paging.compose.LazyPagingItems", 10 to "androidx.navigation3.ui.NavDisplay", + 11 to "androidx.compose.animation.AnimatedContent", ) } @@ -47,6 +51,14 @@ class SharedCommonMainGuardTest { "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() @@ -60,6 +72,12 @@ class SharedCommonMainGuardTest { "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() From c6344bb0132731d8339137895a33eb8db7fcb1c5 Mon Sep 17 00:00:00 2001 From: stylianosgakis Date: Tue, 17 Nov 2026 16:23:55 +0100 Subject: [PATCH 5/9] Fail check when the umbrella iOS classpath reaches Skiko checkUmbrellaClasspath resolves the umbrella's iosArm64 and iosSimulatorArm64 compile klibraries and fails on any org.jetbrains.skiko module or compose components-resources artifact, so a shared module that starts depending on Compose UI is caught by check instead of by a 70 MB larger iOS framework. The commonMain import guard only covers modules that opt in with sharedWithIos(); this covers whatever the umbrella reaches. (cherry picked from commit c5bdc16a4ecc0f4253af767c1531936cc68714d6) --- app/umbrella/build.gradle.kts | 3 + .../hedvig/android/UmbrellaClasspathGuard.kt | 95 +++++++++++++++++++ .../android/UmbrellaClasspathGuardTest.kt | 38 ++++++++ 3 files changed, 136 insertions(+) create mode 100644 build-logic/convention/src/main/kotlin/com/hedvig/android/UmbrellaClasspathGuard.kt create mode 100644 build-logic/convention/src/test/kotlin/com/hedvig/android/UmbrellaClasspathGuardTest.kt 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/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/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() + } +} From 2acb81a65bad1969c4e3c83a4bbd183ee03c1bcd Mon Sep 17 00:00:00 2001 From: stylianosgakis Date: Sat, 14 Nov 2026 00:43:58 +0100 Subject: [PATCH 6/9] Bind DataStore auth and demo implementations in jvmMain AuthTokenStorage, LogoutUseCase and DemoManager become commonMain interfaces. Their DataStore and Android implementations live in jvmMain with their own bindings, so each platform binds its own and a missing binding is a compile error. AuthTokenStorage's implementation is DataStoreAuthTokenStorage. core-demo-mode's DataStore dependencies move to jvmMain; auth-core-public keeps them in commonMain because BankIdSandboxState needs them there. (cherry picked from commit 1ae4b757a02747e5c1d96b571d2ee3d83ddc1bbd) (with the rename-only commit 3de509163a43e6a45eb1e08ab568a51c6b209bc7 squashed in, since that move does not compile on its own) --- .../app/navigation/SessionReconcilerTest.kt | 4 +- .../com/hedvig/android/auth/LogoutUseCase.kt | 21 ----- .../android/auth/storage/AuthTokenStorage.kt | 78 +---------------- .../auth/AndroidAccessTokenProvider.kt | 0 .../hedvig/android/auth/LogoutUseCaseImpl.kt | 22 +++++ .../auth/storage/DataStoreAuthTokenStorage.kt | 86 +++++++++++++++++++ .../android/auth/AuthTokenServiceImplTest.kt | 3 +- .../AndroidAccessTokenProviderTest.kt | 3 +- .../auth/storage/AuthTokenStorageTest.kt | 2 +- app/core/core-demo-mode/build.gradle.kts | 6 +- .../android/core/demomode/DemoManager.kt | 39 --------- .../core/demomode/DataStoreDemoManager.kt | 42 +++++++++ 12 files changed, 165 insertions(+), 141 deletions(-) rename app/auth/auth-core-public/src/{commonMain => jvmMain}/kotlin/com/hedvig/android/auth/AndroidAccessTokenProvider.kt (100%) create mode 100644 app/auth/auth-core-public/src/jvmMain/kotlin/com/hedvig/android/auth/LogoutUseCaseImpl.kt create mode 100644 app/auth/auth-core-public/src/jvmMain/kotlin/com/hedvig/android/auth/storage/DataStoreAuthTokenStorage.kt create mode 100644 app/core/core-demo-mode/src/jvmMain/kotlin/com/hedvig/android/core/demomode/DataStoreDemoManager.kt 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-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") + } +} From 9351e3ecca8f0ee3b44700a9fba4a3b8131444be Mon Sep 17 00:00:00 2001 From: stylianosgakis Date: Sat, 14 Nov 2026 01:19:32 +0100 Subject: [PATCH 7/9] Give native its own logout, Datadog, header and user agent defaults On native, the Apollo chain no longer logs out on UNAUTHENTICATED and the Ktor client installs no Datadog plugin. Native requests add Hedvig-TimeZone and send the iOS app's User-Agent format. Android and the JVM keep the same interceptors, plugin, headers and user agent. The Datadog plugin actual and its dependencies now live in androidMain, so network-clients no longer needs the mobile source set group. (cherry picked from commit 7231436301e2c55e94ca0079c974747329730983) (with the rename-only commit 023bdc21c22319cf9bbaa8edecf5cbb87fab70bc squashed in, since that move does not compile on its own) --- .../CommonHedvigBuildConstants.kt | 21 +-------- .../android/core/buildconstants/UserAgent.kt | 6 +++ .../buildconstants/UserAgent.jvmAndAndroid.kt | 20 +++++++++ .../core/buildconstants/UserAgent.native.kt | 4 ++ .../buildconstants/NativeUserAgentTest.kt | 26 +++++++++++ app/network/network-clients/build.gradle.kts | 19 +------- .../UnauthenticatedLogoutPolicy.android.kt | 3 ++ .../clients/di/DatadogKtorPlugin.android.kt} | 0 .../clients/di/PlatformHeaders.android.kt | 7 +++ .../clients/apollo/LoggingInterceptor.kt | 10 +++-- .../apollo/UnauthenticatedLogoutPolicy.kt | 7 +++ .../clients/di/NetworkMetroProviders.kt | 1 + .../network/clients/di/PlatformHeaders.kt | 8 ++++ .../apollo/UnauthenticatedLogoutPolicy.jvm.kt | 3 ++ .../network/clients/di/PlatformHeaders.jvm.kt | 7 +++ .../UnauthenticatedLogoutPolicy.native.kt | 3 ++ .../clients/di/DatadogKtorPlugin.native.kt | 8 ++++ .../clients/di/PlatformHeaders.native.kt | 8 ++++ .../clients/apollo/NativeInterceptorsTest.kt | 44 +++++++++++++++++++ 19 files changed, 165 insertions(+), 40 deletions(-) create mode 100644 app/core/core-build-constants/src/commonMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.kt create mode 100644 app/core/core-build-constants/src/jvmAndAndroidMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.jvmAndAndroid.kt create mode 100644 app/core/core-build-constants/src/nativeMain/kotlin/com/hedvig/android/core/buildconstants/UserAgent.native.kt create mode 100644 app/core/core-build-constants/src/nativeTest/kotlin/com/hedvig/android/core/buildconstants/NativeUserAgentTest.kt create mode 100644 app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.android.kt rename app/network/network-clients/src/{mobileMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.mobile.kt => androidMain/kotlin/com/hedvig/android/network/clients/di/DatadogKtorPlugin.android.kt} (100%) create mode 100644 app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.android.kt create mode 100644 app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.kt create mode 100644 app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.kt create mode 100644 app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.jvm.kt create mode 100644 app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.jvm.kt create mode 100644 app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.native.kt create mode 100644 app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/DatadogKtorPlugin.native.kt create mode 100644 app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.native.kt create mode 100644 app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/apollo/NativeInterceptorsTest.kt 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/network/network-clients/build.gradle.kts b/app/network/network-clients/build.gradle.kts index fa15a7a7c3..0d2940bc19 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/androidMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.android.kt b/app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.android.kt new file mode 100644 index 0000000000..e1478e8bab --- /dev/null +++ b/app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.android.kt @@ -0,0 +1,3 @@ +package com.hedvig.android.network.clients.apollo + +internal actual val logsOutOnUnauthenticated: Boolean = true 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..1c26f9c790 --- /dev/null +++ b/app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.android.kt @@ -0,0 +1,7 @@ +package com.hedvig.android.network.clients.di + +import io.ktor.http.HeadersBuilder + +internal actual fun HeadersBuilder.appendPlatformHeaders() { + // no-op +} 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 690e23608c..199c8181ac 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 @@ -22,14 +22,18 @@ 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. + * The app's Apollo interceptors, in this order: a member whose session the backend rejects is logged out first, where + * [logsOutOnUnauthenticated] is set for the platform, then the request is logged. */ internal fun ApolloClient.Builder.addHedvigInterceptors( authTokenService: AuthTokenService, demoManager: DemoManager, ): ApolloClient.Builder = this - .addInterceptor(LogoutOnUnauthenticatedInterceptor(authTokenService, demoManager)) + .apply { + if (logsOutOnUnauthenticated) { + addInterceptor(LogoutOnUnauthenticatedInterceptor(authTokenService, demoManager)) + } + } .addInterceptor(LoggingInterceptor()) internal class LoggingInterceptor : ApolloInterceptor { diff --git a/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.kt b/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.kt new file mode 100644 index 0000000000..672085753a --- /dev/null +++ b/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.kt @@ -0,0 +1,7 @@ +package com.hedvig.android.network.clients.apollo + +/** + * Whether a GraphQL response carrying an `UNAUTHENTICATED` error logs the member out, through + * [LogoutOnUnauthenticatedInterceptor]. + */ +internal expect val logsOutOnUnauthenticated: Boolean 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 cc960197eb..7d6fbfb9f5 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 @@ -130,6 +130,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..f34385c330 --- /dev/null +++ b/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.kt @@ -0,0 +1,8 @@ +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() diff --git a/app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.jvm.kt b/app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.jvm.kt new file mode 100644 index 0000000000..e1478e8bab --- /dev/null +++ b/app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.jvm.kt @@ -0,0 +1,3 @@ +package com.hedvig.android.network.clients.apollo + +internal actual val logsOutOnUnauthenticated: Boolean = true 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..1c26f9c790 --- /dev/null +++ b/app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.jvm.kt @@ -0,0 +1,7 @@ +package com.hedvig.android.network.clients.di + +import io.ktor.http.HeadersBuilder + +internal actual fun HeadersBuilder.appendPlatformHeaders() { + // no-op +} diff --git a/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.native.kt b/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.native.kt new file mode 100644 index 0000000000..c96b6a9e68 --- /dev/null +++ b/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.native.kt @@ -0,0 +1,3 @@ +package com.hedvig.android.network.clients.apollo + +internal actual val logsOutOnUnauthenticated: Boolean = false 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/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..9fdc03b09c --- /dev/null +++ b/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/di/PlatformHeaders.native.kt @@ -0,0 +1,8 @@ +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) +} diff --git a/app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/apollo/NativeInterceptorsTest.kt b/app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/apollo/NativeInterceptorsTest.kt new file mode 100644 index 0000000000..a526d44300 --- /dev/null +++ b/app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/apollo/NativeInterceptorsTest.kt @@ -0,0 +1,44 @@ +package com.hedvig.android.network.clients.apollo + +import com.apollographql.apollo.ApolloClient +import com.hedvig.android.auth.AuthStatus +import com.hedvig.android.auth.AuthTokenService +import com.hedvig.android.auth.token.AuthTokens +import com.hedvig.android.authlib.AccessToken +import com.hedvig.android.authlib.RefreshToken +import com.hedvig.android.core.demomode.DemoManager +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow + +class NativeInterceptorsTest { + @Test + fun `on native only the logging interceptor is added`() { + val apolloClient = ApolloClient.Builder() + .serverUrl("https://example.test") + .addHedvigInterceptors(FakeAuthTokenService(), FakeDemoManager()) + .build() + + assertEquals(listOf("LoggingInterceptor"), apolloClient.interceptors.map { it::class.simpleName }) + } +} + +private class FakeAuthTokenService : AuthTokenService { + override val authStatus: StateFlow = MutableStateFlow(null) + + override suspend fun getTokens(): AuthTokens? = null + + override suspend fun refreshAndGetAccessToken(): AccessToken? = null + + override suspend fun loginWithTokens(accessToken: AccessToken, refreshToken: RefreshToken) {} + + override suspend fun logoutAndInvalidateTokens() {} +} + +private class FakeDemoManager : DemoManager { + override fun isDemoMode(): Flow = MutableStateFlow(false) + + override suspend fun setDemoMode(demoMode: Boolean) {} +} From 6cbc10cb22506ce8761ed2db3bd78b3c27fd97b5 Mon Sep 17 00:00:00 2001 From: stylianosgakis Date: Mon, 16 Nov 2026 10:24:36 +0100 Subject: [PATCH 8/9] Send the iOS app's apollographql-client-name on native Apollo iOS 2.4.0 sends clientApplicationName as the apollographql-client-name header, and Ugglan sets it to "iOS:" (hGraphQL ApolloClient.swift). Native now sends the same value; Android and the JVM keep sending the package id. (cherry picked from commit 8ce0deda8fb65da0d5582919b7863b5f2bc85f5a) --- .../network/clients/di/PlatformHeaders.android.kt | 2 ++ .../network/clients/di/NetworkMetroProviders.kt | 2 +- .../android/network/clients/di/PlatformHeaders.kt | 5 +++++ .../android/network/clients/di/PlatformHeaders.jvm.kt | 2 ++ .../network/clients/di/PlatformHeaders.native.kt | 2 ++ .../network/clients/di/NativePlatformHeadersTest.kt | 11 +++++++++++ 6 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/di/NativePlatformHeadersTest.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 index 1c26f9c790..0c80c87c20 100644 --- 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 @@ -5,3 +5,5 @@ 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/di/NetworkMetroProviders.kt b/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/di/NetworkMetroProviders.kt index 7d6fbfb9f5..2add082421 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 @@ -119,7 +119,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) 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 index f34385c330..a7f043805e 100644 --- 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 @@ -6,3 +6,8 @@ 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/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 index 1c26f9c790..0c80c87c20 100644 --- 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 @@ -5,3 +5,5 @@ 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/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 index 9fdc03b09c..2e8611bfe7 100644 --- 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 @@ -6,3 +6,5 @@ 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/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")) + } +} From 6f63c9cad902a730f1395c88310800b6b395a658 Mon Sep 17 00:00:00 2001 From: stylianosgakis Date: Mon, 16 Nov 2026 11:42:33 +0100 Subject: [PATCH 9/9] Provide the Apollo client per platform Android and the JVM keep the logout-on-unauthenticated interceptor ahead of logging; native builds the client with logging only, so the native graph needs no AuthTokenService or DemoManager for it. One internal builder in commonMain holds everything the platforms share, and the logsOutOnUnauthenticated flag it replaces is gone. (cherry picked from commit ad0542066f52cc0b8b7edc9f5fea0e5667d82b7b) --- .../UnauthenticatedLogoutPolicy.android.kt | 3 -- .../clients/apollo/LoggingInterceptor.kt | 13 ++---- .../apollo/UnauthenticatedLogoutPolicy.kt | 7 --- .../clients/di/NetworkMetroProviders.kt | 36 +++++++-------- .../clients/di/ApolloClientMetroProviders.kt | 39 ++++++++++++++++ .../apollo/UnauthenticatedLogoutPolicy.jvm.kt | 3 -- .../clients/apollo/ApolloInterceptorsTest.kt | 7 +-- .../UnauthenticatedLogoutPolicy.native.kt | 3 -- .../di/NetworkMetroProviders.native.kt | 16 +++++++ .../clients/apollo/NativeInterceptorsTest.kt | 44 ------------------- .../clients/di/NativeApolloClientTest.kt | 44 +++++++++++++++++++ 11 files changed, 125 insertions(+), 90 deletions(-) delete mode 100644 app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.android.kt delete mode 100644 app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.kt create mode 100644 app/network/network-clients/src/jvmAndAndroidMain/kotlin/com/hedvig/android/network/clients/di/ApolloClientMetroProviders.kt delete mode 100644 app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.jvm.kt delete mode 100644 app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.native.kt delete mode 100644 app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/apollo/NativeInterceptorsTest.kt create mode 100644 app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/di/NativeApolloClientTest.kt diff --git a/app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.android.kt b/app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.android.kt deleted file mode 100644 index e1478e8bab..0000000000 --- a/app/network/network-clients/src/androidMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.android.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.hedvig.android.network.clients.apollo - -internal actual val logsOutOnUnauthenticated: Boolean = true 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 199c8181ac..8151e4470c 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 @@ -22,18 +22,13 @@ import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.flow.onEach /** - * The app's Apollo interceptors, in this order: a member whose session the backend rejects is logged out first, where - * [logsOutOnUnauthenticated] is set for the platform, 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, ): ApolloClient.Builder = this - .apply { - if (logsOutOnUnauthenticated) { - addInterceptor(LogoutOnUnauthenticatedInterceptor(authTokenService, demoManager)) - } - } + .apply { platformInterceptors.forEach(::addInterceptor) } .addInterceptor(LoggingInterceptor()) internal class LoggingInterceptor : ApolloInterceptor { diff --git a/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.kt b/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.kt deleted file mode 100644 index 672085753a..0000000000 --- a/app/network/network-clients/src/commonMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.hedvig.android.network.clients.apollo - -/** - * Whether a GraphQL response carrying an `UNAUTHENTICATED` error logs the member out, through - * [LogoutOnUnauthenticatedInterceptor]. - */ -internal expect val logsOutOnUnauthenticated: Boolean 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 2add082421..1e400f2116 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) - .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) + .build() } private fun buildKtorClient( 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/apollo/UnauthenticatedLogoutPolicy.jvm.kt b/app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.jvm.kt deleted file mode 100644 index e1478e8bab..0000000000 --- a/app/network/network-clients/src/jvmMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.jvm.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.hedvig.android.network.clients.apollo - -internal actual val logsOutOnUnauthenticated: Boolean = true 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 203e7d15da..9cbf933d86 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 { @@ -89,7 +90,7 @@ internal class ApolloInterceptorsTest { private fun apolloClient(isDemoMode: Boolean): ApolloClient { return ApolloClient.Builder() .networkTransport(QueueTestNetworkTransport()) - .addHedvigInterceptors(authTokenService = authTokenService, demoManager = FakeDemoManager(isDemoMode)) + .addHedvigInterceptors(apolloPlatformInterceptors(authTokenService, FakeDemoManager(isDemoMode))) .build() } diff --git a/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.native.kt b/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.native.kt deleted file mode 100644 index c96b6a9e68..0000000000 --- a/app/network/network-clients/src/nativeMain/kotlin/com/hedvig/android/network/clients/apollo/UnauthenticatedLogoutPolicy.native.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.hedvig.android.network.clients.apollo - -internal actual val logsOutOnUnauthenticated: Boolean = false 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/nativeTest/kotlin/com/hedvig/android/network/clients/apollo/NativeInterceptorsTest.kt b/app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/apollo/NativeInterceptorsTest.kt deleted file mode 100644 index a526d44300..0000000000 --- a/app/network/network-clients/src/nativeTest/kotlin/com/hedvig/android/network/clients/apollo/NativeInterceptorsTest.kt +++ /dev/null @@ -1,44 +0,0 @@ -package com.hedvig.android.network.clients.apollo - -import com.apollographql.apollo.ApolloClient -import com.hedvig.android.auth.AuthStatus -import com.hedvig.android.auth.AuthTokenService -import com.hedvig.android.auth.token.AuthTokens -import com.hedvig.android.authlib.AccessToken -import com.hedvig.android.authlib.RefreshToken -import com.hedvig.android.core.demomode.DemoManager -import kotlin.test.Test -import kotlin.test.assertEquals -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow - -class NativeInterceptorsTest { - @Test - fun `on native only the logging interceptor is added`() { - val apolloClient = ApolloClient.Builder() - .serverUrl("https://example.test") - .addHedvigInterceptors(FakeAuthTokenService(), FakeDemoManager()) - .build() - - assertEquals(listOf("LoggingInterceptor"), apolloClient.interceptors.map { it::class.simpleName }) - } -} - -private class FakeAuthTokenService : AuthTokenService { - override val authStatus: StateFlow = MutableStateFlow(null) - - override suspend fun getTokens(): AuthTokens? = null - - override suspend fun refreshAndGetAccessToken(): AccessToken? = null - - override suspend fun loginWithTokens(accessToken: AccessToken, refreshToken: RefreshToken) {} - - override suspend fun logoutAndInvalidateTokens() {} -} - -private class FakeDemoManager : DemoManager { - override fun isDemoMode(): Flow = MutableStateFlow(false) - - override suspend fun setDemoMode(demoMode: Boolean) {} -} 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 = "" +}