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

Disallow unnecessary awaits. (#15172)

Browse Source
This commit is contained in:
Christian Gunderman
2025-12-16 21:28:18 -08:00
committed by GitHub
parent 3e9a0a7628
commit 7f2d33458a
38 changed files with 129 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,7 +189,7 @@ describe('oauth2', () => {
end: vi.fn(),
} as unknown as http.ServerResponse;
await requestCallback(mockReq, mockRes);
requestCallback(mockReq, mockRes);
const client = await clientPromise;
expect(client).toBe(mockOAuth2Client);
@@ -203,7 +203,9 @@ describe('oauth2', () => {
// Manually trigger the 'tokens' event listener
if (tokensListener) {
await tokensListener(mockTokens);
await (
tokensListener as unknown as (tokens: Credentials) => Promise<void>
)(mockTokens);
}
// Verify Google Account was cached
@@ -575,9 +577,7 @@ describe('oauth2', () => {
const mockExternalAccountClient = {
getAccessToken: vi.fn().mockResolvedValue({ token: 'byoid-token' }),
};
const mockFromJSON = vi
.fn()
.mockResolvedValue(mockExternalAccountClient);
const mockFromJSON = vi.fn().mockReturnValue(mockExternalAccountClient);
const mockGoogleAuthInstance = {
fromJSON: mockFromJSON,
};
@@ -834,7 +834,7 @@ describe('oauth2', () => {
} as unknown as http.ServerResponse;
await expect(async () => {
await requestCallback(mockReq, mockRes);
requestCallback(mockReq, mockRes);
await clientPromise;
}).rejects.toThrow(
'Google OAuth error: access_denied. User denied access',
@@ -891,7 +891,7 @@ describe('oauth2', () => {
} as unknown as http.ServerResponse;
await expect(async () => {
await requestCallback(mockReq, mockRes);
requestCallback(mockReq, mockRes);
await clientPromise;
}).rejects.toThrow(
'Google OAuth error: server_error. No additional details provided',
@@ -954,7 +954,7 @@ describe('oauth2', () => {
} as unknown as http.ServerResponse;
await expect(async () => {
await requestCallback(mockReq, mockRes);
requestCallback(mockReq, mockRes);
await clientPromise;
}).rejects.toThrow(
'Failed to exchange authorization code for tokens: Token exchange failed',
@@ -1038,7 +1038,7 @@ describe('oauth2', () => {
end: vi.fn(),
} as unknown as http.ServerResponse;
await requestCallback(mockReq, mockRes);
requestCallback(mockReq, mockRes);
const client = await clientPromise;
// Authentication should succeed even if fetchAndCacheUserInfo fails

2
packages/core/src/code_assist/oauth2.ts
View File

@@ -120,7 +120,7 @@ async function initOauthClient(
const auth = new GoogleAuth({
scopes: OAUTH_SCOPE,
});
const byoidClient = await auth.fromJSON({
const byoidClient = auth.fromJSON({
...credentials,
refresh_token: credentials.refresh_token ?? undefined,
});