feat(openai): 新增"手动输入 Mobile RT"入口,使用 SoraClientID 刷新
在 OpenAI 平台添加独立的"手动输入 Mobile RT"选项,使用 client_id=app_LlGpXReQgckcGGUo2JrYvtJK 刷新 token,与现有 "手动输入 RT"(Codex CLI client_id)互不影响。 共享同一 UI 和批量创建逻辑,通过 clientId 参数区分。 同时修复空名称触发 ent NotEmpty() 校验导致 500 的问题。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -550,14 +550,18 @@ export async function getAntigravityDefaultModelMapping(): Promise<Record<string
|
|||||||
export async function refreshOpenAIToken(
|
export async function refreshOpenAIToken(
|
||||||
refreshToken: string,
|
refreshToken: string,
|
||||||
proxyId?: number | null,
|
proxyId?: number | null,
|
||||||
endpoint: string = '/admin/openai/refresh-token'
|
endpoint: string = '/admin/openai/refresh-token',
|
||||||
|
clientId?: string
|
||||||
): Promise<Record<string, unknown>> {
|
): Promise<Record<string, unknown>> {
|
||||||
const payload: { refresh_token: string; proxy_id?: number } = {
|
const payload: { refresh_token: string; proxy_id?: number; client_id?: string } = {
|
||||||
refresh_token: refreshToken
|
refresh_token: refreshToken
|
||||||
}
|
}
|
||||||
if (proxyId) {
|
if (proxyId) {
|
||||||
payload.proxy_id = proxyId
|
payload.proxy_id = proxyId
|
||||||
}
|
}
|
||||||
|
if (clientId) {
|
||||||
|
payload.client_id = clientId
|
||||||
|
}
|
||||||
const { data } = await apiClient.post<Record<string, unknown>>(endpoint, payload)
|
const { data } = await apiClient.post<Record<string, unknown>>(endpoint, payload)
|
||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2504,6 +2504,7 @@
|
|||||||
:allow-multiple="form.platform === 'anthropic'"
|
:allow-multiple="form.platform === 'anthropic'"
|
||||||
:show-cookie-option="form.platform === 'anthropic'"
|
:show-cookie-option="form.platform === 'anthropic'"
|
||||||
:show-refresh-token-option="form.platform === 'openai' || form.platform === 'sora' || form.platform === 'antigravity'"
|
:show-refresh-token-option="form.platform === 'openai' || form.platform === 'sora' || form.platform === 'antigravity'"
|
||||||
|
:show-mobile-refresh-token-option="form.platform === 'openai'"
|
||||||
:show-session-token-option="form.platform === 'sora'"
|
:show-session-token-option="form.platform === 'sora'"
|
||||||
:show-access-token-option="form.platform === 'sora'"
|
:show-access-token-option="form.platform === 'sora'"
|
||||||
:platform="form.platform"
|
:platform="form.platform"
|
||||||
@@ -2511,6 +2512,7 @@
|
|||||||
@generate-url="handleGenerateUrl"
|
@generate-url="handleGenerateUrl"
|
||||||
@cookie-auth="handleCookieAuth"
|
@cookie-auth="handleCookieAuth"
|
||||||
@validate-refresh-token="handleValidateRefreshToken"
|
@validate-refresh-token="handleValidateRefreshToken"
|
||||||
|
@validate-mobile-refresh-token="handleOpenAIValidateMobileRT"
|
||||||
@validate-session-token="handleValidateSessionToken"
|
@validate-session-token="handleValidateSessionToken"
|
||||||
@import-access-token="handleImportAccessToken"
|
@import-access-token="handleImportAccessToken"
|
||||||
/>
|
/>
|
||||||
@@ -4360,11 +4362,14 @@ const handleOpenAIExchange = async (authCode: string) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// OpenAI 手动 RT 批量验证和创建
|
// OpenAI 手动 RT 批量验证和创建
|
||||||
const handleOpenAIValidateRT = async (refreshTokenInput: string) => {
|
// OpenAI Mobile RT 使用的 client_id(与后端 openai.SoraClientID 一致)
|
||||||
|
const OPENAI_MOBILE_RT_CLIENT_ID = 'app_LlGpXReQgckcGGUo2JrYvtJK'
|
||||||
|
|
||||||
|
// OpenAI/Sora RT 批量验证和创建(共享逻辑)
|
||||||
|
const handleOpenAIBatchRT = async (refreshTokenInput: string, clientId?: string) => {
|
||||||
const oauthClient = activeOpenAIOAuth.value
|
const oauthClient = activeOpenAIOAuth.value
|
||||||
if (!refreshTokenInput.trim()) return
|
if (!refreshTokenInput.trim()) return
|
||||||
|
|
||||||
// Parse multiple refresh tokens (one per line)
|
|
||||||
const refreshTokens = refreshTokenInput
|
const refreshTokens = refreshTokenInput
|
||||||
.split('\n')
|
.split('\n')
|
||||||
.map((rt) => rt.trim())
|
.map((rt) => rt.trim())
|
||||||
@@ -4389,7 +4394,8 @@ const handleOpenAIValidateRT = async (refreshTokenInput: string) => {
|
|||||||
try {
|
try {
|
||||||
const tokenInfo = await oauthClient.validateRefreshToken(
|
const tokenInfo = await oauthClient.validateRefreshToken(
|
||||||
refreshTokens[i],
|
refreshTokens[i],
|
||||||
form.proxy_id
|
form.proxy_id,
|
||||||
|
clientId
|
||||||
)
|
)
|
||||||
if (!tokenInfo) {
|
if (!tokenInfo) {
|
||||||
failedCount++
|
failedCount++
|
||||||
@@ -4399,6 +4405,9 @@ const handleOpenAIValidateRT = async (refreshTokenInput: string) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const credentials = oauthClient.buildCredentials(tokenInfo)
|
const credentials = oauthClient.buildCredentials(tokenInfo)
|
||||||
|
if (clientId) {
|
||||||
|
credentials.client_id = clientId
|
||||||
|
}
|
||||||
const oauthExtra = oauthClient.buildExtraInfo(tokenInfo) as Record<string, unknown> | undefined
|
const oauthExtra = oauthClient.buildExtraInfo(tokenInfo) as Record<string, unknown> | undefined
|
||||||
const extra = buildOpenAIExtra(oauthExtra)
|
const extra = buildOpenAIExtra(oauthExtra)
|
||||||
|
|
||||||
@@ -4410,8 +4419,9 @@ const handleOpenAIValidateRT = async (refreshTokenInput: string) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate account name with index for batch
|
// Generate account name; fallback to email if name is empty (ent schema requires NotEmpty)
|
||||||
const accountName = refreshTokens.length > 1 ? `${form.name} #${i + 1}` : form.name
|
const baseName = form.name || tokenInfo.email || 'OpenAI OAuth Account'
|
||||||
|
const accountName = refreshTokens.length > 1 ? `${baseName} #${i + 1}` : baseName
|
||||||
|
|
||||||
let openaiAccountId: string | number | undefined
|
let openaiAccountId: string | number | undefined
|
||||||
|
|
||||||
@@ -4494,6 +4504,12 @@ const handleOpenAIValidateRT = async (refreshTokenInput: string) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 手动输入 RT(Codex CLI client_id,默认)
|
||||||
|
const handleOpenAIValidateRT = (rt: string) => handleOpenAIBatchRT(rt)
|
||||||
|
|
||||||
|
// 手动输入 Mobile RT(SoraClientID)
|
||||||
|
const handleOpenAIValidateMobileRT = (rt: string) => handleOpenAIBatchRT(rt, OPENAI_MOBILE_RT_CLIENT_ID)
|
||||||
|
|
||||||
// Sora 手动 ST 批量验证和创建
|
// Sora 手动 ST 批量验证和创建
|
||||||
const handleSoraValidateST = async (sessionTokenInput: string) => {
|
const handleSoraValidateST = async (sessionTokenInput: string) => {
|
||||||
const oauthClient = activeOpenAIOAuth.value
|
const oauthClient = activeOpenAIOAuth.value
|
||||||
|
|||||||
@@ -48,6 +48,17 @@
|
|||||||
t(getOAuthKey('refreshTokenAuth'))
|
t(getOAuthKey('refreshTokenAuth'))
|
||||||
}}</span>
|
}}</span>
|
||||||
</label>
|
</label>
|
||||||
|
<label v-if="showMobileRefreshTokenOption" class="flex cursor-pointer items-center gap-2">
|
||||||
|
<input
|
||||||
|
v-model="inputMethod"
|
||||||
|
type="radio"
|
||||||
|
value="mobile_refresh_token"
|
||||||
|
class="text-blue-600 focus:ring-blue-500"
|
||||||
|
/>
|
||||||
|
<span class="text-sm text-blue-900 dark:text-blue-200">{{
|
||||||
|
t('admin.accounts.oauth.openai.mobileRefreshTokenAuth', '手动输入 Mobile RT')
|
||||||
|
}}</span>
|
||||||
|
</label>
|
||||||
<label v-if="showSessionTokenOption" class="flex cursor-pointer items-center gap-2">
|
<label v-if="showSessionTokenOption" class="flex cursor-pointer items-center gap-2">
|
||||||
<input
|
<input
|
||||||
v-model="inputMethod"
|
v-model="inputMethod"
|
||||||
@@ -73,8 +84,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Refresh Token Input (OpenAI / Antigravity) -->
|
<!-- Refresh Token Input (OpenAI / Antigravity / Mobile RT) -->
|
||||||
<div v-if="inputMethod === 'refresh_token'" class="space-y-4">
|
<div v-if="inputMethod === 'refresh_token' || inputMethod === 'mobile_refresh_token'" class="space-y-4">
|
||||||
<div
|
<div
|
||||||
class="rounded-lg border border-blue-300 bg-white/80 p-4 dark:border-blue-600 dark:bg-gray-800/80"
|
class="rounded-lg border border-blue-300 bg-white/80 p-4 dark:border-blue-600 dark:bg-gray-800/80"
|
||||||
>
|
>
|
||||||
@@ -759,6 +770,7 @@ interface Props {
|
|||||||
methodLabel?: string
|
methodLabel?: string
|
||||||
showCookieOption?: boolean // Whether to show cookie auto-auth option
|
showCookieOption?: boolean // Whether to show cookie auto-auth option
|
||||||
showRefreshTokenOption?: boolean // Whether to show refresh token input option (OpenAI only)
|
showRefreshTokenOption?: boolean // Whether to show refresh token input option (OpenAI only)
|
||||||
|
showMobileRefreshTokenOption?: boolean // Whether to show mobile refresh token option (OpenAI only)
|
||||||
showSessionTokenOption?: boolean // Whether to show session token input option (Sora only)
|
showSessionTokenOption?: boolean // Whether to show session token input option (Sora only)
|
||||||
showAccessTokenOption?: boolean // Whether to show access token input option (Sora only)
|
showAccessTokenOption?: boolean // Whether to show access token input option (Sora only)
|
||||||
platform?: AccountPlatform // Platform type for different UI/text
|
platform?: AccountPlatform // Platform type for different UI/text
|
||||||
@@ -776,6 +788,7 @@ const props = withDefaults(defineProps<Props>(), {
|
|||||||
methodLabel: 'Authorization Method',
|
methodLabel: 'Authorization Method',
|
||||||
showCookieOption: true,
|
showCookieOption: true,
|
||||||
showRefreshTokenOption: false,
|
showRefreshTokenOption: false,
|
||||||
|
showMobileRefreshTokenOption: false,
|
||||||
showSessionTokenOption: false,
|
showSessionTokenOption: false,
|
||||||
showAccessTokenOption: false,
|
showAccessTokenOption: false,
|
||||||
platform: 'anthropic',
|
platform: 'anthropic',
|
||||||
@@ -787,6 +800,7 @@ const emit = defineEmits<{
|
|||||||
'exchange-code': [code: string]
|
'exchange-code': [code: string]
|
||||||
'cookie-auth': [sessionKey: string]
|
'cookie-auth': [sessionKey: string]
|
||||||
'validate-refresh-token': [refreshToken: string]
|
'validate-refresh-token': [refreshToken: string]
|
||||||
|
'validate-mobile-refresh-token': [refreshToken: string]
|
||||||
'validate-session-token': [sessionToken: string]
|
'validate-session-token': [sessionToken: string]
|
||||||
'import-access-token': [accessToken: string]
|
'import-access-token': [accessToken: string]
|
||||||
'update:inputMethod': [method: AuthInputMethod]
|
'update:inputMethod': [method: AuthInputMethod]
|
||||||
@@ -834,7 +848,7 @@ const oauthState = ref('')
|
|||||||
const projectId = ref('')
|
const projectId = ref('')
|
||||||
|
|
||||||
// Computed: show method selection when either cookie or refresh token option is enabled
|
// Computed: show method selection when either cookie or refresh token option is enabled
|
||||||
const showMethodSelection = computed(() => props.showCookieOption || props.showRefreshTokenOption || props.showSessionTokenOption || props.showAccessTokenOption)
|
const showMethodSelection = computed(() => props.showCookieOption || props.showRefreshTokenOption || props.showMobileRefreshTokenOption || props.showSessionTokenOption || props.showAccessTokenOption)
|
||||||
|
|
||||||
// Clipboard
|
// Clipboard
|
||||||
const { copied, copyToClipboard } = useClipboard()
|
const { copied, copyToClipboard } = useClipboard()
|
||||||
@@ -945,9 +959,13 @@ const handleCookieAuth = () => {
|
|||||||
|
|
||||||
const handleValidateRefreshToken = () => {
|
const handleValidateRefreshToken = () => {
|
||||||
if (refreshTokenInput.value.trim()) {
|
if (refreshTokenInput.value.trim()) {
|
||||||
|
if (inputMethod.value === 'mobile_refresh_token') {
|
||||||
|
emit('validate-mobile-refresh-token', refreshTokenInput.value.trim())
|
||||||
|
} else {
|
||||||
emit('validate-refresh-token', refreshTokenInput.value.trim())
|
emit('validate-refresh-token', refreshTokenInput.value.trim())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const handleValidateSessionToken = () => {
|
const handleValidateSessionToken = () => {
|
||||||
if (parsedSessionTokenCount.value > 0) {
|
if (parsedSessionTokenCount.value > 0) {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { useAppStore } from '@/stores/app'
|
|||||||
import { adminAPI } from '@/api/admin'
|
import { adminAPI } from '@/api/admin'
|
||||||
|
|
||||||
export type AddMethod = 'oauth' | 'setup-token'
|
export type AddMethod = 'oauth' | 'setup-token'
|
||||||
export type AuthInputMethod = 'manual' | 'cookie' | 'refresh_token' | 'session_token' | 'access_token'
|
export type AuthInputMethod = 'manual' | 'cookie' | 'refresh_token' | 'mobile_refresh_token' | 'session_token' | 'access_token'
|
||||||
|
|
||||||
export interface OAuthState {
|
export interface OAuthState {
|
||||||
authUrl: string
|
authUrl: string
|
||||||
|
|||||||
@@ -126,9 +126,11 @@ export function useOpenAIOAuth(options?: UseOpenAIOAuthOptions) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Validate refresh token and get full token info
|
// Validate refresh token and get full token info
|
||||||
|
// clientId: 指定 OAuth client_id(用于第三方渠道获取的 RT,如 app_LlGpXReQgckcGGUo2JrYvtJK)
|
||||||
const validateRefreshToken = async (
|
const validateRefreshToken = async (
|
||||||
refreshToken: string,
|
refreshToken: string,
|
||||||
proxyId?: number | null
|
proxyId?: number | null,
|
||||||
|
clientId?: string
|
||||||
): Promise<OpenAITokenInfo | null> => {
|
): Promise<OpenAITokenInfo | null> => {
|
||||||
if (!refreshToken.trim()) {
|
if (!refreshToken.trim()) {
|
||||||
error.value = 'Missing refresh token'
|
error.value = 'Missing refresh token'
|
||||||
@@ -143,11 +145,12 @@ export function useOpenAIOAuth(options?: UseOpenAIOAuthOptions) {
|
|||||||
const tokenInfo = await adminAPI.accounts.refreshOpenAIToken(
|
const tokenInfo = await adminAPI.accounts.refreshOpenAIToken(
|
||||||
refreshToken.trim(),
|
refreshToken.trim(),
|
||||||
proxyId,
|
proxyId,
|
||||||
`${endpointPrefix}/refresh-token`
|
`${endpointPrefix}/refresh-token`,
|
||||||
|
clientId
|
||||||
)
|
)
|
||||||
return tokenInfo as OpenAITokenInfo
|
return tokenInfo as OpenAITokenInfo
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
error.value = err.response?.data?.detail || 'Failed to validate refresh token'
|
error.value = err.response?.data?.detail || err.message || 'Failed to validate refresh token'
|
||||||
appStore.showError(error.value)
|
appStore.showError(error.value)
|
||||||
return null
|
return null
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
Reference in New Issue
Block a user