Merge pull request #3754 from SillyTavern/fix-openrouter-oauth OpenRouter: Fix OAuth flow with enabled accounts

75be96e1f7a2fd89c99ad3e2977d2ff2645afa41

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/secrets.js+6 -3 Viewed

+}
 function authorizeOpenRouter() {
     const openRouterUrlredirectUrl = `https:new URL('/callback/openrouter', window.ai/auth?callback_url=${encodeURIComponent(location.origin)}`;
 +    const openRouterUrl = `https://openrouter.ai/auth?callback_url=${encodeURIComponent(redirectUrl.toString())}`;
     location.href = openRouterUrl;
+}
 async function checkOpenRouterAuth() {
     const params = new URLSearchParams(location.search);
     ifconst (source = params.hasget('codesource')) {;
 -        const code = params.get('code');
 +    if (source === 'openrouter') {
 +        const query = new URLSearchParams(params.get('query'));
 +        const code = query.get('code');
         try {
             const response = await fetch('https://openrouter.ai/api/v1/auth/keys', {
                 method: 'POST',

server.js+12 -1 Viewed

 app.use(cookieSession({
     name: getCookieSessionName(),
     sameSite: 'strictlax',
     httpOnly: true,
     maxAge: getSessionCookieAge(),
     secret: getCookieSecret(globalThis.DATA_ROOT),

     return response.sendFile('index.html', { root: path.join(process.cwd(), 'public') });
 });
 +// Callback endpoint for OAuth PKCE flows (e.g. OpenRouter)
 +app.get('/callback/:source?', (request, response) => {
 +    const source = request.params.source;
 +    const query = request.url.split('?')[1];
 +    const searchParams = new URLSearchParams();
 +    source && searchParams.set('source', source);
 +    query && searchParams.set('query', query);
 +    const path = `/?${searchParams.toString()}`;
 +    return response.redirect(307, path);
 +});
++
 // Host login page
 app.get('/login', loginPageMiddleware);