admin-valentin/AIClient-2-API
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(openai-kiro): 移除未使用的配置项并优化凭证加载逻辑

Browse source 
移除已注释掉的未使用配置项，简化代码结构
优化凭证加载逻辑，跳过特定token文件并添加注释说明
This commit is contained in:
hex2077 2025-07-27 23:47:53 +08:00
parent e24e077b24
commit 31d8dcf23d
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/openai/openai-kiro.js
View file

@ -67,15 +67,15 @@ export class KiroApiService {
this.config = config; this.config = config;
this.credPath = config.KIRO_OAUTH_CREDS_DIR_PATH || path.join(os.homedir(), ".aws", "sso", "cache"); this.credPath = config.KIRO_OAUTH_CREDS_DIR_PATH || path.join(os.homedir(), ".aws", "sso", "cache");
this.credsBase64 = config.KIRO_OAUTH_CREDS_BASE64; this.credsBase64 = config.KIRO_OAUTH_CREDS_BASE64;
this.accessToken = config.KIRO_ACCESS_TOKEN; // this.accessToken = config.KIRO_ACCESS_TOKEN;
this.refreshToken = config.KIRO_REFRESH_TOKEN; // this.refreshToken = config.KIRO_REFRESH_TOKEN;
this.clientId = config.KIRO_CLIENT_ID; // this.clientId = config.KIRO_CLIENT_ID;
this.clientSecret = config.KIRO_CLIENT_SECRET; // this.clientSecret = config.KIRO_CLIENT_SECRET;
this.authMethod = KIRO_CONSTANTS.AUTH_METHOD_SOCIAL; // this.authMethod = KIRO_CONSTANTS.AUTH_METHOD_SOCIAL;
this.refreshUrl = KIRO_CONSTANTS.REFRESH_URL; // this.refreshUrl = KIRO_CONSTANTS.REFRESH_URL;
this.refreshIDCUrl = KIRO_CONSTANTS.REFRESH_IDC_URL; // this.refreshIDCUrl = KIRO_CONSTANTS.REFRESH_IDC_URL;
this.baseUrl = KIRO_CONSTANTS.BASE_URL; // this.baseUrl = KIRO_CONSTANTS.BASE_URL;
this.amazonQUrl = KIRO_CONSTANTS.AMAZON_Q_URL; // this.amazonQUrl = KIRO_CONSTANTS.AMAZON_Q_URL;
// Add kiro-oauth-creds-base64 and kiro-oauth-creds-file to config // Add kiro-oauth-creds-base64 and kiro-oauth-creds-file to config
if (config.KIRO_OAUTH_CREDS_BASE64) { if (config.KIRO_OAUTH_CREDS_BASE64) {
@ -186,23 +186,21 @@ async initializeAuth(forceRefresh = false) {
} }
// Priority 3: Load from default directory if no specific file path and no token file credentials // Priority 3: Load from default directory if no specific file path and no token file credentials
if (Object.keys(mergedCredentials).length === 0) { const dirPath = this.credPath;
const dirPath = this.credPath; console.debug(`[Kiro Auth] Attempting to load credentials from directory: ${dirPath}`);
console.debug(`[Kiro Auth] Attempting to load credentials from directory: ${dirPath}`); const files = await fs.readdir(dirPath);
const files = await fs.readdir(dirPath); for (const file of files) {
if (file.endsWith('.json') && file !== KIRO_AUTH_TOKEN_FILE) {
for (const file of files) { const filePath = path.join(dirPath, file);
if (file.endsWith('.json')) { const credentials = await loadCredentialsFromFile(filePath);
const filePath = path.join(dirPath, file); if (credentials) {
const credentials = await loadCredentialsFromFile(filePath); Object.assign(mergedCredentials, credentials);
if (credentials) { console.debug(`[Kiro Auth] Loaded credentials from ${file}`);
Object.assign(mergedCredentials, credentials);
console.debug(`[Kiro Auth] Loaded credentials from ${file}`);
}
} }
} }
} }
// console.log('[Kiro Auth] Merged credentials:', mergedCredentials);
// Apply loaded credentials, prioritizing existing values if they are not null/undefined // Apply loaded credentials, prioritizing existing values if they are not null/undefined
this.accessToken = this.accessToken || mergedCredentials.accessToken; this.accessToken = this.accessToken || mergedCredentials.accessToken;
this.refreshToken = this.refreshToken || mergedCredentials.refreshToken; this.refreshToken = this.refreshToken || mergedCredentials.refreshToken;