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

feat(core): remove unnecessary login verbiage from Code Assist auth (#19861)

Browse Source
This commit is contained in:
N. Taylor Mullen
2026-02-21 13:55:11 -08:00
committed by GitHub
parent acb7f577de
commit a7d851146a
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -271,7 +271,7 @@ async function initOauthClient(
await triggerPostAuthCallbacks(client.credentials);
} else {
const userConsent = await getConsentForOauth('Code Assist login required.');
const userConsent = await getConsentForOauth('');
if (!userConsent) {
throw new FatalCancellationError('Authentication cancelled by user.');
}
@@ -281,8 +281,7 @@ async function initOauthClient(
coreEvents.emit(CoreEvent.UserFeedback, {
severity: 'info',
message:
`\n\nCode Assist login required.\n` +
`Attempting to open authentication page in your browser.\n` +
`\n\nAttempting to open authentication page in your browser.\n` +
`Otherwise navigate to:\n\n${webLogin.authUrl}\n\n\n`,
});
try {

19
packages/core/src/utils/authConsent.test.ts
View File

@@ -56,6 +56,25 @@ describe('getConsentForOauth', () => {
);
});
it('should handle empty prompt correctly', async () => {
const mockEmitConsentRequest = vi.spyOn(coreEvents, 'emitConsentRequest');
vi.spyOn(coreEvents, 'listenerCount').mockReturnValue(1);
mockEmitConsentRequest.mockImplementation((payload) => {
payload.onConfirm(true);
});
await getConsentForOauth('');
expect(mockEmitConsentRequest).toHaveBeenCalledWith(
expect.objectContaining({
prompt: expect.stringMatching(
/^Opening authentication page in your browser\./,
),
}),
);
});
it('should return false when user declines via UI', async () => {
const mockEmitConsentRequest = vi.spyOn(coreEvents, 'emitConsentRequest');
vi.spyOn(coreEvents, 'listenerCount').mockReturnValue(1);

4
packages/core/src/utils/authConsent.ts
View File

@@ -15,7 +15,9 @@ import { isHeadlessMode } from './headless.js';
* Handles both interactive and non-interactive (headless) modes.
*/
export async function getConsentForOauth(prompt: string): Promise<boolean> {
const finalPrompt = prompt + ' Opening authentication page in your browser. ';
const finalPrompt =
(prompt ? prompt + ' ' : '') +
'Opening authentication page in your browser. ';
if (isHeadlessMode()) {
return getOauthConsentNonInteractive(finalPrompt);