vrr/opencode
2
0
Fork 0
mirror of https://github.com/anomalyco/opencode.git synced 2026-05-30 03:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

fix(opencode): pass OAuth scopes to GoogleAuth for Vertex AI (#15110)

Browse source 
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
This commit is contained in:
Saurav M H 2026-05-29 05:35:43 +05:30 • committed by GitHub
parent acca8864ba
commit 797c689ec2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/core/src/plugin/provider/google-vertex.ts
View file

@ -43,9 +43,9 @@ function authFetch(fetchWithRuntimeOptions?: unknown) {
// do not, so inject a Google access token into their fetch path.
return async (input: Parameters<typeof fetch>[0], init?: RequestInit) => {
const { GoogleAuth } = await import("google-auth-library")
const auth = new GoogleAuth()
const client = await auth.getApplicationDefault()
const token = await client.credential.getAccessToken()
const auth = new GoogleAuth({ scopes: ["https://www.googleapis.com/auth/cloud-platform"] })
const client = await auth.getClient()
const token = await client.getAccessToken()
const headers = new Headers(init?.headers)
headers.set("Authorization", `Bearer ${token.token}`)
return typeof fetchWithRuntimeOptions === "function"

15
packages/core/test/plugin/provider-google-vertex.test.ts
View file

@ -7,6 +7,7 @@ import { ProviderV2 } from "@opencode-ai/core/provider"
import { fakeSelectorSdk, it, model, withEnv } from "./provider-helper"
const vertexOptions: Record<string, any>[] = []
const googleAuthOptions: Record<string, any>[] = []
void mock.module("@ai-sdk/google-vertex", () => ({
createVertex: (options: Record<string, any>) => {
@ -19,12 +20,14 @@ void mock.module("@ai-sdk/google-vertex", () => ({
void mock.module("google-auth-library", () => ({
GoogleAuth: class {
async getApplicationDefault() {
constructor(options: Record<string, any>) {
googleAuthOptions.push(options)
}
async getClient() {
return {
credential: {
async getAccessToken() {
return { token: "vertex-token" }
},
async getAccessToken() {
return { token: "vertex-token" }
},
}
}
@ -247,6 +250,7 @@ describe("GoogleVertexPlugin", () => {
it.effect("keeps Google auth fetch for OpenAI-compatible Vertex endpoints", () =>
Effect.gen(function* () {
googleAuthOptions.length = 0
const fetchCalls: { input: Parameters<typeof fetch>[0]; init?: RequestInit }[] = []
const plugin = yield* PluginV2.Service
yield* plugin.add(GoogleVertexPlugin)
@ -292,6 +296,7 @@ describe("GoogleVertexPlugin", () => {
}),
)
expect(fetchCalls).toHaveLength(1)
expect(googleAuthOptions).toEqual([{ scopes: ["https://www.googleapis.com/auth/cloud-platform"] }])
expect(fetchCalls[0].input).toBe("https://vertex.example")
expect(new Headers(fetchCalls[0].init?.headers).get("authorization")).toBe("Bearer vertex-token")
expect(new Headers(fetchCalls[0].init?.headers).get("x-test")).toBe("1")

6
packages/opencode/src/provider/provider.ts
View file

@ -502,9 +502,9 @@ function custom(dep: CustomDep): Record<string, CustomLoader> {
location,
fetch: async (input: RequestInfo | URL, init?: RequestInit) => {
const { GoogleAuth } = await import("google-auth-library")
const auth = new GoogleAuth()
const client = await auth.getApplicationDefault()
const token = await client.credential.getAccessToken()
const auth = new GoogleAuth({ scopes: ["https://www.googleapis.com/auth/cloud-platform"] })
const client = await auth.getClient()
const token = await client.getAccessToken()
const headers = new Headers(init?.headers)
headers.set("Authorization", `Bearer ${token.token}`)