Upload 10 files

app.py

@@ -226,16 +226,25 @@ def _oidc_headers() -> Dict[str, str]:
 # 认证中间件
 # ------------------------------------------------------------------------------
 
-async def auth_middleware(authorization: Optional[str] = Header(default=None)) -> Dict[str, Any]:
+async def auth_middleware(
+    authorization: Optional[str] = Header(default=None),
+    x_api_key: Optional[str] = Header(default=None, alias="x-api-key")
+) -> Dict[str, Any]:
     """
-    认证中间件: 解析 Bearer token 并返回账户信息
-    Bearer token 格式: clientId:clientSecret:refreshToken
+    认证中间件: 支持 OpenAI Bearer token 和 Claude x-api-key
+    Token 格式: clientId:clientSecret:refreshToken
     """
-    if not authorization or not authorization.startswith("Bearer "):
-        raise HTTPException(status_code=401, detail="Missing or invalid Authorization header")
+    # 优先使用 x-api-key (Claude 格式)
+    token = x_api_key if x_api_key else None
 
-    bearer_token = authorization[7:]  # 移除 "Bearer " 前缀
-    token_hash = _sha256(bearer_token)
+    # 如果没有 x-api-key，尝试从 Authorization header 获取 (OpenAI 格式)
+    if not token and authorization and authorization.startswith("Bearer "):
+        token = authorization[7:]
+
+    if not token:
+        raise HTTPException(status_code=401, detail="Missing authentication. Provide Authorization header or x-api-key")
+
+    token_hash = _sha256(token)
 
     # 检查缓存
     if token_hash in TOKEN_MAP:
@@ -246,8 +255,8 @@ async def auth_middleware(authorization: Optional[str] = Header(default=None)) -
             "refreshToken": TOKEN_MAP[token_hash]["refreshToken"],
         }
 
-    # 解析 bearer token
-    client_id, client_secret, refresh_token = _parse_bearer_token(bearer_token)
+    # 解析 token
+    client_id, client_secret, refresh_token = _parse_bearer_token(token)
 
     if not client_id or not client_secret or not refresh_token:
         raise HTTPException(status_code=401, detail="Invalid token format. Expected: clientId:clientSecret:refreshToken")
@@ -277,8 +286,11 @@ async def auth_middleware(authorization: Optional[str] = Header(default=None)) -
 # Dependencies
 # ------------------------------------------------------------------------------
 
-async def require_account(authorization: Optional[str] = Header(default=None)) -> Dict[str, Any]:
-    return await auth_middleware(authorization)
+async def require_account(
+    authorization: Optional[str] = Header(default=None),
+    x_api_key: Optional[str] = Header(default=None, alias="x-api-key")
+) -> Dict[str, Any]:
+    return await auth_middleware(authorization, x_api_key)
 
 # ------------------------------------------------------------------------------
 # Root endpoint