MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-18 18:11:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: GCA creds loading order (#6498)

Browse Source
This commit is contained in:
Gaurav
2025-08-18 14:11:19 -07:00
committed by GitHub
parent 3960ccf781
commit 5fe4e02310
2 changed files with 86 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
packages/core/src/code_assist/oauth2.test.ts
View File

@@ -324,6 +324,70 @@ describe('oauth2', () => {
});
});
describe('credential loading order', () => {
it('should prioritize default cached credentials over GOOGLE_APPLICATION_CREDENTIALS', async () => {
// Setup default cached credentials
const defaultCreds = { refresh_token: 'default-cached-token' };
const defaultCredsPath = path.join(
tempHomeDir,
'.gemini',
'oauth_creds.json',
);
await fs.promises.mkdir(path.dirname(defaultCredsPath), {
recursive: true,
});
await fs.promises.writeFile(
defaultCredsPath,
JSON.stringify(defaultCreds),
);
// Setup credentials via environment variable
const envCreds = { refresh_token: 'env-var-token' };
const envCredsPath = path.join(tempHomeDir, 'env_creds.json');
await fs.promises.writeFile(envCredsPath, JSON.stringify(envCreds));
vi.stubEnv('GOOGLE_APPLICATION_CREDENTIALS', envCredsPath);
const mockClient = {
setCredentials: vi.fn(),
getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
getTokenInfo: vi.fn().mockResolvedValue({}),
on: vi.fn(),
};
(OAuth2Client as unknown as Mock).mockImplementation(
() => mockClient as unknown as OAuth2Client,
);
await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
// Assert the correct credentials were used
expect(mockClient.setCredentials).toHaveBeenCalledWith(defaultCreds);
expect(mockClient.setCredentials).not.toHaveBeenCalledWith(envCreds);
});
it('should fall back to GOOGLE_APPLICATION_CREDENTIALS if default cache is missing', async () => {
// Setup credentials via environment variable
const envCreds = { refresh_token: 'env-var-token' };
const envCredsPath = path.join(tempHomeDir, 'env_creds.json');
await fs.promises.writeFile(envCredsPath, JSON.stringify(envCreds));
vi.stubEnv('GOOGLE_APPLICATION_CREDENTIALS', envCredsPath);
const mockClient = {
setCredentials: vi.fn(),
getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
getTokenInfo: vi.fn().mockResolvedValue({}),
on: vi.fn(),
};
(OAuth2Client as unknown as Mock).mockImplementation(
() => mockClient as unknown as OAuth2Client,
);
await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
// Assert the correct credentials were used
expect(mockClient.setCredentials).toHaveBeenCalledWith(envCreds);
});
});
describe('with GCP environment variables', () => {
it('should use GOOGLE_CLOUD_ACCESS_TOKEN when GOOGLE_GENAI_USE_GCA is true', async () => {
vi.stubEnv('GOOGLE_GENAI_USE_GCA', 'true');