Hermes/FlowPilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: sync dev and finalize sub2api localhost callback flow

Browse Source
This commit is contained in:
hisen666
2026-04-12 16:30:28 +08:00
parent 601958ae97 3e2457f7c7
commit 843d9c6324
11 changed files with 879 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/sub2api-panel.js
+3 -3
View File
@@ -42,8 +42,8 @@ function getSub2ApiOrigin(payload = {}) {
}
}
function normalizeRedirectUri(rawUrl) {
const input = (rawUrl || '').trim() || SUB2API_DEFAULT_REDIRECT_URI;
function normalizeRedirectUri() {
const input = SUB2API_DEFAULT_REDIRECT_URI;
const withProtocol = /^https?:\/\//i.test(input) ? input : `http://${input}`;
const parsed = new URL(withProtocol);
if (!parsed.pathname || parsed.pathname === '/') {
@@ -288,7 +288,7 @@ function openAccountsPageSoon(origin) {
}
async function step1_generateOpenAiAuthUrl(payload = {}) {
const redirectUri = normalizeRedirectUri(payload.sub2apiRedirectUri);
const redirectUri = normalizeRedirectUri();
const groupName = (payload.sub2apiGroupName || SUB2API_DEFAULT_GROUP_NAME).trim() || SUB2API_DEFAULT_GROUP_NAME;
const { origin, token } = await loginSub2Api(payload);
content/vps-panel.js
+1 -1
View File
@@ -169,7 +169,7 @@ function isLocalhostOAuthCallbackUrl(rawUrl) {
if (!parsed) return false;
if (!['http:', 'https:'].includes(parsed.protocol)) return false;
if (!['localhost', '127.0.0.1'].includes(parsed.hostname)) return false;
if (parsed.pathname !== '/auth/callback') return false;
if (!['/auth/callback', '/codex/callback'].includes(parsed.pathname)) return false;
const code = (parsed.searchParams.get('code') || '').trim();
const state = (parsed.searchParams.get('state') || '').trim();