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

inlining recordGoogleAuthEnd

Browse Source
This commit is contained in:
Srinath Padmanabhan
2026-03-05 16:44:45 -08:00
parent 192b1a630f
commit 2bd1d45f08
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,12 +117,6 @@ async function initOauthClient(
authType: AuthType, authType: AuthType,
config: Config, config: Config,
): Promise<AuthClient> { ): Promise<AuthClient> {
const recordGoogleAuthEndIfApplicable = () => {
if (authType === AuthType.LOGIN_WITH_GOOGLE) {
recordGoogleAuthEnd(config);
}
};
const credentials = await fetchCachedCredentials(); const credentials = await fetchCachedCredentials();
if ( if (
@@ -167,6 +161,9 @@ async function initOauthClient(
access_token: process.env['GOOGLE_CLOUD_ACCESS_TOKEN'], access_token: process.env['GOOGLE_CLOUD_ACCESS_TOKEN'],
}); });
await fetchAndCacheUserInfo(client); await fetchAndCacheUserInfo(client);
if (authType === AuthType.LOGIN_WITH_GOOGLE) {
recordGoogleAuthEnd(config);
}
return client; return client;
} }
@@ -203,7 +200,9 @@ async function initOauthClient(
debugLogger.log('Loaded cached credentials.'); debugLogger.log('Loaded cached credentials.');
await triggerPostAuthCallbacks(credentials as Credentials); await triggerPostAuthCallbacks(credentials as Credentials);
recordGoogleAuthEndIfApplicable(); if (authType === AuthType.LOGIN_WITH_GOOGLE) {
recordGoogleAuthEnd(config);
}
return client; return client;
} }
} catch (error) { } catch (error) {
@@ -295,7 +294,9 @@ async function initOauthClient(
} }
await triggerPostAuthCallbacks(client.credentials); await triggerPostAuthCallbacks(client.credentials);
recordGoogleAuthEndIfApplicable(); if (authType === AuthType.LOGIN_WITH_GOOGLE) {
recordGoogleAuthEnd(config);
}
} else { } else {
// In ACP mode, we skip the interactive consent and directly open the browser // In ACP mode, we skip the interactive consent and directly open the browser
if (!config.getAcpMode()) { if (!config.getAcpMode()) {
@@ -402,7 +403,9 @@ async function initOauthClient(
}); });
await triggerPostAuthCallbacks(client.credentials); await triggerPostAuthCallbacks(client.credentials);
recordGoogleAuthEndIfApplicable(); if (authType === AuthType.LOGIN_WITH_GOOGLE) {
recordGoogleAuthEnd(config);
}
} }
return client; return client;