feat: 更新 Gemini OAuth 流程支持新的授权方式

- 使用 codeassist.google.com 作为新的回调地址
- 实现 PKCE 认证流程增强安全性
- 更新前端授权流程指引
- 简化授权码输入流程

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
千羽
2025-08-04 00:59:57 +09:00
committed by shaw
parent 7b54f187ee
commit a80b36896d
3 changed files with 63 additions and 38 deletions

View File

@@ -1327,19 +1327,20 @@ router.post('/gemini-accounts/generate-auth-url', authenticateAdmin, async (req,
try {
const { state } = req.body;
// 使用固定的 localhost:45462 作为回调地址
const redirectUri = 'http://localhost:45462';
// 使用新的 codeassist.google.com 回调地址
const redirectUri = 'https://codeassist.google.com/authcode';
logger.info(`Generating Gemini OAuth URL with redirect_uri: ${redirectUri}`);
const { authUrl, state: authState } = await geminiAccountService.generateAuthUrl(state, redirectUri);
const { authUrl, state: authState, codeVerifier, redirectUri: finalRedirectUri } = await geminiAccountService.generateAuthUrl(state, redirectUri);
// 创建 OAuth 会话
// 创建 OAuth 会话,包含 codeVerifier
const sessionId = authState;
await redis.setOAuthSession(sessionId, {
state: authState,
type: 'gemini',
redirectUri: redirectUri, // 保存固定的 redirect_uri 用于 token 交换
redirectUri: finalRedirectUri,
codeVerifier: codeVerifier, // 保存 PKCE code verifier
createdAt: new Date().toISOString()
});
@@ -1389,11 +1390,20 @@ router.post('/gemini-accounts/exchange-code', authenticateAdmin, async (req, res
return res.status(400).json({ error: 'Authorization code is required' });
}
// 使用固定的 localhost:45462 作为 redirect_uri
const redirectUri = 'http://localhost:45462';
logger.info(`Using fixed redirect_uri: ${redirectUri}`);
let redirectUri = 'https://codeassist.google.com/authcode';
let codeVerifier = null;
const tokens = await geminiAccountService.exchangeCodeForTokens(code, redirectUri);
// 如果提供了 sessionId从 OAuth 会话中获取信息
if (sessionId) {
const sessionData = await redis.getOAuthSession(sessionId);
if (sessionData) {
redirectUri = sessionData.redirectUri || redirectUri;
codeVerifier = sessionData.codeVerifier;
logger.info(`Using session redirect_uri: ${redirectUri}, has codeVerifier: ${!!codeVerifier}`);
}
}
const tokens = await geminiAccountService.exchangeCodeForTokens(code, redirectUri, codeVerifier);
// 清理 OAuth 会话
if (sessionId) {
@@ -1731,7 +1741,7 @@ router.get('/model-stats', authenticateAdmin, async (req, res) => {
searchPatterns = [pattern];
}
logger.info(`📊 Searching patterns:`, searchPatterns);
logger.info('📊 Searching patterns:', searchPatterns);
// 获取所有匹配的keys
const allKeys = [];

View File

@@ -77,19 +77,31 @@ function createOAuth2Client(redirectUri = null) {
);
}
// 生成授权 URL
// 生成授权 URL (支持 PKCE)
async function generateAuthUrl(state = null, redirectUri = null) {
const oAuth2Client = createOAuth2Client(redirectUri);
// 使用新的 redirect URI
const finalRedirectUri = redirectUri || 'https://codeassist.google.com/authcode';
const oAuth2Client = createOAuth2Client(finalRedirectUri);
// 生成 PKCE code verifier
const codeVerifier = await oAuth2Client.generateCodeVerifierAsync();
const stateValue = state || crypto.randomBytes(32).toString('hex');
const authUrl = oAuth2Client.generateAuthUrl({
redirect_uri: finalRedirectUri,
access_type: 'offline',
scope: OAUTH_SCOPES,
prompt: 'select_account',
state: state || uuidv4()
code_challenge_method: 'S256',
code_challenge: codeVerifier.codeChallenge,
state: stateValue,
prompt: 'select_account'
});
return {
authUrl,
state: state || authUrl.split('state=')[1].split('&')[0]
state: stateValue,
codeVerifier: codeVerifier.codeVerifier,
redirectUri: finalRedirectUri
};
}
@@ -145,12 +157,22 @@ async function pollAuthorizationStatus(sessionId, maxAttempts = 60, interval = 2
};
}
// 交换授权码获取 tokens
async function exchangeCodeForTokens(code, redirectUri = null) {
// 交换授权码获取 tokens (支持 PKCE)
async function exchangeCodeForTokens(code, redirectUri = null, codeVerifier = null) {
const oAuth2Client = createOAuth2Client(redirectUri);
try {
const { tokens } = await oAuth2Client.getToken(code);
const tokenParams = {
code: code,
redirect_uri: redirectUri
};
// 如果提供了 codeVerifier添加到参数中
if (codeVerifier) {
tokenParams.codeVerifier = codeVerifier;
}
const { tokens } = await oAuth2Client.getToken(tokenParams);
// 转换为兼容格式
return {