@terminai/a2a-server 0.23.0 → 0.25.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/a2a-server.mjs +5148 -3191
- package/dist/src/auth/llmAuthManager.d.ts +20 -2
- package/dist/src/auth/llmAuthManager.js +345 -4
- package/dist/src/auth/llmAuthManager.js.map +1 -1
- package/dist/src/auth/llmAuthManager.test.js +53 -2
- package/dist/src/auth/llmAuthManager.test.js.map +1 -1
- package/dist/src/config/config.js +48 -6
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.d.ts +7 -0
- package/dist/src/config/config.test.js +61 -0
- package/dist/src/config/config.test.js.map +1 -0
- package/dist/src/http/authRoutes.test.js +40 -1
- package/dist/src/http/authRoutes.test.js.map +1 -1
- package/dist/src/http/routes/auth.js +110 -2
- package/dist/src/http/routes/auth.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -42,6 +42,38 @@ function settingsToProviderConfig(settings) {
|
|
|
42
42
|
logger.warn('[Config] llm.provider is openai_compatible but baseUrl/model missing, falling back to Gemini');
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
+
else if (settings.llm?.provider === 'openai_chatgpt_oauth') {
|
|
46
|
+
const s = settings.llm.openaiChatgptOauth;
|
|
47
|
+
const model = (s?.model ?? '').trim();
|
|
48
|
+
const baseUrl = (s?.baseUrl ?? 'https://chatgpt.com/backend-api/codex')
|
|
49
|
+
.trim()
|
|
50
|
+
.replace(/\/+$/, '');
|
|
51
|
+
if (model.length > 0) {
|
|
52
|
+
providerConfig = {
|
|
53
|
+
provider: LlmProviderId.OPENAI_CHATGPT_OAUTH,
|
|
54
|
+
baseUrl,
|
|
55
|
+
model,
|
|
56
|
+
internalModel: typeof s?.internalModel === 'string' && s.internalModel.trim().length
|
|
57
|
+
? s.internalModel.trim()
|
|
58
|
+
: undefined,
|
|
59
|
+
headers: (() => {
|
|
60
|
+
const raw = settings.llm?.headers;
|
|
61
|
+
if (!raw || typeof raw !== 'object')
|
|
62
|
+
return undefined;
|
|
63
|
+
const headers = {};
|
|
64
|
+
for (const [k, v] of Object.entries(raw)) {
|
|
65
|
+
if (typeof v === 'string')
|
|
66
|
+
headers[k] = v;
|
|
67
|
+
}
|
|
68
|
+
return Object.keys(headers).length > 0 ? headers : undefined;
|
|
69
|
+
})(),
|
|
70
|
+
};
|
|
71
|
+
resolvedModel = model;
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
logger.warn('[Config] llm.provider is openai_chatgpt_oauth but model missing, falling back to Gemini');
|
|
75
|
+
}
|
|
76
|
+
}
|
|
45
77
|
else if (settings.llm?.provider === 'anthropic') {
|
|
46
78
|
providerConfig = { provider: LlmProviderId.ANTHROPIC };
|
|
47
79
|
}
|
|
@@ -134,18 +166,28 @@ export async function loadConfig(loadedSettings, extensionLoader, taskId, target
|
|
|
134
166
|
}
|
|
135
167
|
else {
|
|
136
168
|
// Task 10: Respect settings.security.auth.selectedType
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
await config.refreshAuth(
|
|
169
|
+
// Provider-first: for non-Google providers, choose the deterministic auth type.
|
|
170
|
+
const provider = config.getProviderConfig().provider;
|
|
171
|
+
if (provider === LlmProviderId.OPENAI_COMPATIBLE) {
|
|
172
|
+
await config.refreshAuth(AuthType.USE_OPENAI_COMPATIBLE);
|
|
173
|
+
}
|
|
174
|
+
else if (provider === LlmProviderId.OPENAI_CHATGPT_OAUTH) {
|
|
175
|
+
await config.refreshAuth(AuthType.USE_OPENAI_CHATGPT_OAUTH);
|
|
141
176
|
}
|
|
142
177
|
else if (process.env['GEMINI_API_KEY']) {
|
|
143
178
|
logger.info('[Config] Using Gemini API Key (Implicit)');
|
|
144
179
|
await config.refreshAuth(AuthType.USE_GEMINI);
|
|
145
180
|
}
|
|
146
181
|
else {
|
|
147
|
-
|
|
148
|
-
|
|
182
|
+
const selectedAuthType = settings.security?.auth?.selectedType;
|
|
183
|
+
if (selectedAuthType) {
|
|
184
|
+
logger.info(`[Config] Using configured auth type: ${selectedAuthType}`);
|
|
185
|
+
await config.refreshAuth(selectedAuthType);
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
logger.info('[Config] Using OAuth (LOGIN_WITH_GOOGLE) (Default)');
|
|
189
|
+
await config.refreshAuth(AuthType.LOGIN_WITH_GOOGLE);
|
|
190
|
+
}
|
|
149
191
|
}
|
|
150
192
|
}
|
|
151
193
|
return config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* Portions Copyright 2025 TerminaI Authors
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
8
|
+
const refreshAuthSpy = vi.hoisted(() => vi.fn());
|
|
9
|
+
vi.mock('@terminai/core', async (importOriginal) => {
|
|
10
|
+
const actual = await importOriginal();
|
|
11
|
+
class MockConfig {
|
|
12
|
+
params;
|
|
13
|
+
constructor(params) {
|
|
14
|
+
this.params = params;
|
|
15
|
+
}
|
|
16
|
+
async initialize() { }
|
|
17
|
+
getProviderConfig() {
|
|
18
|
+
return this.params['providerConfig'];
|
|
19
|
+
}
|
|
20
|
+
getGeminiMdFileCount() {
|
|
21
|
+
return 0;
|
|
22
|
+
}
|
|
23
|
+
async refreshAuth(authType) {
|
|
24
|
+
refreshAuthSpy(authType);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return {
|
|
28
|
+
...actual,
|
|
29
|
+
Config: MockConfig,
|
|
30
|
+
FileDiscoveryService: class {
|
|
31
|
+
},
|
|
32
|
+
loadServerHierarchicalMemory: vi
|
|
33
|
+
.fn()
|
|
34
|
+
.mockResolvedValue({ memoryContent: '', fileCount: 0 }),
|
|
35
|
+
startupProfiler: { flush: vi.fn() },
|
|
36
|
+
};
|
|
37
|
+
});
|
|
38
|
+
describe('loadConfig provider auth selection', () => {
|
|
39
|
+
beforeEach(() => {
|
|
40
|
+
refreshAuthSpy.mockReset();
|
|
41
|
+
delete process.env['GEMINI_API_KEY'];
|
|
42
|
+
delete process.env['USE_CCPA'];
|
|
43
|
+
});
|
|
44
|
+
it('uses USE_OPENAI_CHATGPT_OAUTH when llm.provider is openai_chatgpt_oauth', async () => {
|
|
45
|
+
const { AuthType, LlmProviderId } = await import('@terminai/core');
|
|
46
|
+
const { loadConfig } = await import('./config.js');
|
|
47
|
+
const loadedSettings = {
|
|
48
|
+
merged: {
|
|
49
|
+
llm: {
|
|
50
|
+
provider: 'openai_chatgpt_oauth',
|
|
51
|
+
openaiChatgptOauth: { model: 'gpt-5.2-codex' },
|
|
52
|
+
},
|
|
53
|
+
security: { auth: {} },
|
|
54
|
+
},
|
|
55
|
+
};
|
|
56
|
+
const cfg = await loadConfig(loadedSettings, {}, 'a2a-server', process.cwd());
|
|
57
|
+
expect(cfg.getProviderConfig().provider).toBe(LlmProviderId.OPENAI_CHATGPT_OAUTH);
|
|
58
|
+
expect(refreshAuthSpy).toHaveBeenCalledWith(AuthType.USE_OPENAI_CHATGPT_OAUTH);
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
//# sourceMappingURL=config.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../src/config/config.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAG9D,MAAM,cAAc,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAEjD,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACjD,MAAM,MAAM,GAAG,MAAM,cAAc,EAAmC,CAAC;IAEvE,MAAM,UAAU;QACe;QAA7B,YAA6B,MAA+B;YAA/B,WAAM,GAAN,MAAM,CAAyB;QAAG,CAAC;QAEhE,KAAK,CAAC,UAAU,KAAmB,CAAC;QAEpC,iBAAiB;YACf,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACvC,CAAC;QAED,oBAAoB;YAClB,OAAO,CAAC,CAAC;QACX,CAAC;QAED,KAAK,CAAC,WAAW,CAAC,QAAiB;YACjC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC3B,CAAC;KACF;IAED,OAAO;QACL,GAAG,MAAM;QACT,MAAM,EAAE,UAAU;QAClB,oBAAoB,EAAE;SAAQ;QAC9B,4BAA4B,EAAE,EAAE;aAC7B,EAAE,EAAE;aACJ,iBAAiB,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;QACzD,eAAe,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;KACpC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAClD,UAAU,CAAC,GAAG,EAAE;QACd,cAAc,CAAC,SAAS,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACrC,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;QACvF,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACnE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QAEnD,MAAM,cAAc,GAAG;YACrB,MAAM,EAAE;gBACN,GAAG,EAAE;oBACH,QAAQ,EAAE,sBAAsB;oBAChC,kBAAkB,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE;iBAC/C;gBACD,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;aACvB;SAC2B,CAAC;QAE/B,MAAM,GAAG,GAAG,MAAM,UAAU,CAC1B,cAAc,EACd,EAAyD,EACzD,YAAY,EACZ,OAAO,CAAC,GAAG,EAAE,CACd,CAAC;QAEF,MAAM,CAEF,GACD,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAC/B,CAAC,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;QAC3C,MAAM,CAAC,cAAc,CAAC,CAAC,oBAAoB,CACzC,QAAQ,CAAC,wBAAwB,CAClC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import express from 'express';
|
|
8
8
|
import request from 'supertest';
|
|
9
|
-
import { describe, expect, it, vi, beforeEach } from 'vitest';
|
|
9
|
+
import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest';
|
|
10
10
|
import { AuthType } from '@terminai/core';
|
|
11
11
|
import { AuthConflictError, } from '../auth/llmAuthManager.js';
|
|
12
12
|
import { createAuthRouter } from './routes/auth.js';
|
|
@@ -22,12 +22,19 @@ describe('Auth routes contract (Task 33)', () => {
|
|
|
22
22
|
cancelGeminiOAuth: vi.fn(),
|
|
23
23
|
useGeminiVertex: vi.fn(),
|
|
24
24
|
clearGeminiAuth: vi.fn(),
|
|
25
|
+
startOpenAIOAuth: vi.fn(),
|
|
26
|
+
completeOpenAIOAuth: vi.fn(),
|
|
27
|
+
cancelOpenAIOAuth: vi.fn(),
|
|
28
|
+
clearOpenAIAuth: vi.fn(),
|
|
25
29
|
applyProviderSwitch: vi.fn(),
|
|
26
30
|
};
|
|
27
31
|
app = express();
|
|
28
32
|
app.use(express.json());
|
|
29
33
|
app.use('/auth', createAuthRouter(manager));
|
|
30
34
|
});
|
|
35
|
+
afterEach(() => {
|
|
36
|
+
vi.unstubAllEnvs();
|
|
37
|
+
});
|
|
31
38
|
describe('GET /auth/status', () => {
|
|
32
39
|
it('returns status/authType/message/errorCode shape', async () => {
|
|
33
40
|
manager.getStatus = vi.fn().mockResolvedValue({
|
|
@@ -104,6 +111,13 @@ describe('Auth routes contract (Task 33)', () => {
|
|
|
104
111
|
authType: AuthType.USE_OPENAI_COMPATIBLE,
|
|
105
112
|
});
|
|
106
113
|
});
|
|
114
|
+
it('validates ChatGPT OAuth provider requires model', async () => {
|
|
115
|
+
await request(app)
|
|
116
|
+
.post('/auth/provider')
|
|
117
|
+
.send({ provider: 'openai_chatgpt_oauth' })
|
|
118
|
+
.expect(400);
|
|
119
|
+
expect(manager.applyProviderSwitch).not.toHaveBeenCalled();
|
|
120
|
+
});
|
|
107
121
|
});
|
|
108
122
|
describe('POST /auth/gemini/api-key', () => {
|
|
109
123
|
it('validates body and returns 400 on empty apiKey', async () => {
|
|
@@ -158,6 +172,31 @@ describe('Auth routes contract (Task 33)', () => {
|
|
|
158
172
|
});
|
|
159
173
|
});
|
|
160
174
|
});
|
|
175
|
+
describe('POST /auth/openai/oauth/start', () => {
|
|
176
|
+
it('returns authUrl on successful start', async () => {
|
|
177
|
+
manager.startOpenAIOAuth = vi.fn().mockResolvedValue({
|
|
178
|
+
authUrl: 'https://auth.openai.com/oauth/authorize?...',
|
|
179
|
+
});
|
|
180
|
+
const res = await request(app)
|
|
181
|
+
.post('/auth/openai/oauth/start')
|
|
182
|
+
.send({})
|
|
183
|
+
.expect(200);
|
|
184
|
+
expect(res.body).toEqual({
|
|
185
|
+
authUrl: 'https://auth.openai.com/oauth/authorize?...',
|
|
186
|
+
});
|
|
187
|
+
});
|
|
188
|
+
it('returns 403 when ChatGPT OAuth provider is disabled by env var', async () => {
|
|
189
|
+
vi.stubEnv('TERMINAI_DISABLE_OPENAI_CHATGPT_OAUTH', 'true');
|
|
190
|
+
const res = await request(app)
|
|
191
|
+
.post('/auth/openai/oauth/start')
|
|
192
|
+
.send({})
|
|
193
|
+
.expect(403);
|
|
194
|
+
expect(res.body).toEqual({
|
|
195
|
+
error: 'ChatGPT OAuth provider is disabled by TERMINAI_DISABLE_OPENAI_CHATGPT_OAUTH. Use openai_compatible instead.',
|
|
196
|
+
});
|
|
197
|
+
expect(manager.startOpenAIOAuth).not.toHaveBeenCalled();
|
|
198
|
+
});
|
|
199
|
+
});
|
|
161
200
|
describe('POST /auth/gemini/oauth/cancel', () => {
|
|
162
201
|
it('cancels OAuth and returns status', async () => {
|
|
163
202
|
manager.cancelGeminiOAuth = vi.fn().mockResolvedValue({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authRoutes.test.js","sourceRoot":"","sources":["../../../src/http/authRoutes.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"authRoutes.test.js","sourceRoot":"","sources":["../../../src/http/authRoutes.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,16 @@ import { AuthConflictError } from '../../auth/llmAuthManager.js';
|
|
|
9
9
|
import { logger } from '../../utils/logger.js';
|
|
10
10
|
export function createAuthRouter(authManager) {
|
|
11
11
|
const router = Router();
|
|
12
|
+
const isOpenAiChatGptOauthDisabled = () => {
|
|
13
|
+
const raw = process.env['TERMINAI_DISABLE_OPENAI_CHATGPT_OAUTH'];
|
|
14
|
+
if (raw === undefined)
|
|
15
|
+
return false;
|
|
16
|
+
const normalized = raw.trim().toLowerCase();
|
|
17
|
+
return (normalized === '1' ||
|
|
18
|
+
normalized === 'true' ||
|
|
19
|
+
normalized === 'yes' ||
|
|
20
|
+
normalized === 'on');
|
|
21
|
+
};
|
|
12
22
|
// Task 12: GET /auth/status
|
|
13
23
|
router.get('/status', (req, res) => {
|
|
14
24
|
void (async () => {
|
|
@@ -17,6 +27,7 @@ export function createAuthRouter(authManager) {
|
|
|
17
27
|
res.json({
|
|
18
28
|
status: result.status,
|
|
19
29
|
authType: result.authType ?? null,
|
|
30
|
+
...(result.provider ? { provider: result.provider } : {}),
|
|
20
31
|
...(result.message ? { message: result.message } : {}),
|
|
21
32
|
...(result.errorCode ? { errorCode: result.errorCode } : {}),
|
|
22
33
|
});
|
|
@@ -33,9 +44,10 @@ export function createAuthRouter(authManager) {
|
|
|
33
44
|
try {
|
|
34
45
|
const body = req.body;
|
|
35
46
|
if (body.provider !== 'gemini' &&
|
|
36
|
-
body.provider !== 'openai_compatible'
|
|
47
|
+
body.provider !== 'openai_compatible' &&
|
|
48
|
+
body.provider !== 'openai_chatgpt_oauth') {
|
|
37
49
|
return res.status(400).json({
|
|
38
|
-
error: "Invalid provider. Must be 'gemini' or '
|
|
50
|
+
error: "Invalid provider. Must be 'gemini', 'openai_compatible', or 'openai_chatgpt_oauth'.",
|
|
39
51
|
});
|
|
40
52
|
}
|
|
41
53
|
// Validate OpenAI-compatible provider has required fields
|
|
@@ -47,6 +59,13 @@ export function createAuthRouter(authManager) {
|
|
|
47
59
|
});
|
|
48
60
|
}
|
|
49
61
|
}
|
|
62
|
+
if (body.provider === 'openai_chatgpt_oauth') {
|
|
63
|
+
if (!body.openaiChatgptOauth?.model) {
|
|
64
|
+
return res.status(400).json({
|
|
65
|
+
error: "ChatGPT OAuth provider requires 'openaiChatgptOauth.model'.",
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
}
|
|
50
69
|
const result = await authManager.applyProviderSwitch(body);
|
|
51
70
|
if ('statusCode' in result && typeof result.statusCode === 'number') {
|
|
52
71
|
return res.status(result.statusCode).json({ error: result.error });
|
|
@@ -56,6 +75,7 @@ export function createAuthRouter(authManager) {
|
|
|
56
75
|
return res.json({
|
|
57
76
|
status: status.status,
|
|
58
77
|
authType: status.authType ?? null,
|
|
78
|
+
...(status.provider ? { provider: status.provider } : {}),
|
|
59
79
|
...(status.message ? { message: status.message } : {}),
|
|
60
80
|
...(status.errorCode ? { errorCode: status.errorCode } : {}),
|
|
61
81
|
});
|
|
@@ -159,6 +179,94 @@ export function createAuthRouter(authManager) {
|
|
|
159
179
|
}
|
|
160
180
|
})();
|
|
161
181
|
});
|
|
182
|
+
// OpenAI ChatGPT OAuth (Codex) endpoints
|
|
183
|
+
router.post('/openai/oauth/start', (req, res) => {
|
|
184
|
+
void (async () => {
|
|
185
|
+
if (isOpenAiChatGptOauthDisabled()) {
|
|
186
|
+
res.status(403).json({
|
|
187
|
+
error: 'ChatGPT OAuth provider is disabled by TERMINAI_DISABLE_OPENAI_CHATGPT_OAUTH. Use openai_compatible instead.',
|
|
188
|
+
});
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
try {
|
|
192
|
+
const { authUrl } = await authManager.startOpenAIOAuth();
|
|
193
|
+
res.json({ authUrl });
|
|
194
|
+
}
|
|
195
|
+
catch (e) {
|
|
196
|
+
if (e instanceof AuthConflictError) {
|
|
197
|
+
res.status(409).json({ error: e.message });
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
200
|
+
logger.error('[AuthRouter] Error starting OpenAI OAuth:', e);
|
|
201
|
+
res.status(500).json({ error: 'Failed to start OAuth' });
|
|
202
|
+
}
|
|
203
|
+
})();
|
|
204
|
+
});
|
|
205
|
+
router.post('/openai/oauth/complete', (req, res) => {
|
|
206
|
+
void (async () => {
|
|
207
|
+
if (isOpenAiChatGptOauthDisabled()) {
|
|
208
|
+
res.status(403).json({
|
|
209
|
+
error: 'ChatGPT OAuth provider is disabled by TERMINAI_DISABLE_OPENAI_CHATGPT_OAUTH. Use openai_compatible instead.',
|
|
210
|
+
});
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
try {
|
|
214
|
+
const body = req.body;
|
|
215
|
+
const status = await authManager.completeOpenAIOAuth({
|
|
216
|
+
redirectUrl: typeof body.redirectUrl === 'string' ? body.redirectUrl : undefined,
|
|
217
|
+
code: typeof body.code === 'string' ? body.code : undefined,
|
|
218
|
+
state: typeof body.state === 'string' ? body.state : undefined,
|
|
219
|
+
});
|
|
220
|
+
res.json({
|
|
221
|
+
status: status.status,
|
|
222
|
+
authType: status.authType ?? null,
|
|
223
|
+
...(status.provider ? { provider: status.provider } : {}),
|
|
224
|
+
...(status.message ? { message: status.message } : {}),
|
|
225
|
+
...(status.errorCode ? { errorCode: status.errorCode } : {}),
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
catch (e) {
|
|
229
|
+
logger.error('[AuthRouter] Error completing OpenAI OAuth:', e);
|
|
230
|
+
res.status(500).json({ error: 'Failed to complete OAuth' });
|
|
231
|
+
}
|
|
232
|
+
})();
|
|
233
|
+
});
|
|
234
|
+
router.post('/openai/oauth/cancel', (req, res) => {
|
|
235
|
+
void (async () => {
|
|
236
|
+
try {
|
|
237
|
+
const status = await authManager.cancelOpenAIOAuth();
|
|
238
|
+
res.json({
|
|
239
|
+
status: status.status,
|
|
240
|
+
authType: status.authType ?? null,
|
|
241
|
+
...(status.provider ? { provider: status.provider } : {}),
|
|
242
|
+
...(status.message ? { message: status.message } : {}),
|
|
243
|
+
...(status.errorCode ? { errorCode: status.errorCode } : {}),
|
|
244
|
+
});
|
|
245
|
+
}
|
|
246
|
+
catch (e) {
|
|
247
|
+
logger.error('[AuthRouter] Error cancelling OpenAI OAuth:', e);
|
|
248
|
+
res.status(500).json({ error: 'Failed to cancel OAuth' });
|
|
249
|
+
}
|
|
250
|
+
})();
|
|
251
|
+
});
|
|
252
|
+
router.post('/openai/clear', (req, res) => {
|
|
253
|
+
void (async () => {
|
|
254
|
+
try {
|
|
255
|
+
const status = await authManager.clearOpenAIAuth();
|
|
256
|
+
res.json({
|
|
257
|
+
status: status.status,
|
|
258
|
+
authType: status.authType ?? null,
|
|
259
|
+
...(status.provider ? { provider: status.provider } : {}),
|
|
260
|
+
...(status.message ? { message: status.message } : {}),
|
|
261
|
+
...(status.errorCode ? { errorCode: status.errorCode } : {}),
|
|
262
|
+
});
|
|
263
|
+
}
|
|
264
|
+
catch (e) {
|
|
265
|
+
logger.error('[AuthRouter] Error clearing OpenAI auth:', e);
|
|
266
|
+
res.status(500).json({ error: 'Failed to clear authentication' });
|
|
267
|
+
}
|
|
268
|
+
})();
|
|
269
|
+
});
|
|
162
270
|
return router;
|
|
163
271
|
}
|
|
164
272
|
//# sourceMappingURL=auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/http/routes/auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/http/routes/auth.ts"],"names":[],"mappings":"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"}
|