@forestadmin/agent-bff 1.25.3 → 1.25.5
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/ai/ai-routes-middleware.d.ts +3 -2
- package/dist/ai/ai-routes-middleware.js +22 -2
- package/dist/build-bff.d.ts +32 -0
- package/dist/build-bff.js +368 -0
- package/dist/cli-core.d.ts +0 -12
- package/dist/cli-core.js +4 -339
- package/dist/cli-dispatch.js +5 -4
- package/dist/config/missing-config-warning.d.ts +9 -0
- package/dist/config/missing-config-warning.js +17 -0
- package/dist/context/context-routes-middleware.d.ts +6 -2
- package/dist/context/context-routes-middleware.js +3 -2
- package/dist/http/bff-http-server.d.ts +22 -5
- package/dist/http/bff-http-server.js +24 -27
- package/dist/http/bff-local-errors.d.ts +1 -0
- package/dist/http/bff-local-errors.js +5 -1
- package/dist/http/health-route.d.ts +9 -0
- package/dist/http/health-route.js +17 -0
- package/dist/http/version-header-middleware.d.ts +4 -0
- package/dist/http/version-header-middleware.js +12 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.js +4 -2
- package/dist/oauth/environment-fetch-error.d.ts +15 -0
- package/dist/oauth/environment-fetch-error.js +34 -0
- package/dist/oauth/environment-id.d.ts +25 -0
- package/dist/oauth/environment-id.js +72 -0
- package/dist/oauth/forest-server-client.d.ts +2 -1
- package/dist/oauth/forest-server-client.js +17 -8
- package/dist/oauth/oauth-routes.d.ts +2 -1
- package/dist/oauth/oauth-routes.js +19 -2
- package/package.json +3 -3
|
@@ -5,35 +5,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const http_1 = __importDefault(require("http"));
|
|
7
7
|
const koa_1 = __importDefault(require("koa"));
|
|
8
|
+
const health_route_1 = __importDefault(require("./health-route"));
|
|
9
|
+
const version_header_middleware_1 = __importDefault(require("./version-header-middleware"));
|
|
8
10
|
const console_logger_1 = __importDefault(require("../adapters/console-logger"));
|
|
11
|
+
const missing_config_warning_1 = __importDefault(require("../config/missing-config-warning"));
|
|
12
|
+
function isPrebuilt(options) {
|
|
13
|
+
return options.callback !== undefined;
|
|
14
|
+
}
|
|
9
15
|
class BFFHttpServer {
|
|
10
16
|
constructor(options) {
|
|
11
17
|
this.server = null;
|
|
12
18
|
this.options = options;
|
|
13
19
|
this.logger = options.logger ?? (0, console_logger_1.default)();
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
for (const middleware of this.options.middlewares ?? []) {
|
|
29
|
-
this.app.use(middleware);
|
|
20
|
+
if (isPrebuilt(options)) {
|
|
21
|
+
this.handler = options.callback;
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
this.handler = BFFHttpServer.buildHandler(options);
|
|
25
|
+
(0, missing_config_warning_1.default)(options.config, this.logger);
|
|
26
|
+
}
|
|
27
|
+
static buildHandler(options) {
|
|
28
|
+
const { config, version } = options;
|
|
29
|
+
const app = new koa_1.default();
|
|
30
|
+
app.use((0, version_header_middleware_1.default)(version));
|
|
31
|
+
app.use((0, health_route_1.default)({ config, version }));
|
|
32
|
+
for (const middleware of options.middlewares ?? []) {
|
|
33
|
+
app.use(middleware);
|
|
30
34
|
}
|
|
35
|
+
return app.callback();
|
|
31
36
|
}
|
|
32
37
|
async start() {
|
|
33
38
|
if (this.server)
|
|
34
39
|
throw new Error('Server already started');
|
|
35
40
|
return new Promise((resolve, reject) => {
|
|
36
|
-
const server = http_1.default.createServer(this.
|
|
41
|
+
const server = http_1.default.createServer(this.handler);
|
|
37
42
|
this.server = server;
|
|
38
43
|
let onError;
|
|
39
44
|
const onListening = () => {
|
|
@@ -41,14 +46,6 @@ class BFFHttpServer {
|
|
|
41
46
|
const address = server.address();
|
|
42
47
|
const port = typeof address === 'object' && address ? address.port : this.options.port;
|
|
43
48
|
this.logger('Info', 'Forest BFF started', { port });
|
|
44
|
-
const missing = Object.entries(this.options.config.presence)
|
|
45
|
-
.filter(([, present]) => !present)
|
|
46
|
-
.map(([key]) => key);
|
|
47
|
-
if (missing.length > 0) {
|
|
48
|
-
this.logger('Warn', 'Missing required configuration; /health will report degraded', {
|
|
49
|
-
missing,
|
|
50
|
-
});
|
|
51
|
-
}
|
|
52
49
|
resolve();
|
|
53
50
|
};
|
|
54
51
|
onError = (error) => {
|
|
@@ -79,8 +76,8 @@ class BFFHttpServer {
|
|
|
79
76
|
});
|
|
80
77
|
}
|
|
81
78
|
get callback() {
|
|
82
|
-
return this.
|
|
79
|
+
return this.handler;
|
|
83
80
|
}
|
|
84
81
|
}
|
|
85
82
|
exports.default = BFFHttpServer;
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmZmLWh0dHAtc2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2h0dHAvYmZmLWh0dHAtc2VydmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBTUEsZ0RBQXdCO0FBQ3hCLDhDQUFzQjtBQUV0QixrRUFBK0M7QUFDL0MsNEZBQXdFO0FBQ3hFLGdGQUE2RDtBQUM3RCw4RkFBaUU7QUE0QmpFLFNBQVMsVUFBVSxDQUFDLE9BQTZCO0lBQy9DLE9BQU8sT0FBTyxDQUFDLFFBQVEsS0FBSyxTQUFTLENBQUM7QUFDeEMsQ0FBQztBQUVELE1BQXFCLGFBQWE7SUFNaEMsWUFBWSxPQUE2QjtRQUZqQyxXQUFNLEdBQWtCLElBQUksQ0FBQztRQUduQyxJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztRQUN2QixJQUFJLENBQUMsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLElBQUksSUFBQSx3QkFBbUIsR0FBRSxDQUFDO1FBRXRELElBQUksVUFBVSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDeEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDO1lBRWhDLE9BQU87UUFDVCxDQUFDO1FBRUQsSUFBSSxDQUFDLE9BQU8sR0FBRyxhQUFhLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ25ELElBQUEsZ0NBQWlCLEVBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVPLE1BQU0sQ0FBQyxZQUFZLENBQUMsT0FBeUI7UUFDbkQsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFDcEMsTUFBTSxHQUFHLEdBQUcsSUFBSSxhQUFHLEVBQUUsQ0FBQztRQUV0QixHQUFHLENBQUMsR0FBRyxDQUFDLElBQUEsbUNBQTZCLEVBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztRQUNoRCxHQUFHLENB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
|
|
@@ -24,4 +24,5 @@ export declare const RATE_LIMIT_CAUSES: {
|
|
|
24
24
|
export type RateLimitCause = (typeof RATE_LIMIT_CAUSES)[keyof typeof RATE_LIMIT_CAUSES];
|
|
25
25
|
export declare function tooManyRequests(retryAfter: number, message: string, cause: RateLimitCause): BffHttpError;
|
|
26
26
|
export declare function actionRequiresApproval(message?: string, details?: unknown): BffHttpError;
|
|
27
|
+
export declare function environmentUnresolved(): BffHttpError;
|
|
27
28
|
//# sourceMappingURL=bff-local-errors.d.ts.map
|
|
@@ -21,6 +21,7 @@ exports.upstreamTimeout = upstreamTimeout;
|
|
|
21
21
|
exports.permissionsUnavailable = permissionsUnavailable;
|
|
22
22
|
exports.tooManyRequests = tooManyRequests;
|
|
23
23
|
exports.actionRequiresApproval = actionRequiresApproval;
|
|
24
|
+
exports.environmentUnresolved = environmentUnresolved;
|
|
24
25
|
const bff_http_error_1 = require("./bff-http-error");
|
|
25
26
|
function unknownCollection(message = 'Unknown collection') {
|
|
26
27
|
return new bff_http_error_1.BffHttpError(404, 'unknown_collection', message);
|
|
@@ -91,4 +92,7 @@ function tooManyRequests(retryAfter, message, cause) {
|
|
|
91
92
|
function actionRequiresApproval(message = 'This action requires an approval before it can run', details) {
|
|
92
93
|
return new bff_http_error_1.BffHttpError(403, 'action_requires_approval', message, { details });
|
|
93
94
|
}
|
|
94
|
-
|
|
95
|
+
function environmentUnresolved() {
|
|
96
|
+
return new bff_http_error_1.BffHttpError(502, 'environment_unresolved', 'The Forest environment could not be resolved');
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmZmLWxvY2FsLWVycm9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9odHRwL2JmZi1sb2NhbC1lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsOENBRUM7QUFFRCwwQ0FFQztBQUVELHNDQUVDO0FBRUQsb0RBRUM7QUFFRCxnREFFQztBQUVELDRDQUVDO0FBRUQsd0NBRUM7QUFFRCxvQ0FFQztBQUVELDhDQUVDO0FBRUQsMERBRUM7QUFFRCxrQ0FFQztBQUVELDBDQUVDO0FBRUQsNERBRUM7QUFFRCxzQ0FFQztBQUlELHNDQVFDO0FBRUQsa0RBRUM7QUFFRCwwQ0FFQztBQUVELHdEQUtDO0FBU0QsMENBU0M7QUFFRCx3REFLQztBQUVELHNEQU1DO0FBcEhELHFEQUFnRDtBQUVoRCxTQUFnQixpQkFBaUIsQ0FBQyxPQUFPLEdBQUcsb0JBQW9CO0lBQzlELE9BQU8sSUFBSSw2QkFBWSxDQUFDLEdBQUcsRUFBRSxvQkFBb0IsRUFBRSxPQUFPLENBQUMsQ0FBQztBQUM5RCxDQUFDO0FBRUQsU0FBZ0IsZUFBZSxDQUFDLE9BQU8sR0FBRyxrQkFBa0I7SUFDMUQsT0FBTyxJQUFJLDZCQUFZLENBQUMsR0FBRyxFQUFFLGtCQUFrQixFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQzVELENBQUM7QUFFRCxTQUFnQixhQUFhLENBQUMsT0FBTyxHQUFHLGdCQUFnQjtJQUN0RCxPQUFPLElBQUksNkJBQVksQ0FBQyxHQUFHLEVBQUUsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDLENBQUM7QUFDMUQsQ0FBQztBQUVELFNBQWdCLG9CQUFvQixDQUFDLE9BQU8sR0FBRywyQkFBMkI7SUFDeEUsT0FBTyxJQUFJLDZCQUFZLENBQUMsR0FBRyxFQUFFLHdCQUF3QixFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQ2xFLENBQUM7QUFFRCxTQUFnQixrQkFBa0IsQ0FBQyxPQUFPLEdBQUcseUJBQXlCO0lBQ3BFLE9BQU8sSUFBSSw2QkFBWSxDQUFD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
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { BFFConfig } from '../config/env-config';
|
|
2
|
+
import type { Middleware } from 'koa';
|
|
3
|
+
export declare const HEALTH_PATH = "/health";
|
|
4
|
+
export interface HealthRouteOptions {
|
|
5
|
+
config: BFFConfig;
|
|
6
|
+
version: string;
|
|
7
|
+
}
|
|
8
|
+
export default function createHealthRoute({ config, version }: HealthRouteOptions): Middleware;
|
|
9
|
+
//# sourceMappingURL=health-route.d.ts.map
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.HEALTH_PATH = void 0;
|
|
4
|
+
exports.default = createHealthRoute;
|
|
5
|
+
exports.HEALTH_PATH = '/health';
|
|
6
|
+
function createHealthRoute({ config, version }) {
|
|
7
|
+
return async function health(ctx, next) {
|
|
8
|
+
const isHealthRequest = (ctx.method === 'GET' || ctx.method === 'HEAD') && ctx.path === exports.HEALTH_PATH;
|
|
9
|
+
if (!isHealthRequest) {
|
|
10
|
+
await next();
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
ctx.status = config.hasAllRequired ? 200 : 503;
|
|
14
|
+
ctx.body = { status: config.hasAllRequired ? 'ok' : 'degraded', version };
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVhbHRoLXJvdXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2h0dHAvaGVhbHRoLXJvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQVVBLG9DQWNDO0FBckJZLFFBQUEsV0FBVyxHQUFHLFNBQVMsQ0FBQztBQU9yQyxTQUF3QixpQkFBaUIsQ0FBQyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQXNCO0lBQy9FLE9BQU8sS0FBSyxVQUFVLE1BQU0sQ0FBQyxHQUFHLEVBQUUsSUFBSTtRQUNwQyxNQUFNLGVBQWUsR0FDbkIsQ0FBQyxHQUFHLENBQUMsTUFBTSxLQUFLLEtBQUssSUFBSSxHQUFHLENBQUMsTUFBTSxLQUFLLE1BQU0sQ0FBQyxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssbUJBQVcsQ0FBQztRQUU5RSxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDckIsTUFBTSxJQUFJLEVBQUUsQ0FBQztZQUViLE9BQU87UUFDVCxDQUFDO1FBRUQsR0FBRyxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQztRQUMvQyxHQUFHLENBQUMsSUFBSSxHQUFHLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsVUFBVSxFQUFFLE9BQU8sRUFBRSxDQUFDO0lBQzVFLENBQUMsQ0FBQztBQUNKLENBQUMifQ==
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BFF_VERSION_HEADER = void 0;
|
|
4
|
+
exports.default = createVersionHeaderMiddleware;
|
|
5
|
+
exports.BFF_VERSION_HEADER = 'X-Forest-Bff-Version';
|
|
6
|
+
function createVersionHeaderMiddleware(version) {
|
|
7
|
+
return async function versionHeader(ctx, next) {
|
|
8
|
+
ctx.set(exports.BFF_VERSION_HEADER, version);
|
|
9
|
+
await next();
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi1oZWFkZXItbWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9odHRwL3ZlcnNpb24taGVhZGVyLW1pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBSUEsZ0RBTUM7QUFSWSxRQUFBLGtCQUFrQixHQUFHLHNCQUFzQixDQUFDO0FBRXpELFNBQXdCLDZCQUE2QixDQUFDLE9BQWU7SUFDbkUsT0FBTyxLQUFLLFVBQVUsYUFBYSxDQUFDLEdBQUcsRUFBRSxJQUFJO1FBQzNDLEdBQUcsQ0FBQyxHQUFHLENBQUMsMEJBQWtCLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFFckMsTUFBTSxJQUFJLEVBQUUsQ0FBQztJQUNmLENBQUMsQ0FBQztBQUNKLENBQUMifQ==
|
package/dist/index.d.ts
CHANGED
|
@@ -2,6 +2,8 @@ export { default as BFFHttpServer } from './http/bff-http-server';
|
|
|
2
2
|
export { parseConfig, REQUIRED_KEYS } from './config/env-config';
|
|
3
3
|
export type { BFFConfig, PresenceMap, RequiredKey } from './config/env-config';
|
|
4
4
|
export { default as runCli } from './cli-core';
|
|
5
|
+
export { default as buildBff } from './build-bff';
|
|
6
|
+
export type { Bff, BuildBffOptions, BffCallback } from './build-bff';
|
|
5
7
|
export { ConfigurationError } from './errors';
|
|
6
8
|
export { default as DEFAULT_BFF_PORT } from './defaults';
|
|
7
9
|
export { default as createConsoleLogger } from './adapters/console-logger';
|
package/dist/index.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.toApiKeyErrorBody = exports.keyResolutionUnavailable = exports.invalidRequest = exports.forestIdentityNotAllowed = exports.invalidApiKey = exports.ApiKeyError = exports.BFF_KEY_HEADER = exports.createApiKeyMiddleware = exports.createApiKeyAuthenticator = exports.createResolveCache = exports.ApiKeyResolveError = exports.ApiKeyClient = exports.AGENT_TOKEN_EXPIRES_IN = exports.issueAgentToken = exports.fingerprintApiKey = exports.hashApiKey = exports.parseApiKey = exports.OAuthRequestError = exports.createPkcePair = exports.BFF_ACCESS_TOKEN_TYPE = exports.issueBffAccessToken = exports.ensureFreshServerAccess = exports.createTokenCipher = exports.createInMemorySessionStore = exports.createOAuthRoutes = exports.OAuthExchangeError = exports.ForestServerClient = exports.version = exports.createConsoleLogger = exports.DEFAULT_BFF_PORT = exports.ConfigurationError = exports.runCli = exports.REQUIRED_KEYS = exports.parseConfig = exports.BFFHttpServer = void 0;
|
|
6
|
+
exports.toApiKeyErrorBody = exports.keyResolutionUnavailable = exports.invalidRequest = exports.forestIdentityNotAllowed = exports.invalidApiKey = exports.ApiKeyError = exports.BFF_KEY_HEADER = exports.createApiKeyMiddleware = exports.createApiKeyAuthenticator = exports.createResolveCache = exports.ApiKeyResolveError = exports.ApiKeyClient = exports.AGENT_TOKEN_EXPIRES_IN = exports.issueAgentToken = exports.fingerprintApiKey = exports.hashApiKey = exports.parseApiKey = exports.OAuthRequestError = exports.createPkcePair = exports.BFF_ACCESS_TOKEN_TYPE = exports.issueBffAccessToken = exports.ensureFreshServerAccess = exports.createTokenCipher = exports.createInMemorySessionStore = exports.createOAuthRoutes = exports.OAuthExchangeError = exports.ForestServerClient = exports.version = exports.createConsoleLogger = exports.DEFAULT_BFF_PORT = exports.ConfigurationError = exports.buildBff = exports.runCli = exports.REQUIRED_KEYS = exports.parseConfig = exports.BFFHttpServer = void 0;
|
|
7
7
|
var bff_http_server_1 = require("./http/bff-http-server");
|
|
8
8
|
Object.defineProperty(exports, "BFFHttpServer", { enumerable: true, get: function () { return __importDefault(bff_http_server_1).default; } });
|
|
9
9
|
var env_config_1 = require("./config/env-config");
|
|
@@ -11,6 +11,8 @@ Object.defineProperty(exports, "parseConfig", { enumerable: true, get: function
|
|
|
11
11
|
Object.defineProperty(exports, "REQUIRED_KEYS", { enumerable: true, get: function () { return env_config_1.REQUIRED_KEYS; } });
|
|
12
12
|
var cli_core_1 = require("./cli-core");
|
|
13
13
|
Object.defineProperty(exports, "runCli", { enumerable: true, get: function () { return __importDefault(cli_core_1).default; } });
|
|
14
|
+
var build_bff_1 = require("./build-bff");
|
|
15
|
+
Object.defineProperty(exports, "buildBff", { enumerable: true, get: function () { return __importDefault(build_bff_1).default; } });
|
|
14
16
|
var errors_1 = require("./errors");
|
|
15
17
|
Object.defineProperty(exports, "ConfigurationError", { enumerable: true, get: function () { return errors_1.ConfigurationError; } });
|
|
16
18
|
var defaults_1 = require("./defaults");
|
|
@@ -61,4 +63,4 @@ Object.defineProperty(exports, "forestIdentityNotAllowed", { enumerable: true, g
|
|
|
61
63
|
Object.defineProperty(exports, "invalidRequest", { enumerable: true, get: function () { return api_key_error_1.invalidRequest; } });
|
|
62
64
|
Object.defineProperty(exports, "keyResolutionUnavailable", { enumerable: true, get: function () { return api_key_error_1.keyResolutionUnavailable; } });
|
|
63
65
|
Object.defineProperty(exports, "toApiKeyErrorBody", { enumerable: true, get: function () { return api_key_error_1.toErrorBody; } });
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsMERBQWtFO0FBQXpELGlJQUFBLE9BQU8sT0FBaUI7QUFDakMsa0RBQWlFO0FBQXhELHlHQUFBLFdBQVcsT0FBQTtBQUFFLDJHQUFBLGFBQWEsT0FBQTtBQUVuQyx1Q0FBK0M7QUFBdEMsbUhBQUEsT0FBTyxPQUFVO0FBQzFCLHlDQUFrRDtBQUF6QyxzSEFBQSxPQUFPLE9BQVk7QUFFNUIsbUNBQThDO0FBQXJDLDRHQUFBLGtCQUFrQixPQUFBO0FBQzNCLHVDQUF5RDtBQUFoRCw2SEFBQSxPQUFPLE9BQW9CO0FBQ3BDLDREQUEyRTtBQUFsRSxzSUFBQSxPQUFPLE9BQXVCO0FBRXZDLHFDQUErQztBQUF0QyxtSEFBQSxPQUFPLE9BQVc7QUFDM0IscUVBQWlHO0FBQXhGLDJJQUFBLE9BQU8sT0FBc0I7QUFBRSwwSEFBQSxrQkFBa0IsT0FBQTtBQU0xRCxxREFBb0U7QUFBM0Qsa0lBQUEsT0FBTyxPQUFxQjtBQUNyQyx1REFBOEU7QUFBckUsNElBQUEsT0FBTyxPQUE4QjtBQUU5QyxxREFBb0U7QUFBM0Qsa0lBQUEsT0FBTyxPQUFxQjtBQUNyQywrREFBK0U7QUFBdEUsNklBQUEsT0FBTyxPQUEyQjtBQUMzQywrQ0FBK0U7QUFBdEUsZ0hBQUEsbUJBQW1CLE9BQUE7QUFBRSxrSEFBQSxxQkFBcUIsT0FBQTtBQUVuRCxxQ0FBOEM7QUFBckMsc0dBQUEsY0FBYyxPQUFBO0FBQ3ZCLG1EQUF3RDtBQUEvQyxnSEFBQSxpQkFBaUIsT0FBQTtBQUMxQiw2Q0FBK0U7QUFBdEUsc0dBQUEsV0FBVyxPQUFBO0FBQUUscUdBQUEsVUFBVSxPQUFBO0FBQUUsNEdBQUEsaUJBQWlCLE9BQUE7QUFFbkQscURBQWdGO0FBQXZFLDhHQUFBLGVBQWUsT0FBQTtBQUFFLHFIQUFBLHNCQUFzQixPQUFBO0FBQ2hELDJEQUF1RjtBQUE5RSwrSEFBQSxPQUFPLE9BQWdCO0FBQUUsb0hBQUEsa0JBQWtCLE9BQUE7QUFNcEQseURBQXdFO0FBQS9ELG9JQUFBLE9BQU8sT0FBc0I7QUFFdEMseUVBQXVGO0FBQTlFLG1KQUFBLE9BQU8sT0FBNkI7QUFNN0MsbUVBQWlHO0FBQXhGLDZJQUFBLE9BQU8sT0FBMEI7QUFBRSxvSEFBQSxjQUFjLE9BQUE7QUFDMUQseURBT2lDO0FBTi9CLDRHQUFBLFdBQVcsT0FBQTtBQUNYLDhHQUFBLGFBQWEsT0FBQTtBQUNiLHlIQUFBLHdCQUF3QixPQUFBO0FBQ3hCLCtHQUFBLGNBQWMsT0FBQTtBQUNkLHlIQUFBLHdCQUF3QixPQUFBO0FBQ3hCLGtIQUFBLFdBQVcsT0FBcUIifQ==
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A failed environment id read, told apart by whether retrying can ever help: a Forest server that
|
|
3
|
+
* answers and refuses is a configuration error that will never resolve, anything else is transport.
|
|
4
|
+
* Consumers log the first at `Error` and the second at `Warn`, which is the only thing that lets an
|
|
5
|
+
* operator distinguish a wrong FOREST_ENV_SECRET from a SaaS blip.
|
|
6
|
+
*/
|
|
7
|
+
export default class EnvironmentFetchError extends Error {
|
|
8
|
+
readonly permanent: boolean;
|
|
9
|
+
static fromStatus(status: number, statusText: string): EnvironmentFetchError;
|
|
10
|
+
constructor(message: string, permanent: boolean);
|
|
11
|
+
}
|
|
12
|
+
/** Anything that is not a refusal from the Forest server — a socket error, a timeout — may heal. */
|
|
13
|
+
export declare function isPermanentEnvironmentFailure(error: unknown): boolean;
|
|
14
|
+
export declare function environmentFailureLevel(error: unknown): 'Error' | 'Warn';
|
|
15
|
+
//# sourceMappingURL=environment-fetch-error.d.ts.map
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isPermanentEnvironmentFailure = isPermanentEnvironmentFailure;
|
|
4
|
+
exports.environmentFailureLevel = environmentFailureLevel;
|
|
5
|
+
/** Rate limiting is the one 4xx that heals on its own. */
|
|
6
|
+
const RETRYABLE_CLIENT_STATUS = 429;
|
|
7
|
+
function isPermanentStatus(status) {
|
|
8
|
+
return status >= 400 && status < 500 && status !== RETRYABLE_CLIENT_STATUS;
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* A failed environment id read, told apart by whether retrying can ever help: a Forest server that
|
|
12
|
+
* answers and refuses is a configuration error that will never resolve, anything else is transport.
|
|
13
|
+
* Consumers log the first at `Error` and the second at `Warn`, which is the only thing that lets an
|
|
14
|
+
* operator distinguish a wrong FOREST_ENV_SECRET from a SaaS blip.
|
|
15
|
+
*/
|
|
16
|
+
class EnvironmentFetchError extends Error {
|
|
17
|
+
static fromStatus(status, statusText) {
|
|
18
|
+
return new EnvironmentFetchError(`Failed to fetch environment: ${status} ${statusText}`, isPermanentStatus(status));
|
|
19
|
+
}
|
|
20
|
+
constructor(message, permanent) {
|
|
21
|
+
super(message);
|
|
22
|
+
this.name = 'EnvironmentFetchError';
|
|
23
|
+
this.permanent = permanent;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
exports.default = EnvironmentFetchError;
|
|
27
|
+
/** Anything that is not a refusal from the Forest server — a socket error, a timeout — may heal. */
|
|
28
|
+
function isPermanentEnvironmentFailure(error) {
|
|
29
|
+
return error instanceof EnvironmentFetchError && error.permanent;
|
|
30
|
+
}
|
|
31
|
+
function environmentFailureLevel(error) {
|
|
32
|
+
return isPermanentEnvironmentFailure(error) ? 'Error' : 'Warn';
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52aXJvbm1lbnQtZmV0Y2gtZXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvb2F1dGgvZW52aXJvbm1lbnQtZmV0Y2gtZXJyb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUErQkEsc0VBRUM7QUFFRCwwREFFQztBQXJDRCwwREFBMEQ7QUFDMUQsTUFBTSx1QkFBdUIsR0FBRyxHQUFHLENBQUM7QUFFcEMsU0FBUyxpQkFBaUIsQ0FBQyxNQUFjO0lBQ3ZDLE9BQU8sTUFBTSxJQUFJLEdBQUcsSUFBSSxNQUFNLEdBQUcsR0FBRyxJQUFJLE1BQU0sS0FBSyx1QkFBdUIsQ0FBQztBQUM3RSxDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxNQUFxQixxQkFBc0IsU0FBUSxLQUFLO0lBR3RELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBYyxFQUFFLFVBQWtCO1FBQ2xELE9BQU8sSUFBSSxxQkFBcUIsQ0FDOUIsZ0NBQWdDLE1BQU0sSUFBSSxVQUFVLEVBQUUsRUFDdEQsaUJBQWlCLENBQUMsTUFBTSxDQUFDLENBQzFCLENBQUM7SUFDSixDQUFDO0lBRUQsWUFBWSxPQUFlLEVBQUUsU0FBa0I7UUFDN0MsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsSUFBSSxDQUFDLElBQUksR0FBRyx1QkFBdUIsQ0FBQztRQUNwQyxJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUM3QixDQUFDO0NBQ0Y7QUFmRCx3Q0FlQztBQUVELG9HQUFvRztBQUNwRyxTQUFnQiw2QkFBNkIsQ0FBQyxLQUFjO0lBQzFELE9BQU8sS0FBSyxZQUFZLHFCQUFxQixJQUFJLEtBQUssQ0FBQyxTQUFTLENBQUM7QUFDbkUsQ0FBQztBQUVELFNBQWdCLHVCQUF1QixDQUFDLEtBQWM7SUFDcEQsT0FBTyw2QkFBNkIsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUM7QUFDakUsQ0FBQyJ9
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type ForestServerClient from './forest-server-client';
|
|
2
|
+
import type { Logger } from '../ports/logger-port';
|
|
3
|
+
/** Resolves the Forest environment id, on demand rather than at boot. */
|
|
4
|
+
export type EnvironmentIdResolver = () => Promise<number>;
|
|
5
|
+
/**
|
|
6
|
+
* Fetch the environment id at most once per success, and hold a failure only for `FAILURE_TTL_MS`:
|
|
7
|
+
* a Forest server that is briefly unreachable must not disable the routes that need the id for the
|
|
8
|
+
* life of the process, which is what resolving it at boot did. Concurrent callers share the
|
|
9
|
+
* in-flight fetch.
|
|
10
|
+
*
|
|
11
|
+
* The three consumers deliberately disagree on what a failure means, because the id is worth a
|
|
12
|
+
* different amount to each: `/oauth/authorize` cannot mint a login without it and surfaces
|
|
13
|
+
* `server_error`, the AI relay cannot address the proxy without it and refuses the query, and
|
|
14
|
+
* `/agent/v1/context` merely decorates its payload with it and drops the field (see
|
|
15
|
+
* `tolerateEnvironmentIdFailure`).
|
|
16
|
+
*/
|
|
17
|
+
export default function createEnvironmentIdResolver(client: Pick<ForestServerClient, 'fetchEnvironmentId'>, now?: () => number): EnvironmentIdResolver;
|
|
18
|
+
/**
|
|
19
|
+
* The context payload carries the environment id when there is one, and drops it when the Forest
|
|
20
|
+
* server cannot be reached — the route itself must keep answering either way. A refusal from the
|
|
21
|
+
* Forest server is logged at `Error` because it will never resolve on its own; a transport failure
|
|
22
|
+
* stays a `Warn`.
|
|
23
|
+
*/
|
|
24
|
+
export declare function tolerateEnvironmentIdFailure(resolveEnvironmentId: EnvironmentIdResolver, logger: Logger): () => Promise<number | undefined>;
|
|
25
|
+
//# sourceMappingURL=environment-id.d.ts.map
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = createEnvironmentIdResolver;
|
|
4
|
+
exports.tolerateEnvironmentIdFailure = tolerateEnvironmentIdFailure;
|
|
5
|
+
const environment_fetch_error_1 = require("./environment-fetch-error");
|
|
6
|
+
/**
|
|
7
|
+
* How long a failure is remembered. Short enough that a transient outage still heals on the next
|
|
8
|
+
* request — the whole point of resolving lazily — long enough that a burst of requests costs the
|
|
9
|
+
* Forest server one round trip instead of one each, and costs the caller one deadline instead of
|
|
10
|
+
* one per request.
|
|
11
|
+
*/
|
|
12
|
+
const FAILURE_TTL_MS = 5000;
|
|
13
|
+
/**
|
|
14
|
+
* Fetch the environment id at most once per success, and hold a failure only for `FAILURE_TTL_MS`:
|
|
15
|
+
* a Forest server that is briefly unreachable must not disable the routes that need the id for the
|
|
16
|
+
* life of the process, which is what resolving it at boot did. Concurrent callers share the
|
|
17
|
+
* in-flight fetch.
|
|
18
|
+
*
|
|
19
|
+
* The three consumers deliberately disagree on what a failure means, because the id is worth a
|
|
20
|
+
* different amount to each: `/oauth/authorize` cannot mint a login without it and surfaces
|
|
21
|
+
* `server_error`, the AI relay cannot address the proxy without it and refuses the query, and
|
|
22
|
+
* `/agent/v1/context` merely decorates its payload with it and drops the field (see
|
|
23
|
+
* `tolerateEnvironmentIdFailure`).
|
|
24
|
+
*/
|
|
25
|
+
function createEnvironmentIdResolver(client, now = Date.now) {
|
|
26
|
+
let environmentId;
|
|
27
|
+
let inFlight = null;
|
|
28
|
+
let failedAt;
|
|
29
|
+
let failure;
|
|
30
|
+
return async function resolveEnvironmentId() {
|
|
31
|
+
if (environmentId !== undefined)
|
|
32
|
+
return environmentId;
|
|
33
|
+
if (failedAt !== undefined && now() - failedAt < FAILURE_TTL_MS)
|
|
34
|
+
throw failure;
|
|
35
|
+
inFlight ?? (inFlight = client
|
|
36
|
+
.fetchEnvironmentId()
|
|
37
|
+
.then(resolved => {
|
|
38
|
+
environmentId = resolved;
|
|
39
|
+
failedAt = undefined;
|
|
40
|
+
return resolved;
|
|
41
|
+
})
|
|
42
|
+
.catch(error => {
|
|
43
|
+
failedAt = now();
|
|
44
|
+
failure = error;
|
|
45
|
+
throw error;
|
|
46
|
+
})
|
|
47
|
+
.finally(() => {
|
|
48
|
+
inFlight = null;
|
|
49
|
+
}));
|
|
50
|
+
return inFlight;
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* The context payload carries the environment id when there is one, and drops it when the Forest
|
|
55
|
+
* server cannot be reached — the route itself must keep answering either way. A refusal from the
|
|
56
|
+
* Forest server is logged at `Error` because it will never resolve on its own; a transport failure
|
|
57
|
+
* stays a `Warn`.
|
|
58
|
+
*/
|
|
59
|
+
function tolerateEnvironmentIdFailure(resolveEnvironmentId, logger) {
|
|
60
|
+
return async function resolveOrForget() {
|
|
61
|
+
try {
|
|
62
|
+
return await resolveEnvironmentId();
|
|
63
|
+
}
|
|
64
|
+
catch (error) {
|
|
65
|
+
logger((0, environment_fetch_error_1.environmentFailureLevel)(error), 'Serving the context without an environment id', {
|
|
66
|
+
cause: error instanceof Error ? error.message : String(error),
|
|
67
|
+
});
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52aXJvbm1lbnQtaWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvb2F1dGgvZW52aXJvbm1lbnQtaWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUE0QkEsOENBaUNDO0FBUUQsb0VBZUM7QUFqRkQsdUVBQW9FO0FBS3BFOzs7OztHQUtHO0FBQ0gsTUFBTSxjQUFjLEdBQUcsSUFBSyxDQUFDO0FBRTdCOzs7Ozs7Ozs7OztHQVdHO0FBQ0gsU0FBd0IsMkJBQTJCLENBQ2pELE1BQXNELEVBQ3RELE1BQW9CLElBQUksQ0FBQyxHQUFHO0lBRTVCLElBQUksYUFBaUMsQ0FBQztJQUN0QyxJQUFJLFFBQVEsR0FBMkIsSUFBSSxDQUFDO0lBQzVDLElBQUksUUFBNEIsQ0FBQztJQUNqQyxJQUFJLE9BQWdCLENBQUM7SUFFckIsT0FBTyxLQUFLLFVBQVUsb0JBQW9CO1FBQ3hDLElBQUksYUFBYSxLQUFLLFNBQVM7WUFBRSxPQUFPLGFBQWEsQ0FBQztRQUN0RCxJQUFJLFFBQVEsS0FBSyxTQUFTLElBQUksR0FBRyxFQUFFLEdBQUcsUUFBUSxHQUFHLGNBQWM7WUFBRSxNQUFNLE9BQU8sQ0FBQztRQUUvRSxRQUFRLEtBQVIsUUFBUSxHQUFLLE1BQU07YUFDaEIsa0JBQWtCLEVBQUU7YUFDcEIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQ2YsYUFBYSxHQUFHLFFBQVEsQ0FBQztZQUN6QixRQUFRLEdBQUcsU0FBUyxDQUFDO1lBRXJCLE9BQU8sUUFBUSxDQUFDO1FBQ2xCLENBQUMsQ0FBQzthQUNELEtBQUssQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNiLFFBQVEsR0FBRyxHQUFHLEVBQUUsQ0FBQztZQUNqQixPQUFPLEdBQUcsS0FBSyxDQUFDO1lBRWhCLE1BQU0sS0FBSyxDQUFDO1FBQ2QsQ0FBQyxDQUFDO2FBQ0QsT0FBTyxDQUFDLEdBQUcsRUFBRTtZQUNaLFFBQVEsR0FBRyxJQUFJLENBQUM7UUFDbEIsQ0FBQyxDQUFDLEVBQUM7UUFFTCxPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDLENBQUM7QUFDSixDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxTQUFnQiw0QkFBNEIsQ0FDMUMsb0JBQTJDLEVBQzNDLE1BQWM7SUFFZCxPQUFPLEtBQUssVUFBVSxlQUFlO1FBQ25DLElBQUksQ0FBQztZQUNILE9BQU8sTUFBTSxvQkFBb0IsRUFBRSxDQUFDO1FBQ3RDLENBQUM7UUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1lBQ2YsTUFBTSxDQUFDLElBQUEsaURBQXVCLEVBQUMsS0FBSyxDQUFDLEVBQUUsK0NBQStDLEVBQUU7Z0JBQ3RGLEtBQUssRUFBRSxLQUFLLFlBQVksS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDO2FBQzlELENBQUMsQ0FBQztZQUVILE9BQU8sU0FBUyxDQUFDO1FBQ25CLENBQUM7SUFDSCxDQUFDLENBQUM7QUFDSixDQUFDIn0=
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { UserInfo } from '@forestadmin/forestadmin-client';
|
|
2
|
+
import EnvironmentFetchError from './environment-fetch-error';
|
|
2
3
|
import OAuthExchangeError from './oauth-exchange-error';
|
|
3
|
-
export { OAuthExchangeError };
|
|
4
|
+
export { EnvironmentFetchError, OAuthExchangeError };
|
|
4
5
|
export interface RegisteredClient {
|
|
5
6
|
client_id: string;
|
|
6
7
|
client_name?: string;
|
|
@@ -3,15 +3,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.OAuthExchangeError = void 0;
|
|
6
|
+
exports.OAuthExchangeError = exports.EnvironmentFetchError = void 0;
|
|
7
7
|
const forestadmin_client_1 = __importDefault(require("@forestadmin/forestadmin-client"));
|
|
8
8
|
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
9
|
+
const environment_fetch_error_1 = __importDefault(require("./environment-fetch-error"));
|
|
10
|
+
exports.EnvironmentFetchError = environment_fetch_error_1.default;
|
|
9
11
|
const oauth_exchange_error_1 = __importDefault(require("./oauth-exchange-error"));
|
|
10
12
|
exports.OAuthExchangeError = oauth_exchange_error_1.default;
|
|
11
13
|
const DEFAULT_HEADERS = { 'Content-Type': 'application/json' };
|
|
12
14
|
const REQUEST_TIMEOUT_MS = 60000;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
+
/**
|
|
16
|
+
* The environment id sits on the critical path of routes that only decorate their payload with it,
|
|
17
|
+
* and it is a configuration read rather than a user operation: it gets a deadline of its own, short
|
|
18
|
+
* enough that a Forest server which accepts the connection and then never answers costs seconds
|
|
19
|
+
* instead of a minute per request.
|
|
20
|
+
*/
|
|
21
|
+
const ENVIRONMENT_TIMEOUT_MS = 5000;
|
|
22
|
+
function fetchWithTimeout(url, init, timeoutMs = REQUEST_TIMEOUT_MS) {
|
|
23
|
+
return fetch(url, { ...init, signal: AbortSignal.timeout(timeoutMs) });
|
|
15
24
|
}
|
|
16
25
|
class ForestServerClient {
|
|
17
26
|
constructor({ forestServerUrl, envSecret }) {
|
|
@@ -26,18 +35,18 @@ class ForestServerClient {
|
|
|
26
35
|
const response = await fetchWithTimeout(this.url('/liana/environment'), {
|
|
27
36
|
method: 'GET',
|
|
28
37
|
headers: { ...DEFAULT_HEADERS, 'forest-secret-key': this.envSecret },
|
|
29
|
-
});
|
|
38
|
+
}, ENVIRONMENT_TIMEOUT_MS);
|
|
30
39
|
if (!response.ok) {
|
|
31
|
-
throw
|
|
40
|
+
throw environment_fetch_error_1.default.fromStatus(response.status, response.statusText);
|
|
32
41
|
}
|
|
33
42
|
const body = (await response.json());
|
|
34
43
|
const id = body.data?.id;
|
|
35
44
|
if (typeof id !== 'number' && (typeof id !== 'string' || !/^\d+$/.test(id))) {
|
|
36
|
-
throw new
|
|
45
|
+
throw new environment_fetch_error_1.default('Failed to parse environment id from the Forest server response', true);
|
|
37
46
|
}
|
|
38
47
|
const environmentId = Number(id);
|
|
39
48
|
if (!Number.isInteger(environmentId) || environmentId <= 0) {
|
|
40
|
-
throw new
|
|
49
|
+
throw new environment_fetch_error_1.default('Failed to parse environment id from the Forest server response', true);
|
|
41
50
|
}
|
|
42
51
|
return environmentId;
|
|
43
52
|
}
|
|
@@ -101,4 +110,4 @@ class ForestServerClient {
|
|
|
101
110
|
}
|
|
102
111
|
}
|
|
103
112
|
exports.default = ForestServerClient;
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9yZXN0LXNlcnZlci1jbGllbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvb2F1dGgvZm9yZXN0LXNlcnZlci1jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBRUEseUZBQXNFO0FBQ3RFLGdFQUF3QztBQUV4Qyx3RkFBOEQ7QUFHckQsZ0NBSEYsaUNBQXFCLENBR0U7QUFGOUIsa0ZBQXdEO0FBRXhCLDZCQUZ6Qiw4QkFBa0IsQ0FFeUI7QUE0QmxELE1BQU0sZUFBZSxHQUFHLEVBQUUsY0FBYyxFQUFFLGtCQUFrQixFQUFXLENBQUM7QUFDeEUsTUFBTSxrQkFBa0IsR0FBRyxLQUFNLENBQUM7QUFFbEM7Ozs7O0dBS0c7QUFDSCxNQUFNLHNCQUFzQixHQUFHLElBQUssQ0FBQztBQUVyQyxTQUFTLGdCQUFnQixDQUN2QixHQUFXLEVBQ1gsSUFBaUIsRUFDakIsU0FBUyxHQUFHLGtCQUFrQjtJQUU5QixPQUFPLEtBQUssQ0FBQyxHQUFHLEVBQUUsRUFBRSxHQUFHLElBQUksRUFBRSxNQUFNLEVBQUUsV0FBVyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUM7QUFDekUsQ0FBQztBQUVELE1BQXFCLGtCQUFrQjtJQUtyQyxZQUFZLEVBQUUsZUFBZSxFQUFFLFNBQVMsRUFBNkI7UUFDbkUsSUFBSSxDQUFDLGVBQWUsR0FBRyxlQUFlLENBQUM7UUFDdkMsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7UUFDM0IsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFBLDRCQUF1QixFQUFDLEVBQUUsZUFBZSxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDOUUsQ0FBQztJQUVPLEdBQUcsQ0FBQyxJQUFZO1FBQ3RCLE9BQU8sSUFBSSxHQUFHLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUN4RCxDQUFDO0lBRUQsS0FBSyxDQUFDLGtC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
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { EnvironmentIdResolver } from './environment-id';
|
|
1
2
|
import type ForestServerClient from './forest-server-client';
|
|
2
3
|
import type { SessionStore } from './session-store';
|
|
3
4
|
import type { Logger } from '../ports/logger-port';
|
|
@@ -7,7 +8,7 @@ export interface OAuthRoutesOptions {
|
|
|
7
8
|
sessionStore: SessionStore;
|
|
8
9
|
forestAppUrl: string;
|
|
9
10
|
authSecret: string;
|
|
10
|
-
|
|
11
|
+
resolveEnvironmentId: EnvironmentIdResolver;
|
|
11
12
|
logger: Logger;
|
|
12
13
|
}
|
|
13
14
|
export default function createOAuthRoutes(options: OAuthRoutesOptions): Middleware;
|
|
@@ -63,6 +63,23 @@ function mapIdentityError(error) {
|
|
|
63
63
|
}
|
|
64
64
|
return new oauth_error_1.OAuthRequestError(502, 'identity_resolution_failed', 'Failed to resolve identity');
|
|
65
65
|
}
|
|
66
|
+
/**
|
|
67
|
+
* The id is only needed once the redirect_uri is trusted, so a resolution failure travels back to
|
|
68
|
+
* the client as `server_error` (RFC 6749 §4.1.2.1) instead of a bare 500. Logged at `Error` whatever
|
|
69
|
+
* the cause: the route still answers 302, so no status-code alert can fire, and every login is
|
|
70
|
+
* broken until the id resolves.
|
|
71
|
+
*/
|
|
72
|
+
async function resolveEnvironmentId(options) {
|
|
73
|
+
try {
|
|
74
|
+
return await options.resolveEnvironmentId();
|
|
75
|
+
}
|
|
76
|
+
catch (error) {
|
|
77
|
+
options.logger('Error', 'Could not resolve the Forest environment id', {
|
|
78
|
+
cause: error instanceof Error ? error.message : String(error),
|
|
79
|
+
});
|
|
80
|
+
throw (0, oauth_error_1.serverError)('Could not resolve the Forest environment', error);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
66
83
|
function redirectAuthorizeError(ctx, redirectUri, state, error) {
|
|
67
84
|
const target = new URL(redirectUri);
|
|
68
85
|
target.searchParams.set('error', error.type);
|
|
@@ -114,7 +131,7 @@ async function handleAuthorize(ctx, options) {
|
|
|
114
131
|
authorizeUrl.searchParams.set('code_challenge', codeChallenge);
|
|
115
132
|
authorizeUrl.searchParams.set('code_challenge_method', 'S256');
|
|
116
133
|
authorizeUrl.searchParams.set('state', state);
|
|
117
|
-
authorizeUrl.searchParams.set('environmentId', String(options
|
|
134
|
+
authorizeUrl.searchParams.set('environmentId', String(await resolveEnvironmentId(options)));
|
|
118
135
|
ctx.redirect(authorizeUrl.toString());
|
|
119
136
|
}
|
|
120
137
|
catch (error) {
|
|
@@ -349,4 +366,4 @@ function createOAuthRoutes(options) {
|
|
|
349
366
|
}
|
|
350
367
|
};
|
|
351
368
|
}
|
|
352
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"oauth-routes.js","sourceRoot":"","sources":["../../src/oauth/oauth-routes.ts"],"names":[],"mappings":"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"}
|
|
369
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"oauth-routes.js","sourceRoot":"","sources":["../../src/oauth/oauth-routes.ts"],"names":[],"mappings":"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"}
|