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

fix(cli): prioritize configured auth over env vars in non-interactive mode (#10935)

Browse Source
This commit is contained in:
Sandy Tao
2025-10-10 16:50:54 -07:00
committed by GitHub
parent cd9193466e
commit 09ef33ec3a
3 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/cli/src/validateNonInterActiveAuth.ts
View File

@@ -31,17 +31,15 @@ export async function validateNonInteractiveAuth(
settings: LoadedSettings,
) {
try {
const enforcedType = settings.merged.security?.auth?.enforcedType;
if (enforcedType) {
const currentAuthType = getAuthTypeFromEnv();
if (currentAuthType !== enforcedType) {
const message = `The configured auth type is ${enforcedType}, but the current auth type is ${currentAuthType}. Please re-authenticate with the correct type.`;
throw new Error(message);
}
}
const effectiveAuthType = configuredAuthType || getAuthTypeFromEnv();
const effectiveAuthType =
enforcedType || getAuthTypeFromEnv() || configuredAuthType;
const enforcedType = settings.merged.security?.auth?.enforcedType;
if (enforcedType && effectiveAuthType !== enforcedType) {
const message = effectiveAuthType
? `The enforced authentication type is '${enforcedType}', but the current type is '${effectiveAuthType}'. Please re-authenticate with the correct type.`
: `The auth type '${enforcedType}' is enforced, but no authentication is configured.`;
throw new Error(message);
}
if (!effectiveAuthType) {
const message = `Please set an Auth method in your ${USER_SETTINGS_PATH} or specify one of the following environment variables before running: GEMINI_API_KEY, GOOGLE_GENAI_USE_VERTEXAI, GOOGLE_GENAI_USE_GCA`;