MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-19 01:30:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve error message when OAuth succeeds but project ID is required (#21070)

Browse Source
This commit is contained in:
nityam
2026-03-05 00:58:34 +05:30
committed by GitHub
parent ac4e65d669
commit 8f36051f32
5 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/cli/src/ui/AppContainer.tsx
View File

@@ -80,6 +80,7 @@ import {
type ConsentRequestPayload,
type AgentsDiscoveredPayload,
ChangeAuthRequestedError,
ProjectIdRequiredError,
CoreToolCallStatus,
generateSteeringAckMessage,
buildUserSteeringHintPrompt,
@@ -771,6 +772,12 @@ export const AppContainer = (props: AppContainerProps) => {
if (e instanceof ChangeAuthRequestedError) {
return;
}
if (e instanceof ProjectIdRequiredError) {
// OAuth succeeded but account setup requires project ID
// Show the error message directly without "Failed to authenticate" prefix
onAuthError(getErrorMessage(e));
return;
}
onAuthError(
`Failed to authenticate: ${e instanceof Error ? e.message : String(e)}`,
);

22
packages/cli/src/ui/auth/useAuth.test.tsx
View File

@@ -15,7 +15,11 @@ import {
} from 'vitest';
import { renderHook } from '../../test-utils/render.js';
import { useAuthCommand, validateAuthMethodWithSettings } from './useAuth.js';
import { AuthType, type Config } from '@google/gemini-cli-core';
import {
AuthType,
type Config,
ProjectIdRequiredError,
} from '@google/gemini-cli-core';
import { AuthState } from '../types.js';
import type { LoadedSettings } from '../../config/settings.js';
import { waitFor } from '../../test-utils/async.js';
@@ -288,5 +292,21 @@ describe('useAuth', () => {
expect(result.current.authState).toBe(AuthState.Updating);
});
});
it('should handle ProjectIdRequiredError without "Failed to login" prefix', async () => {
const projectIdError = new ProjectIdRequiredError();
(mockConfig.refreshAuth as Mock).mockRejectedValue(projectIdError);
const { result } = renderHook(() =>
useAuthCommand(createSettings(AuthType.LOGIN_WITH_GOOGLE), mockConfig),
);
await waitFor(() => {
expect(result.current.authError).toBe(
'This account requires setting the GOOGLE_CLOUD_PROJECT or GOOGLE_CLOUD_PROJECT_ID env var. See https://goo.gle/gemini-cli-auth-docs#workspace-gca',
);
expect(result.current.authError).not.toContain('Failed to login');
expect(result.current.authState).toBe(AuthState.Updating);
});
});
});
});

5
packages/cli/src/ui/auth/useAuth.ts
View File

@@ -12,6 +12,7 @@ import {
loadApiKey,
debugLogger,
isAccountSuspendedError,
ProjectIdRequiredError,
} from '@google/gemini-cli-core';
import { getErrorMessage } from '@google/gemini-cli-core';
import { AuthState } from '../types.js';
@@ -143,6 +144,10 @@ export const useAuthCommand = (
appealUrl: suspendedError.appealUrl,
appealLinkText: suspendedError.appealLinkText,
});
} else if (e instanceof ProjectIdRequiredError) {
// OAuth succeeded but account setup requires project ID
// Show the error message directly without "Failed to login" prefix
onAuthError(getErrorMessage(e));
} else {
onAuthError(`Failed to login. Message: ${getErrorMessage(e)}`);
}