abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-19 09:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support logging in with Application Default Credentials (#1157)

Browse Source 
Co-authored-by: N. Taylor Mullen <ntaylormullen@google.com>
This commit is contained in:
Tommaso Sciortino
2025-06-18 09:49:13 -07:00
committed by GitHub
parent 5b2cea8eda
commit 3453b977b8
5 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/core/src/code_assist/setup.ts
View File

@@ -6,31 +6,27 @@
import { ClientMetadata, OnboardUserRequest } from './types.js';
import { CodeAssistServer } from './server.js';
import { OAuth2Client } from 'google-auth-library';
import { clearCachedCredentials } from './oauth2.js';
import { AuthClient } from 'google-auth-library';
/**
*
* @param projectId the user's project id, if any
* @returns the user's actual project id
*/
export async function setupUser(
oAuth2Client: OAuth2Client,
projectId?: string,
): Promise<string> {
const caServer = new CodeAssistServer(oAuth2Client, projectId);
export async function setupUser(authClient: AuthClient): Promise<string> {
const projectId = process.env.GOOGLE_CLOUD_PROJECT;
const caServer = new CodeAssistServer(authClient, projectId);
const clientMetadata: ClientMetadata = {
ideType: 'IDE_UNSPECIFIED',
platform: 'PLATFORM_UNSPECIFIED',
pluginType: 'GEMINI',
duetProject: projectId,
};
if (process.env.GOOGLE_CLOUD_PROJECT) {
clientMetadata.duetProject = process.env.GOOGLE_CLOUD_PROJECT;
}
// TODO: Support Free Tier user without projectId.
const loadRes = await caServer.loadCodeAssist({
cloudaicompanionProject: process.env.GOOGLE_CLOUD_PROJECT,
cloudaicompanionProject: projectId,
metadata: clientMetadata,
});
@@ -39,7 +35,7 @@ export async function setupUser(
const onboardReq: OnboardUserRequest = {
tierId: onboardTier,
cloudaicompanionProject: loadRes.cloudaicompanionProject || '',
cloudaicompanionProject: loadRes.cloudaicompanionProject || projectId || '',
metadata: clientMetadata,
};
try {
@@ -49,14 +45,12 @@ export async function setupUser(
await new Promise((f) => setTimeout(f, 5000));
lroRes = await caServer.onboardUser(onboardReq);
}
return lroRes.response?.cloudaicompanionProject?.id || '';
} catch (e) {
await clearCachedCredentials();
console.log(
'\n\nError onboarding with Code Assist.\n' +
'Enterprise users must specify GOOGLE_CLOUD_PROJECT ' +
'in their environment variables or .env file.\n\n',
'Google Workspace Account (e.g. your-name@your-company.com)' +
' must specify a GOOGLE_CLOUD_PROJECT environment variable.\n\n',
);
throw e;
}