Remove system and environment lookup properties (#620)

* Remove system and environment lookup properties

* Remove reference from cloud-run

app-launcher/android/build.gradle.kts

@@ -26,6 +26,7 @@ android {
 dependencies {
     implementation(projects.appLauncher.common)
     implementation(projects.firebaseCompose)
+    implementation(projects.httpClient)
 
     with(libs.androidx) {
         implementation(libs.androidx.core.splashscreen)

app-launcher/android/src/main/kotlin/io/ashdavies/playground/LauncherActivity.kt

@@ -1,26 +1,34 @@
 package io.ashdavies.playground
 
+import android.os.Build
 import androidx.activity.compose.setContent
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.CompositionLocalProvider
 import com.slack.circuit.backstack.rememberSaveableBackStack
 import com.slack.circuit.foundation.CircuitCompositionLocals
 import com.slack.circuit.foundation.NavigableCircuitContent
 import com.slack.circuit.foundation.rememberCircuitNavigator
 import com.slack.circuit.overlay.ContentWithOverlays
-import io.ashdavies.compose.ProvideFirebaseApp
+import io.ashdavies.http.HttpCredentials
+import io.ashdavies.http.LocalHttpCredentials
 
 internal class LauncherActivity : KotlinActivity(action = {
+    val credentials = HttpCredentials(getString(R.string.playground_api_key), Build.PRODUCT)
     val initialBackStack = buildInitialBackStack(intent.getStringExtra("route"))
-    val circuitConfig = CircuitConfig(applicationContext)
+    val circuit = CircuitConfig(applicationContext)
 
     setContent {
         val backStack = rememberSaveableBackStack { initialBackStack.forEach(::push) }
-        val navigator = rememberCircuitNavigator(backStack)
 
-        ProvideFirebaseApp {
-            MaterialTheme(colorScheme = dynamicColorScheme()) {
-                CircuitCompositionLocals(circuitConfig) {
-                    ContentWithOverlays { NavigableCircuitContent(navigator, backStack) }
+        CompositionLocalProvider(LocalHttpCredentials provides credentials) {
+            CircuitCompositionLocals(circuit) {
+                ContentWithOverlays {
+                    MaterialTheme(dynamicColorScheme()) {
+                        NavigableCircuitContent(
+                            navigator = rememberCircuitNavigator(backStack),
+                            backstack = backStack,
+                        )
+                    }
                 }
             }
         }

app-launcher/common/src/commonMain/kotlin/io/ashdavies/playground/LauncherScreen.kt

@@ -40,7 +40,7 @@ import io.ashdavies.graphics.rememberAsyncImagePainter
     ExperimentalFoundationApi::class,
     ExperimentalMaterial3Api::class,
 )
-public fun LauncherScreen(
+internal fun LauncherScreen(
     state: LauncherScreen.State,
     modifier: Modifier = Modifier,
 ) {

app-launcher/common/src/commonMain/kotlin/io/ashdavies/playground/LauncherUiFactory.kt

@@ -3,7 +3,7 @@ package io.ashdavies.playground
 import com.slack.circuit.runtime.ui.Ui
 import com.slack.circuit.runtime.ui.ui
 
-public fun LauncherUiFactory(): Ui.Factory = Ui.Factory { screen, _ ->
+internal fun LauncherUiFactory(): Ui.Factory = Ui.Factory { screen, _ ->
     when (screen is LauncherScreen) {
         true -> ui<LauncherScreen.State> { state, modifier -> LauncherScreen(state, modifier) }
         false -> null

app-launcher/desktop/build.gradle.kts

@@ -11,6 +11,7 @@ kotlin {
     }
 
     jvmMain.dependencies {
+        implementation(projects.httpClient)
         implementation(libs.jetbrains.kotlinx.cli)
         implementation(libs.slack.circuit.foundation)
         implementation(projects.appLauncher.common)

app-launcher/desktop/src/jvmMain/kotlin/io/ashdavies/playground/LauncherMain.kt

@@ -1,6 +1,7 @@
 package io.ashdavies.playground
 
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
@@ -11,6 +12,8 @@ import com.slack.circuit.foundation.CircuitCompositionLocals
 import com.slack.circuit.foundation.NavigableCircuitContent
 import com.slack.circuit.foundation.rememberCircuitNavigator
 import io.ashdavies.content.PlatformContext
+import io.ashdavies.http.HttpCredentials
+import io.ashdavies.http.LocalHttpCredentials
 import kotlinx.cli.ArgParser
 import kotlinx.cli.ArgType
 
@@ -20,23 +23,27 @@ public fun main(args: Array<String>) {
     val argResult = argParser.parse(args)
 
     val initialBackStack = buildInitialBackStack(routerArgOption)
-    val circuitConfig = CircuitConfig(PlatformContext.Default)
+    val circuit = CircuitConfig(PlatformContext.Default)
 
-    application {
-        val windowState = rememberWindowState(size = DpSize(450.dp, 975.dp))
+    val credentials = HttpCredentials(
+        apiKey = System.getProperty("PLAYGROUND_API_KEY"),
+        userAgent = System.getProperty("os.name"),
+    )
 
+    application {
         Window(
             onCloseRequest = ::exitApplication,
+            state = rememberWindowState(size = DpSize(450.dp, 975.dp)),
             title = argResult.commandName,
-            state = windowState,
         ) {
             val backStack = rememberSaveableBackStack { initialBackStack.forEach(::push) }
             val navigator = rememberCircuitNavigator(backStack, ::exitApplication)
-            val colorScheme = dynamicColorScheme()
 
-            MaterialTheme(colorScheme = colorScheme) {
-                CircuitCompositionLocals(circuitConfig) {
-                    NavigableCircuitContent(navigator, backStack)
+            MaterialTheme(dynamicColorScheme()) {
+                CircuitCompositionLocals(circuit) {
+                    CompositionLocalProvider(LocalHttpCredentials provides credentials) {
+                        NavigableCircuitContent(navigator, backStack)
+                    }
                 }
             }
         }

cloud-run/src/jvmMain/kotlin/io/ashdavies/cloud/Main.kt

@@ -1,7 +1,6 @@
 package io.ashdavies.cloud
 
 import io.ashdavies.http.DefaultHttpClient
-import io.ashdavies.http.Software
 import io.ktor.client.HttpClient
 import io.ktor.http.HttpHeaders
 import io.ktor.serialization.Configuration
@@ -45,5 +44,5 @@ internal fun Application.main(client: HttpClient = DefaultHttpClient()) {
 }
 
 private fun DefaultHeadersConfig.headers() {
-    header(HttpHeaders.Server, Software.clientName)
+    header(HttpHeaders.Server, System.getProperty("os.name"))
 }

events-app/src/commonMain/kotlin/io/ashdavies/playground/events/EventPager.kt

@@ -6,7 +6,7 @@ import app.cash.paging.ExperimentalPagingApi
 import app.cash.paging.Pager
 import app.cash.paging.PagingConfig
 import io.ashdavies.generated.apis.EventsApi
-import io.ashdavies.http.buildApi
+import io.ashdavies.http.LocalHttpCredentials
 import io.ashdavies.playground.Event
 import io.ashdavies.playground.EventsQueries
 import io.ashdavies.playground.MultipleReferenceWarning
@@ -20,7 +20,7 @@ private const val DEFAULT_PAGE_SIZE = 10
 @MultipleReferenceWarning
 internal fun rememberEventPager(
     eventsQueries: EventsQueries = rememberPlaygroundDatabase().eventsQueries,
-    eventsApi: EventsApi = remember { buildApi(::EventsApi) },
+    eventsApi: EventsApi = rememberEventsApi(),
     initialKey: String = todayAsString(),
     pageSize: Int = DEFAULT_PAGE_SIZE,
 ): Pager<String, Event> = remember(eventsQueries, eventsApi) {
@@ -31,3 +31,10 @@ internal fun rememberEventPager(
         pagingSourceFactory = { EventsPagingSource(eventsQueries) },
     )
 }
+
+@Composable
+private fun rememberEventsApi(
+    apiKey: String = LocalHttpCredentials.current.apiKey,
+): EventsApi = remember(apiKey) {
+    EventsApi().apply { setApiKey(apiKey) }
+}

firebase-compose/src/androidMain/kotlin/io/ashdavies/compose/FirebaseApp.kt

@@ -14,18 +14,17 @@ public val LocalFirebaseAndroidApp: ProvidableCompositionLocal<FirebaseApp> = st
 }
 
 @Composable
-public fun ProvideFirebaseApp(context: Context = LocalContext.current, content: @Composable () -> Unit) {
+public fun FirebaseApp(context: Context = LocalContext.current, content: @Composable () -> Unit) {
     CompositionLocalProvider(
         LocalFirebaseAndroidApp provides requireFirebaseApp(context),
         content = content,
     )
 }
 
 private fun requireFirebaseApp(context: Context): FirebaseApp {
-    val firebaseApp = if (FirebaseApp.getApps(context).size > 0) {
-        FirebaseApp.getInstance()
-    } else {
-        FirebaseApp.initializeApp(context)
+    val firebaseApp = when (FirebaseApp.getApps(context).isEmpty()) {
+        true -> FirebaseApp.initializeApp(context)
+        else -> FirebaseApp.getInstance()
     }
 
     return requireNotNull(firebaseApp) {

http-client/src/commonMain/kotlin/io/ashdavies/http/HttpClient.kt

@@ -23,11 +23,15 @@ public val LocalHttpClient: ProvidableCompositionLocal<HttpClient> = staticCompo
     DefaultHttpClient { install(HttpCache) }
 }
 
-private val defaultUserAgent: String
-    get() = "${Software.clientName} (${Software.productName}; ${Software.buildVersion})"
+public fun DefaultHttpClient(
+    credentials: HttpCredentials,
+    configure: HttpClientConfig<CIOEngineConfig>.() -> Unit = { },
+): HttpClient = DefaultHttpClient {
+    install(DefaultRequest) { userAgent(credentials.userAgent) }
+    configure()
+}
 
 public fun DefaultHttpClient(
-    logLevel: LogLevel = LogLevel.INFO,
     configure: HttpClientConfig<CIOEngineConfig>.() -> Unit = { },
 ): HttpClient = HttpClient(CIO) {
     install(ContentNegotiation) {
@@ -42,12 +46,11 @@ public fun DefaultHttpClient(
     install(DefaultRequest) {
         contentType(ContentType.Application.Json)
         accept(ContentType.Application.Json)
-        userAgent(defaultUserAgent)
     }
 
     install(Logging) {
         logger = DefaultLogger()
-        level = logLevel
+        level = LogLevel.INFO
     }
 
     configure()

http-client/src/commonMain/kotlin/io/ashdavies/http/HttpCredentials.kt

@@ -0,0 +1,12 @@
+package io.ashdavies.http
+
+import androidx.compose.runtime.staticCompositionLocalOf
+
+public val LocalHttpCredentials = staticCompositionLocalOf<HttpCredentials> {
+    error("CompositionLocal LocalHttpCredentials not present")
+}
+
+public data class HttpCredentials(
+    val apiKey: String,
+    val userAgent: String,
+)