@kaitranntt/ccs 7.55.0 → 7.56.0-dev.2
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/README.md +15 -3
- package/dist/api/services/cliproxy-profile-bridge.d.ts +13 -0
- package/dist/api/services/cliproxy-profile-bridge.d.ts.map +1 -0
- package/dist/api/services/cliproxy-profile-bridge.js +147 -0
- package/dist/api/services/cliproxy-profile-bridge.js.map +1 -0
- package/dist/api/services/index.d.ts +3 -1
- package/dist/api/services/index.d.ts.map +1 -1
- package/dist/api/services/index.js +9 -1
- package/dist/api/services/index.js.map +1 -1
- package/dist/api/services/profile-lifecycle-service.d.ts.map +1 -1
- package/dist/api/services/profile-lifecycle-service.js +10 -10
- package/dist/api/services/profile-lifecycle-service.js.map +1 -1
- package/dist/api/services/profile-reader.d.ts.map +1 -1
- package/dist/api/services/profile-reader.js +37 -14
- package/dist/api/services/profile-reader.js.map +1 -1
- package/dist/api/services/profile-types.d.ts +35 -0
- package/dist/api/services/profile-types.d.ts.map +1 -1
- package/dist/api/services/profile-writer.d.ts +7 -1
- package/dist/api/services/profile-writer.d.ts.map +1 -1
- package/dist/api/services/profile-writer.js +77 -37
- package/dist/api/services/profile-writer.js.map +1 -1
- package/dist/auth/commands/create-command.js +1 -1
- package/dist/auth/commands/create-command.js.map +1 -1
- package/dist/auth/commands/remove-command.js +1 -1
- package/dist/auth/commands/remove-command.js.map +1 -1
- package/dist/auth/profile-registry.d.ts.map +1 -1
- package/dist/auth/profile-registry.js +46 -48
- package/dist/auth/profile-registry.js.map +1 -1
- package/dist/cliproxy/account-manager.d.ts +1 -1
- package/dist/cliproxy/account-manager.d.ts.map +1 -1
- package/dist/cliproxy/account-manager.js +4 -1
- package/dist/cliproxy/account-manager.js.map +1 -1
- package/dist/cliproxy/accounts/index.d.ts +1 -1
- package/dist/cliproxy/accounts/index.d.ts.map +1 -1
- package/dist/cliproxy/accounts/index.js +4 -1
- package/dist/cliproxy/accounts/index.js.map +1 -1
- package/dist/cliproxy/accounts/query.d.ts.map +1 -1
- package/dist/cliproxy/accounts/query.js +4 -6
- package/dist/cliproxy/accounts/query.js.map +1 -1
- package/dist/cliproxy/accounts/registry.d.ts +2 -2
- package/dist/cliproxy/accounts/registry.d.ts.map +1 -1
- package/dist/cliproxy/accounts/registry.js +292 -320
- package/dist/cliproxy/accounts/registry.js.map +1 -1
- package/dist/cliproxy/accounts/token-file-ops.d.ts +16 -1
- package/dist/cliproxy/accounts/token-file-ops.d.ts.map +1 -1
- package/dist/cliproxy/accounts/token-file-ops.js +55 -3
- package/dist/cliproxy/accounts/token-file-ops.js.map +1 -1
- package/dist/cliproxy/ai-providers/config-store.d.ts +19 -0
- package/dist/cliproxy/ai-providers/config-store.d.ts.map +1 -0
- package/dist/cliproxy/ai-providers/config-store.js +150 -0
- package/dist/cliproxy/ai-providers/config-store.js.map +1 -0
- package/dist/cliproxy/ai-providers/config-yaml-sections.d.ts +2 -0
- package/dist/cliproxy/ai-providers/config-yaml-sections.d.ts.map +1 -0
- package/dist/cliproxy/ai-providers/config-yaml-sections.js +43 -0
- package/dist/cliproxy/ai-providers/config-yaml-sections.js.map +1 -0
- package/dist/cliproxy/ai-providers/index.d.ts +4 -0
- package/dist/cliproxy/ai-providers/index.d.ts.map +1 -0
- package/dist/cliproxy/ai-providers/index.js +12 -0
- package/dist/cliproxy/ai-providers/index.js.map +1 -0
- package/dist/cliproxy/ai-providers/service.d.ts +6 -0
- package/dist/cliproxy/ai-providers/service.d.ts.map +1 -0
- package/dist/cliproxy/ai-providers/service.js +220 -0
- package/dist/cliproxy/ai-providers/service.js.map +1 -0
- package/dist/cliproxy/ai-providers/types.d.ts +99 -0
- package/dist/cliproxy/ai-providers/types.d.ts.map +1 -0
- package/dist/cliproxy/ai-providers/types.js +53 -0
- package/dist/cliproxy/ai-providers/types.js.map +1 -0
- package/dist/cliproxy/auth/oauth-handler.d.ts +1 -0
- package/dist/cliproxy/auth/oauth-handler.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-handler.js +31 -69
- package/dist/cliproxy/auth/oauth-handler.js.map +1 -1
- package/dist/cliproxy/auth/oauth-process.d.ts +1 -0
- package/dist/cliproxy/auth/oauth-process.d.ts.map +1 -1
- package/dist/cliproxy/auth/oauth-process.js +5 -5
- package/dist/cliproxy/auth/oauth-process.js.map +1 -1
- package/dist/cliproxy/auth/token-manager.d.ts +1 -1
- package/dist/cliproxy/auth/token-manager.d.ts.map +1 -1
- package/dist/cliproxy/auth/token-manager.js +53 -20
- package/dist/cliproxy/auth/token-manager.js.map +1 -1
- package/dist/cliproxy/auth-token-manager.d.ts.map +1 -1
- package/dist/cliproxy/auth-token-manager.js +47 -50
- package/dist/cliproxy/auth-token-manager.js.map +1 -1
- package/dist/cliproxy/base-config-loader.d.ts +1 -1
- package/dist/cliproxy/base-config-loader.d.ts.map +1 -1
- package/dist/cliproxy/codex-plan-compatibility.d.ts +19 -0
- package/dist/cliproxy/codex-plan-compatibility.d.ts.map +1 -1
- package/dist/cliproxy/codex-plan-compatibility.js +62 -1
- package/dist/cliproxy/codex-plan-compatibility.js.map +1 -1
- package/dist/cliproxy/codex-reasoning-proxy.d.ts +5 -0
- package/dist/cliproxy/codex-reasoning-proxy.d.ts.map +1 -1
- package/dist/cliproxy/codex-reasoning-proxy.js +103 -20
- package/dist/cliproxy/codex-reasoning-proxy.js.map +1 -1
- package/dist/cliproxy/composite-validator.d.ts.map +1 -1
- package/dist/cliproxy/composite-validator.js.map +1 -1
- package/dist/cliproxy/config/env-builder.d.ts +2 -2
- package/dist/cliproxy/config/env-builder.d.ts.map +1 -1
- package/dist/cliproxy/config/extended-context-config.d.ts +1 -1
- package/dist/cliproxy/config/extended-context-config.d.ts.map +1 -1
- package/dist/cliproxy/config/generator.d.ts +1 -1
- package/dist/cliproxy/config/generator.d.ts.map +1 -1
- package/dist/cliproxy/config/path-resolver.d.ts +1 -1
- package/dist/cliproxy/config/path-resolver.d.ts.map +1 -1
- package/dist/cliproxy/config/thinking-config.d.ts +2 -2
- package/dist/cliproxy/config/thinking-config.d.ts.map +1 -1
- package/dist/cliproxy/config/thinking-config.js.map +1 -1
- package/dist/cliproxy/executor/index.js +1 -1
- package/dist/cliproxy/executor/index.js.map +1 -1
- package/dist/cliproxy/index.d.ts +2 -0
- package/dist/cliproxy/index.d.ts.map +1 -1
- package/dist/cliproxy/index.js +9 -2
- package/dist/cliproxy/index.js.map +1 -1
- package/dist/cliproxy/management-api-client.d.ts +9 -0
- package/dist/cliproxy/management-api-client.d.ts.map +1 -1
- package/dist/cliproxy/management-api-client.js +16 -3
- package/dist/cliproxy/management-api-client.js.map +1 -1
- package/dist/cliproxy/model-catalog.d.ts +1 -1
- package/dist/cliproxy/model-catalog.d.ts.map +1 -1
- package/dist/cliproxy/model-id-normalizer.d.ts +1 -1
- package/dist/cliproxy/model-id-normalizer.d.ts.map +1 -1
- package/dist/cliproxy/services/variant-config-adapter.d.ts.map +1 -1
- package/dist/cliproxy/services/variant-config-adapter.js +43 -39
- package/dist/cliproxy/services/variant-config-adapter.js.map +1 -1
- package/dist/cliproxy/thinking-validator.d.ts +1 -1
- package/dist/cliproxy/thinking-validator.d.ts.map +1 -1
- package/dist/cliproxy/thinking-validator.js.map +1 -1
- package/dist/cliproxy/types.d.ts +22 -0
- package/dist/cliproxy/types.d.ts.map +1 -1
- package/dist/commands/api-command/create-command.d.ts.map +1 -1
- package/dist/commands/api-command/create-command.js +89 -0
- package/dist/commands/api-command/create-command.js.map +1 -1
- package/dist/commands/api-command/help.d.ts.map +1 -1
- package/dist/commands/api-command/help.js +6 -0
- package/dist/commands/api-command/help.js.map +1 -1
- package/dist/commands/api-command/shared.d.ts +2 -1
- package/dist/commands/api-command/shared.d.ts.map +1 -1
- package/dist/commands/api-command/shared.js +6 -0
- package/dist/commands/api-command/shared.js.map +1 -1
- package/dist/commands/cliproxy/proxy-lifecycle-subcommand.d.ts +0 -5
- package/dist/commands/cliproxy/proxy-lifecycle-subcommand.d.ts.map +1 -1
- package/dist/commands/cliproxy/proxy-lifecycle-subcommand.js +6 -16
- package/dist/commands/cliproxy/proxy-lifecycle-subcommand.js.map +1 -1
- package/dist/commands/cliproxy/resolve-lifecycle-port.d.ts +6 -0
- package/dist/commands/cliproxy/resolve-lifecycle-port.d.ts.map +1 -0
- package/dist/commands/cliproxy/resolve-lifecycle-port.js +15 -0
- package/dist/commands/cliproxy/resolve-lifecycle-port.js.map +1 -0
- package/dist/commands/config-auth/disable-command.d.ts.map +1 -1
- package/dist/commands/config-auth/disable-command.js +8 -8
- package/dist/commands/config-auth/disable-command.js.map +1 -1
- package/dist/commands/config-auth/setup-command.d.ts.map +1 -1
- package/dist/commands/config-auth/setup-command.js +9 -11
- package/dist/commands/config-auth/setup-command.js.map +1 -1
- package/dist/commands/config-dashboard-host.js +2 -2
- package/dist/commands/config-dashboard-host.js.map +1 -1
- package/dist/commands/copilot-command.js +11 -11
- package/dist/commands/copilot-command.js.map +1 -1
- package/dist/commands/cursor-command.d.ts.map +1 -1
- package/dist/commands/cursor-command.js +11 -11
- package/dist/commands/cursor-command.js.map +1 -1
- package/dist/commands/help-command.d.ts.map +1 -1
- package/dist/commands/help-command.js +5 -1
- package/dist/commands/help-command.js.map +1 -1
- package/dist/commands/setup-command.d.ts.map +1 -1
- package/dist/commands/setup-command.js +4 -3
- package/dist/commands/setup-command.js.map +1 -1
- package/dist/config/unified-config-loader.d.ts +2 -2
- package/dist/config/unified-config-loader.d.ts.map +1 -1
- package/dist/config/unified-config-loader.js +39 -32
- package/dist/config/unified-config-loader.js.map +1 -1
- package/dist/management/instance-manager.d.ts +2 -1
- package/dist/management/instance-manager.d.ts.map +1 -1
- package/dist/management/instance-manager.js +23 -9
- package/dist/management/instance-manager.js.map +1 -1
- package/dist/management/profile-context-sync-lock.d.ts +3 -0
- package/dist/management/profile-context-sync-lock.d.ts.map +1 -1
- package/dist/management/profile-context-sync-lock.js +75 -3
- package/dist/management/profile-context-sync-lock.js.map +1 -1
- package/dist/management/shared-manager.d.ts +21 -8
- package/dist/management/shared-manager.d.ts.map +1 -1
- package/dist/management/shared-manager.js +353 -24
- package/dist/management/shared-manager.js.map +1 -1
- package/dist/shared/claude-extension-setup.js +2 -2
- package/dist/shared/claude-extension-setup.js.map +1 -1
- package/dist/types/cli.d.ts +10 -9
- package/dist/types/cli.d.ts.map +1 -1
- package/dist/types/cli.js +8 -9
- package/dist/types/cli.js.map +1 -1
- package/dist/types/utils.d.ts +7 -6
- package/dist/types/utils.d.ts.map +1 -1
- package/dist/types/utils.js +6 -7
- package/dist/types/utils.js.map +1 -1
- package/dist/ui/assets/{accounts-CjGyCl_8.js → accounts-BikRyqcT.js} +1 -1
- package/dist/ui/assets/{alert-dialog-cy99V8EM.js → alert-dialog-CwEJfEUX.js} +1 -1
- package/dist/ui/assets/antigravity-responsibility-constants-Bvh4Ybz0.js +1 -0
- package/dist/ui/assets/api-BYSEdQYh.js +4 -0
- package/dist/ui/assets/{auth-section-DsDyGmzl.js → auth-section-CrFrby6w.js} +1 -1
- package/dist/ui/assets/{backups-section-B63xrUmB.js → backups-section-CdMvSnSm.js} +1 -1
- package/dist/ui/assets/{checkbox-AxZFvatO.js → checkbox-CC0rU-9-.js} +1 -1
- package/dist/ui/assets/{claude-extension-N0lxo7BY.js → claude-extension-CzGeZYz8.js} +1 -1
- package/dist/ui/assets/cliproxy-BSNSGNOv.js +3 -0
- package/dist/ui/assets/cliproxy-ai-providers-D-U6NKfV.js +21 -0
- package/dist/ui/assets/cliproxy-control-panel-BCexyz40.js +1 -0
- package/dist/ui/assets/{confirm-dialog-D2bDFGvT.js → confirm-dialog-Bee0kh6i.js} +1 -1
- package/dist/ui/assets/{copilot-INm6uOZF.js → copilot-BZRAvPLD.js} +1 -1
- package/dist/ui/assets/{cursor-C8rDHKEp.js → cursor-CO2rCNKC.js} +1 -1
- package/dist/ui/assets/{droid-OZDvbiwC.js → droid-CcKqoQtO.js} +2 -2
- package/dist/ui/assets/{globalenv-section-ClTBgKg5.js → globalenv-section-CBRvmZbS.js} +1 -1
- package/dist/ui/assets/{health-CGaRANip.js → health-DgrTQESI.js} +1 -1
- package/dist/ui/assets/icons-DR-ORtNe.js +1 -0
- package/dist/ui/assets/{index-DS1QEaxk.js → index-BOhcsuQK.js} +1 -1
- package/dist/ui/assets/{index-CGOZU3jq.js → index-CursmDny.js} +1 -1
- package/dist/ui/assets/{index-CCSdUs7x.js → index-D90gSn57.js} +1 -1
- package/dist/ui/assets/{index-DQ4jn6yA.js → index-DJCPwAoe.js} +1 -1
- package/dist/ui/assets/index-kGiBvBM-.css +1 -0
- package/dist/ui/assets/index-sCtK1kDn.js +47 -0
- package/dist/ui/assets/providers/codex-color.svg +24 -0
- package/dist/ui/assets/providers/vertex.svg +25 -0
- package/dist/ui/assets/proxy-status-widget-C8cOlsqE.js +1 -0
- package/dist/ui/assets/{searchable-select-D6dcPTiL.js → searchable-select-CF22qEzz.js} +1 -1
- package/dist/ui/assets/{separator-Czy9IRpl.js → separator-CAoIlNuN.js} +1 -1
- package/dist/ui/assets/{shared-BUJNJgAr.js → shared-zeFjETE6.js} +1 -1
- package/dist/ui/assets/{switch-Bog43RUy.js → switch-BeqpDfK5.js} +1 -1
- package/dist/ui/assets/{updates-jcWPnn9L.js → updates-By9S46EJ.js} +1 -1
- package/dist/ui/index.html +3 -3
- package/dist/utils/claude-config-path.d.ts.map +1 -1
- package/dist/utils/claude-config-path.js +2 -5
- package/dist/utils/claude-config-path.js.map +1 -1
- package/dist/utils/config-manager.d.ts +7 -1
- package/dist/utils/config-manager.d.ts.map +1 -1
- package/dist/utils/config-manager.js +30 -1
- package/dist/utils/config-manager.js.map +1 -1
- package/dist/utils/shell-executor.js +1 -1
- package/dist/utils/shell-executor.js.map +1 -1
- package/dist/web-server/health-service.d.ts.map +1 -1
- package/dist/web-server/health-service.js +2 -3
- package/dist/web-server/health-service.js.map +1 -1
- package/dist/web-server/middleware/auth-middleware.d.ts +2 -0
- package/dist/web-server/middleware/auth-middleware.d.ts.map +1 -1
- package/dist/web-server/middleware/auth-middleware.js +23 -1
- package/dist/web-server/middleware/auth-middleware.js.map +1 -1
- package/dist/web-server/routes/account-routes.d.ts.map +1 -1
- package/dist/web-server/routes/account-routes.js +26 -6
- package/dist/web-server/routes/account-routes.js.map +1 -1
- package/dist/web-server/routes/ai-provider-routes.d.ts +3 -0
- package/dist/web-server/routes/ai-provider-routes.d.ts.map +1 -0
- package/dist/web-server/routes/ai-provider-routes.js +118 -0
- package/dist/web-server/routes/ai-provider-routes.js.map +1 -0
- package/dist/web-server/routes/cliproxy-auth-routes.d.ts +7 -0
- package/dist/web-server/routes/cliproxy-auth-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-auth-routes.js +119 -32
- package/dist/web-server/routes/cliproxy-auth-routes.js.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-stats-routes.js +6 -0
- package/dist/web-server/routes/cliproxy-stats-routes.js.map +1 -1
- package/dist/web-server/routes/cliproxy-sync-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cliproxy-sync-routes.js +6 -11
- package/dist/web-server/routes/cliproxy-sync-routes.js.map +1 -1
- package/dist/web-server/routes/cursor-settings-routes.d.ts.map +1 -1
- package/dist/web-server/routes/cursor-settings-routes.js +36 -33
- package/dist/web-server/routes/cursor-settings-routes.js.map +1 -1
- package/dist/web-server/routes/index.d.ts.map +1 -1
- package/dist/web-server/routes/index.js +2 -0
- package/dist/web-server/routes/index.js.map +1 -1
- package/dist/web-server/routes/misc-routes.d.ts.map +1 -1
- package/dist/web-server/routes/misc-routes.js +26 -19
- package/dist/web-server/routes/misc-routes.js.map +1 -1
- package/dist/web-server/routes/profile-routes.d.ts.map +1 -1
- package/dist/web-server/routes/profile-routes.js +45 -0
- package/dist/web-server/routes/profile-routes.js.map +1 -1
- package/dist/web-server/routes/proxy-routes.d.ts.map +1 -1
- package/dist/web-server/routes/proxy-routes.js +6 -0
- package/dist/web-server/routes/proxy-routes.js.map +1 -1
- package/dist/web-server/routes/settings-routes.d.ts.map +1 -1
- package/dist/web-server/routes/settings-routes.js +146 -109
- package/dist/web-server/routes/settings-routes.js.map +1 -1
- package/dist/web-server/routes/websearch-routes.d.ts.map +1 -1
- package/dist/web-server/routes/websearch-routes.js +31 -43
- package/dist/web-server/routes/websearch-routes.js.map +1 -1
- package/dist/web-server/shared-routes.d.ts.map +1 -1
- package/dist/web-server/shared-routes.js +6 -0
- package/dist/web-server/shared-routes.js.map +1 -1
- package/package.json +2 -2
- package/scripts/dev-release.sh +103 -51
- package/dist/ui/assets/api-DKrhDjiy.js +0 -4
- package/dist/ui/assets/cliproxy-D2ozaUJ3.js +0 -3
- package/dist/ui/assets/cliproxy-control-panel-5fYLcZKs.js +0 -1
- package/dist/ui/assets/icons-DtwH984l.js +0 -1
- package/dist/ui/assets/index-ClEn7Y7g.css +0 -1
- package/dist/ui/assets/index-tMnuUCFi.js +0 -47
- package/dist/ui/assets/proxy-status-widget-PESjh9-t.js +0 -1
|
@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
8
8
|
};
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.authMiddleware = exports.createSessionMiddleware = exports.loginRateLimiter = void 0;
|
|
10
|
+
exports.requireLocalAccessWhenAuthDisabled = exports.isLoopbackRemoteAddress = exports.authMiddleware = exports.createSessionMiddleware = exports.loginRateLimiter = void 0;
|
|
11
11
|
const express_session_1 = __importDefault(require("express-session"));
|
|
12
12
|
const express_rate_limit_1 = __importDefault(require("express-rate-limit"));
|
|
13
13
|
const unified_config_loader_1 = require("../../config/unified-config-loader");
|
|
@@ -116,4 +116,26 @@ function authMiddleware(req, res, next) {
|
|
|
116
116
|
res.status(401).json({ error: 'Authentication required' });
|
|
117
117
|
}
|
|
118
118
|
exports.authMiddleware = authMiddleware;
|
|
119
|
+
function isLoopbackRemoteAddress(value) {
|
|
120
|
+
if (!value)
|
|
121
|
+
return false;
|
|
122
|
+
const normalized = value.trim().replace(/^\[|\]$/g, '');
|
|
123
|
+
return (normalized === '::1' ||
|
|
124
|
+
normalized === '127.0.0.1' ||
|
|
125
|
+
normalized.startsWith('127.') ||
|
|
126
|
+
normalized === '::ffff:127.0.0.1' ||
|
|
127
|
+
normalized.startsWith('::ffff:127.'));
|
|
128
|
+
}
|
|
129
|
+
exports.isLoopbackRemoteAddress = isLoopbackRemoteAddress;
|
|
130
|
+
function requireLocalAccessWhenAuthDisabled(req, res, error = 'This endpoint requires localhost access when dashboard auth is disabled.') {
|
|
131
|
+
if ((0, unified_config_loader_1.getDashboardAuthConfig)().enabled) {
|
|
132
|
+
return true;
|
|
133
|
+
}
|
|
134
|
+
if (isLoopbackRemoteAddress(req.socket.remoteAddress)) {
|
|
135
|
+
return true;
|
|
136
|
+
}
|
|
137
|
+
res.status(403).json({ error });
|
|
138
|
+
return false;
|
|
139
|
+
}
|
|
140
|
+
exports.requireLocalAccessWhenAuthDisabled = requireLocalAccessWhenAuthDisabled;
|
|
119
141
|
//# sourceMappingURL=auth-middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../../../src/web-server/middleware/auth-middleware.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth-middleware.js","sourceRoot":"","sources":["../../../src/web-server/middleware/auth-middleware.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAGH,sEAAsC;AACtC,4EAA2C;AAC3C,8EAA4E;AAC5E,oDAA4B;AAC5B,4CAAoB;AACpB,gDAAwB;AACxB,+DAAuD;AAUvD,8EAA8E;AAC9E,MAAM,YAAY,GAAG,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,aAAa,CAAC,CAAC;AAE9F,6CAA6C;AAC7C,SAAS,oBAAoB;IAC3B,OAAO,cAAI,CAAC,IAAI,CAAC,IAAA,0BAAS,GAAE,EAAE,iBAAiB,CAAC,CAAC;AACnD,CAAC;AAED;;;GAGG;AACH,SAAS,gBAAgB;IACvB,yBAAyB;IACzB,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;QACnC,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IACxC,CAAC;IAED,MAAM,UAAU,GAAG,oBAAoB,EAAE,CAAC;IAE1C,kCAAkC;IAClC,IAAI,CAAC;QACH,IAAI,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,YAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3D,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;gBACxB,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,0CAA0C;IAC5C,CAAC;IAED,4CAA4C;IAC5C,MAAM,SAAS,GAAG,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACrC,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,YAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,YAAE,CAAC,aAAa,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,uDAAuD;QACvD,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;IAChF,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;GAGG;AACU,QAAA,gBAAgB,GAAG,IAAA,4BAAS,EAAC;IACxC,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,aAAa;IACvC,GAAG,EAAE,CAAC,EAAE,aAAa;IACrB,OAAO,EAAE,EAAE,KAAK,EAAE,kDAAkD,EAAE;IACtE,eAAe,EAAE,IAAI;IACrB,aAAa,EAAE,KAAK;IACpB,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,IAAA,8CAAsB,GAAE,CAAC,OAAO;CAC9C,CAAC,CAAC;AAEH;;GAEG;AACH,SAAgB,uBAAuB;IACrC,MAAM,UAAU,GAAG,IAAA,8CAAsB,GAAE,CAAC;IAC5C,MAAM,MAAM,GAAG,CAAC,UAAU,CAAC,qBAAqB,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAEzE,OAAO,IAAA,yBAAO,EAAC;QACb,MAAM,EAAE,gBAAgB,EAAE;QAC1B,MAAM,EAAE,KAAK;QACb,iBAAiB,EAAE,KAAK;QACxB,MAAM,EAAE;YACN,MAAM,EAAE,KAAK,EAAE,sBAAsB;YACrC,QAAQ,EAAE,IAAI;YACd,MAAM;YACN,QAAQ,EAAE,QAAQ;SACnB;KACF,CAAC,CAAC;AACL,CAAC;AAfD,0DAeC;AAED;;;GAGG;AACH,SAAgB,cAAc,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IAC5E,MAAM,UAAU,GAAG,IAAA,8CAAsB,GAAE,CAAC;IAE5C,wBAAwB;IACxB,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACxB,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,wCAAwC;IACxC,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IACzC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,+CAA+C;IAC/C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,gBAAgB;IAChB,IAAI,GAAG,CAAC,OAAO,EAAE,aAAa,EAAE,CAAC;QAC/B,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,eAAe;IACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,CAAC;AAC7D,CAAC;AA1BD,wCA0BC;AAED,SAAgB,uBAAuB,CAAC,KAAyB;IAC/D,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACxD,OAAO,CACL,UAAU,KAAK,KAAK;QACpB,UAAU,KAAK,WAAW;QAC1B,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC;QAC7B,UAAU,KAAK,kBAAkB;QACjC,UAAU,CAAC,UAAU,CAAC,aAAa,CAAC,CACrC,CAAC;AACJ,CAAC;AAVD,0DAUC;AAED,SAAgB,kCAAkC,CAChD,GAAY,EACZ,GAAa,EACb,KAAK,GAAG,0EAA0E;IAElF,IAAI,IAAA,8CAAsB,GAAE,CAAC,OAAO,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChC,OAAO,KAAK,CAAC;AACf,CAAC;AAfD,gFAeC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-routes.d.ts","sourceRoot":"","sources":["../../../src/web-server/routes/account-routes.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"account-routes.d.ts","sourceRoot":"","sources":["../../../src/web-server/routes/account-routes.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA6BH,QAAA,MAAM,MAAM,4CAAW,CAAC;AAmexB,eAAe,MAAM,CAAC"}
|
|
@@ -18,9 +18,20 @@ const provider_capabilities_1 = require("../../cliproxy/provider-capabilities");
|
|
|
18
18
|
const account_context_1 = require("../../auth/account-context");
|
|
19
19
|
const account_route_helpers_1 = require("./account-route-helpers");
|
|
20
20
|
const router = (0, express_1.Router)();
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
function createProfileRegistry() {
|
|
22
|
+
return new profile_registry_1.default();
|
|
23
|
+
}
|
|
24
|
+
function createInstanceManager() {
|
|
25
|
+
return new instance_manager_1.default();
|
|
26
|
+
}
|
|
27
|
+
function getUnifiedAccountsRaw() {
|
|
28
|
+
if (!(0, unified_config_loader_1.isUnifiedMode)()) {
|
|
29
|
+
return {};
|
|
30
|
+
}
|
|
31
|
+
return (0, unified_config_loader_1.loadOrCreateUnifiedConfig)().accounts;
|
|
32
|
+
}
|
|
23
33
|
function hasAuthAccount(name) {
|
|
34
|
+
const registry = createProfileRegistry();
|
|
24
35
|
return registry.hasAccountUnified(name) || registry.hasProfile(name);
|
|
25
36
|
}
|
|
26
37
|
/**
|
|
@@ -28,8 +39,10 @@ function hasAuthAccount(name) {
|
|
|
28
39
|
*/
|
|
29
40
|
router.get('/', (_req, res) => {
|
|
30
41
|
try {
|
|
42
|
+
const registry = createProfileRegistry();
|
|
31
43
|
// Get profiles from both legacy and unified config (same logic as CLI)
|
|
32
44
|
const legacyProfiles = registry.getAllProfiles();
|
|
45
|
+
const rawUnifiedAccounts = getUnifiedAccountsRaw();
|
|
33
46
|
const unifiedAccounts = registry.getAllAccountsUnified();
|
|
34
47
|
// Get CLIProxy OAuth accounts (gemini, codex, agy, etc.)
|
|
35
48
|
const cliproxyAccounts = (0, account_manager_1.getAllAccountsSummary)();
|
|
@@ -53,9 +66,10 @@ router.get('/', (_req, res) => {
|
|
|
53
66
|
}
|
|
54
67
|
// Override with unified config accounts (takes precedence)
|
|
55
68
|
for (const [name, account] of Object.entries(unifiedAccounts)) {
|
|
69
|
+
const rawAccount = rawUnifiedAccounts[name];
|
|
56
70
|
const contextPolicy = (0, account_context_1.resolveAccountContextPolicy)(account);
|
|
57
|
-
const hasExplicitContextMode =
|
|
58
|
-
const hasExplicitContinuityMode =
|
|
71
|
+
const hasExplicitContextMode = rawAccount?.context_mode === 'isolated' || rawAccount?.context_mode === 'shared';
|
|
72
|
+
const hasExplicitContinuityMode = rawAccount?.continuity_mode === 'standard' || rawAccount?.continuity_mode === 'deeper';
|
|
59
73
|
merged[name] = {
|
|
60
74
|
type: 'account',
|
|
61
75
|
created: account.created,
|
|
@@ -108,6 +122,7 @@ router.get('/', (_req, res) => {
|
|
|
108
122
|
*/
|
|
109
123
|
router.post('/default', (req, res) => {
|
|
110
124
|
try {
|
|
125
|
+
const registry = createProfileRegistry();
|
|
111
126
|
const { name } = req.body;
|
|
112
127
|
if (!name) {
|
|
113
128
|
res.status(400).json({ error: 'Missing required field: name' });
|
|
@@ -142,6 +157,8 @@ router.post('/default', (req, res) => {
|
|
|
142
157
|
*/
|
|
143
158
|
router.put('/:name/context', async (req, res) => {
|
|
144
159
|
try {
|
|
160
|
+
const registry = createProfileRegistry();
|
|
161
|
+
const instanceMgr = createInstanceManager();
|
|
145
162
|
const { name } = req.params;
|
|
146
163
|
if (!name) {
|
|
147
164
|
res.status(400).json({ error: 'Missing account name' });
|
|
@@ -257,6 +274,7 @@ router.put('/:name/context', async (req, res) => {
|
|
|
257
274
|
*/
|
|
258
275
|
router.delete('/reset-default', (_req, res) => {
|
|
259
276
|
try {
|
|
277
|
+
const registry = createProfileRegistry();
|
|
260
278
|
if ((0, unified_config_loader_1.isUnifiedMode)()) {
|
|
261
279
|
registry.clearDefaultUnified();
|
|
262
280
|
}
|
|
@@ -272,8 +290,10 @@ router.delete('/reset-default', (_req, res) => {
|
|
|
272
290
|
/**
|
|
273
291
|
* DELETE /api/accounts/:name - Delete an account
|
|
274
292
|
*/
|
|
275
|
-
router.delete('/:name', (req, res) => {
|
|
293
|
+
router.delete('/:name', async (req, res) => {
|
|
276
294
|
try {
|
|
295
|
+
const registry = createProfileRegistry();
|
|
296
|
+
const instanceMgr = createInstanceManager();
|
|
277
297
|
const { name } = req.params;
|
|
278
298
|
if (!name) {
|
|
279
299
|
res.status(400).json({ error: 'Missing account name' });
|
|
@@ -312,7 +332,7 @@ router.delete('/:name', (req, res) => {
|
|
|
312
332
|
return;
|
|
313
333
|
}
|
|
314
334
|
// Match CLI remove ordering: delete instance first, metadata second.
|
|
315
|
-
instanceMgr.deleteInstance(name);
|
|
335
|
+
await instanceMgr.deleteInstance(name);
|
|
316
336
|
if (existsUnified) {
|
|
317
337
|
registry.removeAccountUnified(name);
|
|
318
338
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account-routes.js","sourceRoot":"","sources":["../../../src/web-server/routes/account-routes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"account-routes.js","sourceRoot":"","sources":["../../../src/web-server/routes/account-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ai-provider-routes.d.ts","sourceRoot":"","sources":["../../../src/web-server/routes/ai-provider-routes.ts"],"names":[],"mappings":"AAYA,QAAA,MAAM,MAAM,4CAAW,CAAC;AAgIxB,eAAe,MAAM,CAAC"}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const express_1 = require("express");
|
|
4
|
+
const ai_providers_1 = require("../../cliproxy/ai-providers");
|
|
5
|
+
const auth_middleware_1 = require("../middleware/auth-middleware");
|
|
6
|
+
const router = (0, express_1.Router)();
|
|
7
|
+
router.use((req, res, next) => {
|
|
8
|
+
if ((0, auth_middleware_1.requireLocalAccessWhenAuthDisabled)(req, res, 'AI provider endpoints require localhost access when dashboard auth is disabled.')) {
|
|
9
|
+
next();
|
|
10
|
+
}
|
|
11
|
+
});
|
|
12
|
+
function isAiProviderFamilyId(value) {
|
|
13
|
+
return ai_providers_1.AI_PROVIDER_FAMILY_IDS.includes(value);
|
|
14
|
+
}
|
|
15
|
+
function parseFamily(req, res) {
|
|
16
|
+
const family = req.params.family?.trim();
|
|
17
|
+
if (!family || !isAiProviderFamilyId(family)) {
|
|
18
|
+
res.status(400).json({ error: 'Invalid AI provider family' });
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
return family;
|
|
22
|
+
}
|
|
23
|
+
function parseEntryId(req, res) {
|
|
24
|
+
const entryId = req.params.entryId?.trim();
|
|
25
|
+
if (!entryId) {
|
|
26
|
+
res.status(400).json({ error: 'Invalid entry id' });
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
return entryId;
|
|
30
|
+
}
|
|
31
|
+
function parseInput(body) {
|
|
32
|
+
const payload = typeof body === 'object' && body !== null ? body : {};
|
|
33
|
+
return {
|
|
34
|
+
name: typeof payload.name === 'string' ? payload.name : undefined,
|
|
35
|
+
baseUrl: typeof payload.baseUrl === 'string' ? payload.baseUrl : undefined,
|
|
36
|
+
proxyUrl: typeof payload.proxyUrl === 'string' ? payload.proxyUrl : undefined,
|
|
37
|
+
prefix: typeof payload.prefix === 'string' ? payload.prefix : undefined,
|
|
38
|
+
headers: Array.isArray(payload.headers)
|
|
39
|
+
? payload.headers
|
|
40
|
+
.filter((item) => typeof item === 'object' && item !== null)
|
|
41
|
+
.map((item) => ({
|
|
42
|
+
key: typeof item.key === 'string' ? item.key : '',
|
|
43
|
+
value: typeof item.value === 'string' ? item.value : '',
|
|
44
|
+
}))
|
|
45
|
+
: undefined,
|
|
46
|
+
excludedModels: Array.isArray(payload.excludedModels)
|
|
47
|
+
? payload.excludedModels.filter((item) => typeof item === 'string')
|
|
48
|
+
: undefined,
|
|
49
|
+
models: Array.isArray(payload.models)
|
|
50
|
+
? payload.models
|
|
51
|
+
.filter((item) => typeof item === 'object' && item !== null)
|
|
52
|
+
.map((item) => ({
|
|
53
|
+
name: typeof item.name === 'string' ? item.name : '',
|
|
54
|
+
alias: typeof item.alias === 'string' ? item.alias : '',
|
|
55
|
+
}))
|
|
56
|
+
: undefined,
|
|
57
|
+
apiKey: typeof payload.apiKey === 'string' ? payload.apiKey : undefined,
|
|
58
|
+
apiKeys: Array.isArray(payload.apiKeys)
|
|
59
|
+
? payload.apiKeys.filter((item) => typeof item === 'string')
|
|
60
|
+
: undefined,
|
|
61
|
+
preserveSecrets: payload.preserveSecrets === true,
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
router.get('/', async (_req, res) => {
|
|
65
|
+
try {
|
|
66
|
+
res.json(await (0, ai_providers_1.listAiProviders)());
|
|
67
|
+
}
|
|
68
|
+
catch (error) {
|
|
69
|
+
res.status(500).json({ error: error.message });
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
router.post('/:family', async (req, res) => {
|
|
73
|
+
const family = parseFamily(req, res);
|
|
74
|
+
if (!family)
|
|
75
|
+
return;
|
|
76
|
+
try {
|
|
77
|
+
await (0, ai_providers_1.createAiProviderEntry)(family, parseInput(req.body));
|
|
78
|
+
res.status(201).json({ success: true });
|
|
79
|
+
}
|
|
80
|
+
catch (error) {
|
|
81
|
+
const message = error.message;
|
|
82
|
+
res.status(message === 'Entry not found' ? 404 : 400).json({ error: message });
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
router.put('/:family/:entryId', async (req, res) => {
|
|
86
|
+
const family = parseFamily(req, res);
|
|
87
|
+
if (!family)
|
|
88
|
+
return;
|
|
89
|
+
const entryId = parseEntryId(req, res);
|
|
90
|
+
if (!entryId)
|
|
91
|
+
return;
|
|
92
|
+
try {
|
|
93
|
+
await (0, ai_providers_1.updateAiProviderEntry)(family, entryId, parseInput(req.body));
|
|
94
|
+
res.json({ success: true });
|
|
95
|
+
}
|
|
96
|
+
catch (error) {
|
|
97
|
+
const message = error.message;
|
|
98
|
+
res.status(message === 'Entry not found' ? 404 : 400).json({ error: message });
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
router.delete('/:family/:entryId', async (req, res) => {
|
|
102
|
+
const family = parseFamily(req, res);
|
|
103
|
+
if (!family)
|
|
104
|
+
return;
|
|
105
|
+
const entryId = parseEntryId(req, res);
|
|
106
|
+
if (!entryId)
|
|
107
|
+
return;
|
|
108
|
+
try {
|
|
109
|
+
await (0, ai_providers_1.deleteAiProviderEntry)(family, entryId);
|
|
110
|
+
res.json({ success: true });
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
const message = error.message;
|
|
114
|
+
res.status(message === 'Entry not found' ? 404 : 400).json({ error: message });
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
exports.default = router;
|
|
118
|
+
//# sourceMappingURL=ai-provider-routes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ai-provider-routes.js","sourceRoot":"","sources":["../../../src/web-server/routes/ai-provider-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,5 +5,12 @@ export declare function getStartUrlUnsupportedReason(provider: CLIProxyProvider,
|
|
|
5
5
|
kiroMethod?: KiroAuthMethod;
|
|
6
6
|
}): string | null;
|
|
7
7
|
export declare function getStartAuthFailureMessage(provider: CLIProxyProvider): string;
|
|
8
|
+
export declare function getStartAuthNicknameError(provider: CLIProxyProvider, nickname: string | undefined, existingAccounts: Array<{
|
|
9
|
+
id: string;
|
|
10
|
+
nickname?: string;
|
|
11
|
+
}>, allowExistingAccountId?: string): {
|
|
12
|
+
error: string;
|
|
13
|
+
code: 'INVALID_NICKNAME' | 'NICKNAME_EXISTS';
|
|
14
|
+
} | null;
|
|
8
15
|
export default router;
|
|
9
16
|
//# sourceMappingURL=cliproxy-auth-routes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliproxy-auth-routes.d.ts","sourceRoot":"","sources":["../../../src/web-server/routes/cliproxy-auth-routes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cliproxy-auth-routes.d.ts","sourceRoot":"","sources":["../../../src/web-server/routes/cliproxy-auth-routes.ts"],"names":[],"mappings":"AAqCA,OAAO,EAKL,cAAc,EAGf,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAS7D,QAAA,MAAM,MAAM,4CAAW,CAAC;AA+ExB,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,cAAc,CAAA;CAAE,GACxC,MAAM,GAAG,IAAI,CAgBf;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAK7E;AASD,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,gBAAgB,EAAE,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,EAC1D,sBAAsB,CAAC,EAAE,MAAM,GAC9B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,kBAAkB,GAAG,iBAAiB,CAAA;CAAE,GAAG,IAAI,CAqBxE;AAiwBD,eAAe,MAAM,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getStartAuthFailureMessage = exports.getStartUrlUnsupportedReason = void 0;
|
|
3
|
+
exports.getStartAuthNicknameError = exports.getStartAuthFailureMessage = exports.getStartUrlUnsupportedReason = void 0;
|
|
4
4
|
const express_1 = require("express");
|
|
5
5
|
const auth_handler_1 = require("../../cliproxy/auth-handler");
|
|
6
6
|
const project_selection_handler_1 = require("../../cliproxy/project-selection-handler");
|
|
@@ -17,10 +17,46 @@ const provider_capabilities_1 = require("../../cliproxy/provider-capabilities");
|
|
|
17
17
|
const profile_detector_1 = require("../../auth/profile-detector");
|
|
18
18
|
const antigravity_responsibility_1 = require("../../cliproxy/antigravity-responsibility");
|
|
19
19
|
const route_helpers_1 = require("./route-helpers");
|
|
20
|
+
const auth_middleware_1 = require("../middleware/auth-middleware");
|
|
20
21
|
const router = (0, express_1.Router)();
|
|
22
|
+
const MANUAL_AUTH_STATE_TTL_MS = 10 * 60 * 1000;
|
|
23
|
+
const pendingManualAuthState = new Map();
|
|
21
24
|
// Valid providers list - derived from canonical CLIPROXY_PROFILES
|
|
22
25
|
const validProviders = [...profile_detector_1.CLIPROXY_PROFILES];
|
|
23
26
|
const { respondInternalError } = (0, route_helpers_1.createRouteErrorHelpers)('cliproxy-auth-routes');
|
|
27
|
+
router.use((req, res, next) => {
|
|
28
|
+
if ((0, auth_middleware_1.requireLocalAccessWhenAuthDisabled)(req, res, 'CLIProxy auth endpoints require localhost access when dashboard auth is disabled.')) {
|
|
29
|
+
next();
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
function pruneExpiredManualAuthState(now = Date.now()) {
|
|
33
|
+
for (const [state, pending] of pendingManualAuthState.entries()) {
|
|
34
|
+
if (now - pending.createdAt > MANUAL_AUTH_STATE_TTL_MS) {
|
|
35
|
+
pendingManualAuthState.delete(state);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
function rememberManualAuthState(state, pending) {
|
|
40
|
+
pruneExpiredManualAuthState();
|
|
41
|
+
pendingManualAuthState.set(state, {
|
|
42
|
+
...pending,
|
|
43
|
+
createdAt: Date.now(),
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
function getManualAuthState(state) {
|
|
47
|
+
if (!state) {
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
pruneExpiredManualAuthState();
|
|
51
|
+
const pending = pendingManualAuthState.get(state);
|
|
52
|
+
if (!pending) {
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
return {
|
|
56
|
+
nickname: pending.nickname,
|
|
57
|
+
expectedAccountId: pending.expectedAccountId,
|
|
58
|
+
};
|
|
59
|
+
}
|
|
24
60
|
function parseKiroMethod(raw) {
|
|
25
61
|
if (raw === undefined || raw === null) {
|
|
26
62
|
return { method: (0, auth_types_1.normalizeKiroAuthMethod)(), invalid: false };
|
|
@@ -61,6 +97,32 @@ function getStartAuthFailureMessage(provider) {
|
|
|
61
97
|
return 'Authentication failed or was cancelled';
|
|
62
98
|
}
|
|
63
99
|
exports.getStartAuthFailureMessage = getStartAuthFailureMessage;
|
|
100
|
+
function getManualCallbackRegistrationError(provider) {
|
|
101
|
+
if (account_manager_1.PROVIDERS_WITHOUT_EMAIL.includes(provider)) {
|
|
102
|
+
return 'Authenticated token could not be matched to a new account. Retry the flow and choose a different nickname if needed.';
|
|
103
|
+
}
|
|
104
|
+
return 'Authenticated token could not be registered. Retry the flow.';
|
|
105
|
+
}
|
|
106
|
+
function getStartAuthNicknameError(provider, nickname, existingAccounts, allowExistingAccountId) {
|
|
107
|
+
if (!account_manager_1.PROVIDERS_WITHOUT_EMAIL.includes(provider) || !nickname) {
|
|
108
|
+
return null;
|
|
109
|
+
}
|
|
110
|
+
const validationError = (0, account_manager_1.validateNickname)(nickname);
|
|
111
|
+
if (validationError) {
|
|
112
|
+
return {
|
|
113
|
+
error: validationError,
|
|
114
|
+
code: 'INVALID_NICKNAME',
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
if ((0, account_manager_1.hasAccountNameConflict)(existingAccounts, nickname, allowExistingAccountId)) {
|
|
118
|
+
return {
|
|
119
|
+
error: `Nickname "${nickname}" is already in use. Choose a different one.`,
|
|
120
|
+
code: 'NICKNAME_EXISTS',
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
return null;
|
|
124
|
+
}
|
|
125
|
+
exports.getStartAuthNicknameError = getStartAuthNicknameError;
|
|
64
126
|
/**
|
|
65
127
|
* GET /api/cliproxy/auth - Get auth status for built-in CLIProxy profiles
|
|
66
128
|
* Also fetches CLIProxyAPI stats to update lastUsedAt for active providers
|
|
@@ -360,33 +422,11 @@ router.post('/:provider/start', async (req, res) => {
|
|
|
360
422
|
return;
|
|
361
423
|
}
|
|
362
424
|
}
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
code: 'NICKNAME_REQUIRED',
|
|
369
|
-
});
|
|
370
|
-
return;
|
|
371
|
-
}
|
|
372
|
-
const validationError = (0, account_manager_1.validateNickname)(nickname);
|
|
373
|
-
if (validationError) {
|
|
374
|
-
res.status(400).json({
|
|
375
|
-
error: validationError,
|
|
376
|
-
code: 'INVALID_NICKNAME',
|
|
377
|
-
});
|
|
378
|
-
return;
|
|
379
|
-
}
|
|
380
|
-
// Check uniqueness
|
|
381
|
-
const existingAccounts = (0, account_manager_1.getProviderAccounts)(provider);
|
|
382
|
-
const existingNicknames = existingAccounts.map((a) => a.nickname?.toLowerCase() || a.id.toLowerCase());
|
|
383
|
-
if (existingNicknames.includes(nickname.toLowerCase())) {
|
|
384
|
-
res.status(400).json({
|
|
385
|
-
error: `Nickname "${nickname}" is already in use. Choose a different one.`,
|
|
386
|
-
code: 'NICKNAME_EXISTS',
|
|
387
|
-
});
|
|
388
|
-
return;
|
|
389
|
-
}
|
|
425
|
+
const existingAccounts = (0, account_manager_1.getProviderAccounts)(provider);
|
|
426
|
+
const nicknameError = getStartAuthNicknameError(provider, nickname, existingAccounts);
|
|
427
|
+
if (nicknameError) {
|
|
428
|
+
res.status(400).json(nicknameError);
|
|
429
|
+
return;
|
|
390
430
|
}
|
|
391
431
|
// Check Kiro no-incognito setting from config (or request body)
|
|
392
432
|
// Default to true (use normal browser) for reliability - incognito often fails
|
|
@@ -537,7 +577,11 @@ router.post('/kiro/import', async (_req, res) => {
|
|
|
537
577
|
*/
|
|
538
578
|
router.post('/:provider/start-url', async (req, res) => {
|
|
539
579
|
const { provider } = req.params;
|
|
540
|
-
const
|
|
580
|
+
const requestBody = req.body && typeof req.body === 'object' ? req.body : {};
|
|
581
|
+
const nicknameRaw = typeof requestBody.nickname === 'string' ? requestBody.nickname : undefined;
|
|
582
|
+
const kiroMethodRaw = requestBody.kiroMethod;
|
|
583
|
+
const riskAcknowledgement = requestBody.riskAcknowledgement;
|
|
584
|
+
const nickname = nicknameRaw?.trim();
|
|
541
585
|
const { method: kiroMethod, invalid: invalidKiroMethod } = parseKiroMethod(kiroMethodRaw);
|
|
542
586
|
// Check remote mode
|
|
543
587
|
const target = (0, proxy_target_resolver_1.getProxyTarget)();
|
|
@@ -574,6 +618,12 @@ router.post('/:provider/start-url', async (req, res) => {
|
|
|
574
618
|
res.status(400).json({ error: unsupportedReason });
|
|
575
619
|
return;
|
|
576
620
|
}
|
|
621
|
+
const existingAccounts = (0, account_manager_1.getProviderAccounts)(provider);
|
|
622
|
+
const nicknameError = getStartAuthNicknameError(provider, nickname, existingAccounts);
|
|
623
|
+
if (nicknameError) {
|
|
624
|
+
res.status(400).json(nicknameError);
|
|
625
|
+
return;
|
|
626
|
+
}
|
|
577
627
|
try {
|
|
578
628
|
const authUrlProvider = auth_types_1.CLIPROXY_AUTH_URL_PROVIDER_MAP[provider] || provider;
|
|
579
629
|
const kiroQuery = provider === 'kiro'
|
|
@@ -589,17 +639,23 @@ router.post('/:provider/start-url', async (req, res) => {
|
|
|
589
639
|
}
|
|
590
640
|
const data = (await response.json());
|
|
591
641
|
const authUrl = data.url || data.auth_url;
|
|
642
|
+
const oauthState = data.state || parseAuthUrlState(authUrl);
|
|
592
643
|
// Some upstream flows return state first and provide auth_url in subsequent status polling.
|
|
593
|
-
if (!authUrl && !
|
|
644
|
+
if (!authUrl && !oauthState) {
|
|
594
645
|
res
|
|
595
646
|
.status(500)
|
|
596
647
|
.json({ error: 'No OAuth state or authorization URL received from CLIProxyAPI' });
|
|
597
648
|
return;
|
|
598
649
|
}
|
|
650
|
+
if (oauthState) {
|
|
651
|
+
rememberManualAuthState(oauthState, {
|
|
652
|
+
nickname: nickname || undefined,
|
|
653
|
+
});
|
|
654
|
+
}
|
|
599
655
|
res.json({
|
|
600
656
|
success: true,
|
|
601
657
|
authUrl: authUrl || null,
|
|
602
|
-
state:
|
|
658
|
+
state: oauthState,
|
|
603
659
|
method: data.method || null,
|
|
604
660
|
});
|
|
605
661
|
}
|
|
@@ -651,6 +707,17 @@ function parseCallbackUrl(url) {
|
|
|
651
707
|
return {};
|
|
652
708
|
}
|
|
653
709
|
}
|
|
710
|
+
function parseAuthUrlState(url) {
|
|
711
|
+
if (!url) {
|
|
712
|
+
return null;
|
|
713
|
+
}
|
|
714
|
+
try {
|
|
715
|
+
return new URL(url).searchParams.get('state');
|
|
716
|
+
}
|
|
717
|
+
catch {
|
|
718
|
+
return null;
|
|
719
|
+
}
|
|
720
|
+
}
|
|
654
721
|
/**
|
|
655
722
|
* POST /api/cliproxy/auth/:provider/submit-callback - Submit OAuth callback URL manually
|
|
656
723
|
* For cross-browser OAuth flows where callback cannot redirect directly
|
|
@@ -679,6 +746,7 @@ router.post('/:provider/submit-callback', async (req, res) => {
|
|
|
679
746
|
res.status(400).json({ error: 'Invalid callback URL: missing code parameter' });
|
|
680
747
|
return;
|
|
681
748
|
}
|
|
749
|
+
const pendingAuth = getManualAuthState(parsed.state);
|
|
682
750
|
try {
|
|
683
751
|
const callbackProvider = auth_types_1.CLIPROXY_CALLBACK_PROVIDER_MAP[provider] || provider;
|
|
684
752
|
// Forward to CLIProxyAPI /oauth-callback endpoint (under /v0/management prefix)
|
|
@@ -697,7 +765,26 @@ router.post('/:provider/submit-callback', async (req, res) => {
|
|
|
697
765
|
});
|
|
698
766
|
return;
|
|
699
767
|
}
|
|
700
|
-
|
|
768
|
+
const account = (0, token_manager_1.registerAccountFromToken)(provider, (0, token_manager_1.getProviderTokenDir)(provider), pendingAuth?.nickname, false, pendingAuth?.expectedAccountId);
|
|
769
|
+
if (parsed.state) {
|
|
770
|
+
pendingManualAuthState.delete(parsed.state);
|
|
771
|
+
}
|
|
772
|
+
if (!account) {
|
|
773
|
+
res.status(409).json({
|
|
774
|
+
error: getManualCallbackRegistrationError(provider),
|
|
775
|
+
});
|
|
776
|
+
return;
|
|
777
|
+
}
|
|
778
|
+
res.json({
|
|
779
|
+
success: true,
|
|
780
|
+
account: {
|
|
781
|
+
id: account.id,
|
|
782
|
+
email: account.email,
|
|
783
|
+
nickname: account.nickname,
|
|
784
|
+
provider: account.provider,
|
|
785
|
+
isDefault: account.isDefault,
|
|
786
|
+
},
|
|
787
|
+
});
|
|
701
788
|
}
|
|
702
789
|
catch (error) {
|
|
703
790
|
respondInternalError(res, error, 'CLIProxyAPI not reachable.', 503);
|