Merge branch 'main' into dependabot/gradle/com.google.code.gson-gson-2.13.2

Author: rlazo

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/LiveSession.kt

@@ -331,10 +331,18 @@ internal constructor(
   }
 
   /**
-   * Sends a video input stream to the model, using the realtime API.
+   * Sends a video frame to the model, using the realtime API.
    *
-   * @param video Encoded video data, used to update the model on the client's conversation. The
-   * MIME type can be a video format (e.g., `video/webm`) or an image format (e.g., `image/jpeg`).
+   * Instead of raw video data, the model expects individual frames of the video, sent as images.
+   *
+   * If your video has audio, send it separately through [sendAudioRealtime].
+   *
+   * For better performance, frames can also be sent at a lower rate than the video; even as low as
+   * 1 frame per second.
+   *
+   * @param video Encoded image data extracted from a frame of the video, used to update the model
+   * on the client's conversation, with the corresponding IANA standard MIME type of the video frame
+   * data (e.g., `image/png`, `image/jpeg`, etc.).
    */
   public suspend fun sendVideoRealtime(video: InlineData) {
     FirebaseAIException.catchAsync {

firebase-dataconnect/CHANGELOG.md

@@ -1,7 +1,8 @@
 # Unreleased
 
 - [changed] Internal refactor for managing Auth and App Check tokens
-  ([#7184](https://github.com/firebase/firebase-android-sdk/pull/7184))
+  ([#7484](https://github.com/firebase/firebase-android-sdk/pull/7484),
+  [#7485](https://github.com/firebase/firebase-android-sdk/pull/7485))
 
 # 17.1.0
 

firebase-dataconnect/src/main/kotlin/com/google/firebase/dataconnect/core/DataConnectAuth.kt

@@ -49,13 +49,22 @@ internal class DataConnectAuth(
     provider.removeIdTokenListener(idTokenListener)
 
   override suspend fun getToken(provider: InternalAuthProvider, forceRefresh: Boolean) =
-    provider.getAccessToken(forceRefresh).await().let { GetAuthTokenResult(it.token) }
+    provider.getAccessToken(forceRefresh).await().let {
+      GetAuthTokenResult(it.token, it.getAuthUid())
+    }
 
-  data class GetAuthTokenResult(override val token: String?) : GetTokenResult
+  data class GetAuthTokenResult(override val token: String?, val authUid: String?) : GetTokenResult
 
   private class IdTokenListenerImpl(private val logger: Logger) : IdTokenListener {
     override fun onIdTokenChanged(tokenResult: InternalTokenResult) {
       logger.debug { "onIdTokenChanged(token=${tokenResult.token?.toScrubbedAccessToken()})" }
     }
   }
+
+  private companion object {
+
+    // The "sub" claim is documented to be "a non-empty string and must be the uid of the user or
+    // device". See http://goo.gle/4oGjEQt for the relevant Firebase documentation.
+    fun com.google.firebase.auth.GetTokenResult.getAuthUid(): String? = claims["sub"] as? String
+  }
 }

firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/core/DataConnectAuthUnitTest.kt

@@ -54,7 +54,9 @@ import io.kotest.matchers.shouldBe
 import io.kotest.matchers.types.shouldBeSameInstanceAs
 import io.kotest.property.Arb
 import io.kotest.property.RandomSource
+import io.kotest.property.arbitrary.map
 import io.kotest.property.arbitrary.next
+import io.kotest.property.arbs.products.brand
 import io.mockk.coEvery
 import io.mockk.confirmVerified
 import io.mockk.every
@@ -311,6 +313,46 @@ class DataConnectAuthUnitTest {
     mockLogger.shouldNotHaveLoggedAnyMessagesContaining(accessToken)
   }
 
+  @Test
+  fun `getToken() should populate authUid from sub claim`() = runTest {
+    val dataConnectAuth = newDataConnectAuth()
+    dataConnectAuth.initialize()
+    advanceUntilIdle()
+    val uid = Arb.brand().map { it.value }.next(rs)
+    coEvery { mockInternalAuthProvider.getAccessToken(any()) } returns
+      taskForToken(accessToken, mapOf("sub" to uid))
+
+    val result = dataConnectAuth.getToken(requestId)
+
+    result.shouldNotBeNull().authUid shouldBe uid
+  }
+
+  @Test
+  fun `getToken() should populate null authUid if sub claim is missing`() = runTest {
+    val dataConnectAuth = newDataConnectAuth()
+    dataConnectAuth.initialize()
+    advanceUntilIdle()
+    coEvery { mockInternalAuthProvider.getAccessToken(any()) } returns
+      taskForToken(accessToken, emptyMap())
+
+    val result = dataConnectAuth.getToken(requestId)
+
+    result.shouldNotBeNull().authUid.shouldBeNull()
+  }
+
+  @Test
+  fun `getToken() should populate null authUid if sub claim is not a String`() = runTest {
+    val dataConnectAuth = newDataConnectAuth()
+    dataConnectAuth.initialize()
+    advanceUntilIdle()
+    coEvery { mockInternalAuthProvider.getAccessToken(any()) } returns
+      taskForToken(accessToken, mapOf("sub" to 42))
+
+    val result = dataConnectAuth.getToken(requestId)
+
+    result.shouldNotBeNull().authUid.shouldBeNull()
+  }
+
   @Test
   fun `getToken() should return re-throw the exception from the task returned from FirebaseAuth`() =
     runTest {
@@ -613,7 +655,7 @@ class DataConnectAuthUnitTest {
       interval = 100.milliseconds
     }
 
-    fun taskForToken(token: String?): Task<GetTokenResult> =
-      Tasks.forResult(mockk(relaxed = true) { every { getToken() } returns token })
+    fun taskForToken(token: String?, claims: Map<String, Any> = emptyMap()): Task<GetTokenResult> =
+      Tasks.forResult(GetTokenResult(token, claims))
   }
 }

firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/core/DataConnectGrpcMetadataUnitTest.kt

@@ -19,6 +19,8 @@ import android.os.Build
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.firebase.dataconnect.BuildConfig
 import com.google.firebase.dataconnect.FirebaseDataConnect.CallerSdkType
+import com.google.firebase.dataconnect.core.DataConnectAppCheck.GetAppCheckTokenResult
+import com.google.firebase.dataconnect.core.DataConnectAuth.GetAuthTokenResult
 import com.google.firebase.dataconnect.testutil.FirebaseAppUnitTestingRule
 import com.google.firebase.dataconnect.testutil.property.arbitrary.appCheckTokenResult
 import com.google.firebase.dataconnect.testutil.property.arbitrary.authTokenResult
@@ -31,9 +33,12 @@ import io.kotest.matchers.collections.shouldNotContain
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.types.shouldBeSameInstanceAs
 import io.kotest.property.Arb
+import io.kotest.property.Exhaustive
 import io.kotest.property.arbitrary.constant
 import io.kotest.property.arbitrary.enum
 import io.kotest.property.arbitrary.next
+import io.kotest.property.checkAll
+import io.kotest.property.exhaustive.of
 import io.mockk.coEvery
 import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
@@ -160,24 +165,33 @@ class DataConnectGrpcMetadataUnitTest {
 
   @Test
   fun `should omit x-firebase-auth-token when the auth token is null`() = runTest {
-    val dataConnectAuth: DataConnectAuth = mockk()
-    coEvery { dataConnectAuth.getToken(any()) } returns null
-    val dataConnectGrpcMetadata =
-      Arb.dataConnect
-        .dataConnectGrpcMetadata(dataConnectAuth = Arb.constant(dataConnectAuth))
-        .next()
-    val requestId = Arb.dataConnect.requestId().next()
-    val callerSdkType = Arb.enum<CallerSdkType>().next()
+    val getAuthTokenResults: Exhaustive<GetAuthTokenResult?> =
+      Exhaustive.of(
+        null,
+        Arb.dataConnect.authTokenResult(accessToken = Arb.constant(null)).next(),
+      )
 
-    val metadata = dataConnectGrpcMetadata.get(requestId, callerSdkType)
+    checkAll(getAuthTokenResults) { getAuthTokenResult ->
+      val dataConnectAuth: DataConnectAuth = mockk()
+      coEvery { dataConnectAuth.getToken(any()) } returns getAuthTokenResult
+      val dataConnectGrpcMetadata =
+        Arb.dataConnect
+          .dataConnectGrpcMetadata(dataConnectAuth = Arb.constant(dataConnectAuth))
+          .next()
+      val requestId = Arb.dataConnect.requestId().next()
+      val callerSdkType = Arb.enum<CallerSdkType>().next()
 
-    metadata.asClue { it.keys() shouldNotContain "x-firebase-auth-token" }
+      val metadata = dataConnectGrpcMetadata.get(requestId, callerSdkType)
+
+      metadata.asClue { it.keys() shouldNotContain "x-firebase-auth-token" }
+    }
   }
 
   @Test
   fun `should include x-firebase-auth-token when the auth token is not null`() = runTest {
     val dataConnectAuth: DataConnectAuth = mockk()
-    val authTokenResult = Arb.dataConnect.authTokenResult().next()
+    val authTokenResult =
+      Arb.dataConnect.authTokenResult(accessToken = Arb.dataConnect.accessToken()).next()
     coEvery { dataConnectAuth.getToken(any()) } returns authTokenResult
     val dataConnectGrpcMetadata =
       Arb.dataConnect
@@ -197,24 +211,33 @@ class DataConnectGrpcMetadataUnitTest {
 
   @Test
   fun `should omit x-firebase-appcheck when the AppCheck token is null`() = runTest {
-    val dataConnectAppCheck: DataConnectAppCheck = mockk {
-      coEvery { getToken(any()) } returns null
-    }
-    val dataConnectGrpcMetadata =
-      Arb.dataConnect
-        .dataConnectGrpcMetadata(dataConnectAppCheck = Arb.constant(dataConnectAppCheck))
-        .next()
-    val requestId = Arb.dataConnect.requestId().next()
-    val callerSdkType = Arb.enum<CallerSdkType>().next()
+    val getAppCheckTokenResults: Exhaustive<GetAppCheckTokenResult?> =
+      Exhaustive.of(
+        null,
+        Arb.dataConnect.appCheckTokenResult(accessToken = Arb.constant(null)).next(),
+      )
 
-    val metadata = dataConnectGrpcMetadata.get(requestId, callerSdkType)
+    checkAll(getAppCheckTokenResults) { getAppCheckTokenResult ->
+      val dataConnectAppCheck: DataConnectAppCheck = mockk {
+        coEvery { getToken(any()) } returns getAppCheckTokenResult
+      }
+      val dataConnectGrpcMetadata =
+        Arb.dataConnect
+          .dataConnectGrpcMetadata(dataConnectAppCheck = Arb.constant(dataConnectAppCheck))
+          .next()
+      val requestId = Arb.dataConnect.requestId().next()
+      val callerSdkType = Arb.enum<CallerSdkType>().next()
 
-    metadata.asClue { it.keys() shouldNotContain "x-firebase-appcheck" }
+      val metadata = dataConnectGrpcMetadata.get(requestId, callerSdkType)
+
+      metadata.asClue { it.keys() shouldNotContain "x-firebase-appcheck" }
+    }
   }
 
   @Test
   fun `should include x-firebase-appcheck when the AppCheck token is not null`() = runTest {
-    val appCheckTokenResult = Arb.dataConnect.appCheckTokenResult().next()
+    val appCheckTokenResult =
+      Arb.dataConnect.appCheckTokenResult(accessToken = Arb.dataConnect.accessToken()).next()
     val dataConnectAppCheck: DataConnectAppCheck = mockk {
       coEvery { getToken(any()) } returns appCheckTokenResult
     }

firebase-dataconnect/src/test/kotlin/com/google/firebase/dataconnect/testutil/property/arbitrary/arbs.kt

@@ -333,9 +333,11 @@ internal inline fun <Data, reified Variables> DataConnectArb.operationRefConstru
 }
 
 internal fun DataConnectArb.authTokenResult(
-  accessToken: Arb<String> = accessToken()
-): Arb<GetAuthTokenResult> = accessToken.map { GetAuthTokenResult(it) }
+  accessToken: Arb<String?> = accessToken().orNull(nullProbability = 0.33),
+  authUid: Arb<String?> =
+    Arb.string(0..10, Codepoint.alphanumeric()).orNull(nullProbability = 0.33),
+): Arb<GetAuthTokenResult> = Arb.bind(accessToken, authUid, ::GetAuthTokenResult)
 
 internal fun DataConnectArb.appCheckTokenResult(
-  accessToken: Arb<String> = accessToken()
+  accessToken: Arb<String?> = accessToken().orNull(nullProbability = 0.33),
 ): Arb<GetAppCheckTokenResult> = accessToken.map { GetAppCheckTokenResult(it) }

firebase-inappmessaging/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased
 
+- [changed] Bumped internal dependencies.
+
 # 22.0.1
 
 - [changed] Bumped internal dependencies.

plugins/src/main/java/com/google/firebase/gradle/plugins/report/ReportCommit.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.firebase.gradle.plugins.report
+
+/**
+ * @param sha Commit SHA.
+ * @param pr GitHub PR number that was squashed to create this commit. Used only for display
+ *   purposes, does not affect logic.
+ */
+data class ReportCommit(val sha: String, val pr: Int)

plugins/src/main/java/com/google/firebase/gradle/plugins/report/TestReport.kt

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.firebase.gradle.plugins.report
+
+/**
+ * Represents a single run of a test in CI. One unit/instrumentation test workflow run creates many
+ * `TestReport`s, one for each tested SDK.
+ *
+ * @param name SDK name of the associated test run.
+ * @param type What type of test result this is, either unit or instrumentation test.
+ * @param status Conclusion status of the test run, `SUCCESS`/`FAILURE` for typical results, `OTHER`
+ *   for ongoing runs and unexpected data.
+ * @param commit Commit SHA this test was run on.
+ * @param url Link to the GHA test run info, including logs.
+ */
+data class TestReport(
+  val name: String,
+  val type: Type,
+  val status: Status,
+  val commit: String,
+  val url: String,
+) {
+  enum class Type {
+    UNIT_TEST,
+    INSTRUMENTATION_TEST,
+  }
+
+  enum class Status {
+    SUCCESS,
+    FAILURE,
+    OTHER,
+  }
+}