-
Notifications
You must be signed in to change notification settings - Fork 593
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rebase completed, one failing test to fix
- Loading branch information
David Motsonashvili
committed
Jan 30, 2025
1 parent
e881958
commit d7296c3
Showing
12 changed files
with
142 additions
and
205 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
...se-vertexai/src/main/kotlin/com/google/firebase/vertexai/common/AppCheckHeaderProvider.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * 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.vertexai.common | ||
|
|
||
| import android.util.Log | ||
| import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider | ||
| import com.google.firebase.auth.internal.InternalAuthProvider | ||
| import kotlinx.coroutines.tasks.await | ||
| import kotlin.time.Duration | ||
| import kotlin.time.Duration.Companion.seconds | ||
|
|
||
| internal class AppCheckHeaderProvider( | ||
| private val logTag: String, | ||
| private val appCheckTokenProvider: InteropAppCheckTokenProvider? = null, | ||
| private val internalAuthProvider: InternalAuthProvider? = null, | ||
| ) : HeaderProvider { | ||
| override val timeout: Duration | ||
| get() = 10.seconds | ||
|
|
||
| override suspend fun generateHeaders(): Map<String, String> { | ||
| val headers = mutableMapOf<String, String>() | ||
| if (appCheckTokenProvider == null) { | ||
| Log.w(logTag, "AppCheck not registered, skipping") | ||
| } else { | ||
| val token = appCheckTokenProvider.getToken(false).await() | ||
|
|
||
| if (token.error != null) { | ||
| Log.w(logTag, "Error obtaining AppCheck token", token.error) | ||
| } | ||
| // The Firebase App Check backend can differentiate between apps without App Check, and | ||
| // wrongly configured apps by verifying the value of the token, so it always needs to be | ||
| // included. | ||
| headers["X-Firebase-AppCheck"] = token.token | ||
| } | ||
|
|
||
| if (internalAuthProvider == null) { | ||
| Log.w(logTag, "Auth not registered, skipping") | ||
| } else { | ||
| try { | ||
| val token = internalAuthProvider.getAccessToken(false).await() | ||
|
|
||
| headers["Authorization"] = "Firebase ${token.token!!}" | ||
| } catch (e: Exception) { | ||
| Log.w(logTag, "Error getting Auth token ", e) | ||
| } | ||
| } | ||
|
|
||
| return headers | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 0 additions & 44 deletions
44
...se-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/GenerateImageRequest.kt
This file was deleted.
Oops, something went wrong.
30 changes: 0 additions & 30 deletions
30
...e-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/GenerateImageResponse.kt
This file was deleted.
Oops, something went wrong.
65 changes: 0 additions & 65 deletions
65
...exai/src/main/kotlin/com/google/firebase/vertexai/internal/util/AppCheckHeaderProvider.kt
This file was deleted.
Oops, something went wrong.
41 changes: 0 additions & 41 deletions
41
firebase-vertexai/src/main/kotlin/com/google/firebase/vertexai/internal/util/kotlin.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.