@forestadmin/agent 1.0.0-beta.23 → 1.0.0-beta.24
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/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
# @forestadmin/agent [1.0.0-beta.24](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.0.0-beta.23...@forestadmin/agent@1.0.0-beta.24) (2022-05-16)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **onboarding:** display better errors when the agent fails to start ([#294](https://github.com/ForestAdmin/agent-nodejs/issues/294)) ([03f756b](https://github.com/ForestAdmin/agent-nodejs/commit/03f756b9964ba5970d7f5be37b47956fbcf9c5f7))
|
|
7
|
+
|
|
1
8
|
# @forestadmin/agent [1.0.0-beta.23](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.0.0-beta.22...@forestadmin/agent@1.0.0-beta.23) (2022-05-12)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -39,23 +39,34 @@ class ForestAdminHttpDriver {
|
|
|
39
39
|
if (this.status !== 'waiting') {
|
|
40
40
|
throw new Error('Agent cannot be restarted.');
|
|
41
41
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
.
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
42
|
+
try {
|
|
43
|
+
this.status = 'running';
|
|
44
|
+
// Build http application
|
|
45
|
+
const router = new router_1.default({ prefix: path_1.default.join('/', this.options.prefix) });
|
|
46
|
+
this.routes = (0, routes_1.default)(this.dataSource, this.options, this.services);
|
|
47
|
+
this.routes.forEach(route => route.setupRoutes(router));
|
|
48
|
+
await Promise.all(this.routes.map(route => route.bootstrap()));
|
|
49
|
+
this.app
|
|
50
|
+
.use((0, cors_1.default)({ credentials: true, maxAge: 24 * 3600, privateNetworkAccess: true }))
|
|
51
|
+
.use((0, koa_bodyparser_1.default)({ jsonLimit: '50mb' }))
|
|
52
|
+
.use(router.routes());
|
|
53
|
+
// Send schema to forestadmin-server (if relevant).
|
|
54
|
+
const schema = await emitter_1.default.getSerializedSchema(this.options, this.dataSource);
|
|
55
|
+
const schemaIsKnown = await forest_http_api_1.default.hasSchema(this.options, schema.meta.schemaFileHash);
|
|
56
|
+
if (!schemaIsKnown) {
|
|
57
|
+
this.options.logger('Info', 'Schema was updated, sending new version');
|
|
58
|
+
await forest_http_api_1.default.uploadSchema(this.options, schema);
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
this.options.logger('Info', 'Schema was not updated since last run');
|
|
62
|
+
}
|
|
63
|
+
this.options.logger('Info', 'Started');
|
|
64
|
+
}
|
|
65
|
+
catch (e) {
|
|
66
|
+
this.options.logger('Error', e.message);
|
|
67
|
+
this.status = 'done';
|
|
68
|
+
throw e;
|
|
57
69
|
}
|
|
58
|
-
this.options?.logger('Info', 'Started');
|
|
59
70
|
}
|
|
60
71
|
/**
|
|
61
72
|
* Tear down all routes (close open sockets, ...)
|
|
@@ -69,4 +80,4 @@ class ForestAdminHttpDriver {
|
|
|
69
80
|
}
|
|
70
81
|
}
|
|
71
82
|
exports.default = ForestAdminHttpDriver;
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9yZXN0YWRtaW4taHR0cC1kcml2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWdlbnQvZm9yZXN0YWRtaW4taHR0cC1kcml2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFFQSw4Q0FBc0I7QUFDdEIseURBQWlDO0FBQ2pDLG9FQUF3QztBQUN4QyxxREFBNkI7QUFDN0IsZ0RBQXdCO0FBS3hCLDhFQUFvRDtBQUNwRCxzRkFBdUQ7QUFDdkQsNEVBQTBEO0FBQzFELHNEQUFrQztBQUNsQywwREFBeUU7QUFLekUsTUFBcUIscUJBQXFCO0lBa0J4QyxZQUFZLFVBQXNCLEVBQUUsT0FBcUI7UUFkbEQsV0FBTSxHQUFnQixFQUFFLENBQUM7UUFFZixRQUFHLEdBQUcsSUFBSSxhQUFHLEVBQUUsQ0FBQztRQUN6QixXQUFNLEdBQW1DLFNBQVMsQ0FBQztRQVl6RCxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztRQUM3QixJQUFJLENBQUMsT0FBTyxHQUFHLDZCQUFZLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBQSxrQkFBWSxFQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUUzQyw2QkFBWSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQWZEOzs7O09BSUc7SUFDSCxJQUFJLE9BQU87UUFDVCxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQVVEOzs7T0FHRztJQUNILEtBQUssQ0FBQyxLQUFLO1FBQ1QsSUFBSSxJQUFJLENBQUMsTUFBTSxLQUFLLFNBQVMsRUFBRTtZQUM3QixNQUFNLElBQUksS0FBSyxDQUFDLDRCQUE0QixDQUFDLENBQUM7U0FDL0M7UUFFRCxJQUFJO1lBQ0YsSUFBSSxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUM7WUFFeEIseUJBQXlCO1lBQ3pCLE1BQU0sTUFBTSxHQUFHLElBQUksZ0JBQU0sQ0FBQyxFQUFFLE1BQU0sRUFBRSxjQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUMzRSxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUEsZ0JBQVUsRUFBQyxJQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3ZFLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ3hELE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFFL0QsSUFBSSxDQUFDLEdBQUc7aUJBQ0wsR0FBRyxDQUFDLElBQUEsY0FBSSxFQUFDLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsRUFBRSxHQUFHLElBQUksRUFBRSxvQkFBb0IsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO2lCQUMvRSxHQUFHLENBQUMsSUFBQSx3QkFBVSxFQUFDLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7aUJBQ3RDLEdBQUcsQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztZQUV4QixtREFBbUQ7WUFDbkQsTUFBTSxNQUFNLEdBQUcsTUFBTSxpQkFBYSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ3RGLE1BQU0sYUFBYSxHQUFHLE1BQU0seUJBQWEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1lBRTlGLElBQUksQ0FBQyxhQUFhLEVBQUU7Z0JBQ2xCLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSx5Q0FBeUMsQ0FBQyxDQUFDO2dCQUN2RSxNQUFNLHlCQUFhLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUM7YUFDeEQ7aUJBQU07Z0JBQ0wsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLHVDQUF1QyxDQUFDLENBQUM7YUFDdEU7WUFFRCxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7U0FDeEM7UUFBQyxPQUFPLENBQUMsRUFBRTtZQUNWLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDeEMsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7WUFDckIsTUFBTSxDQUFDLENBQUM7U0FDVDtJQUNILENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssQ0FBQyxJQUFJO1FBQ1IsSUFBSSxJQUFJLENBQUMsTUFBTSxLQUFLLFNBQVMsRUFBRTtZQUM3QixNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUM7U0FDMUM7UUFFRCxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztRQUNyQixNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ2hFLENBQUM7Q0FDRjtBQS9FRCx3Q0ErRUMifQ==
|
|
@@ -58,6 +58,7 @@ export default class ForestHttpApi {
|
|
|
58
58
|
private static decodeActionPermissions;
|
|
59
59
|
/** Helper to format permissions into something easy to validate against */
|
|
60
60
|
private static decodeScopePermissions;
|
|
61
|
+
private static handleResponseError;
|
|
61
62
|
}
|
|
62
63
|
export {};
|
|
63
64
|
//# sourceMappingURL=forest-http-api.d.ts.map
|
|
@@ -16,8 +16,8 @@ class ForestHttpApi {
|
|
|
16
16
|
const { attributes } = response.body.data;
|
|
17
17
|
return { isFeatureEnabled: attributes.use_ip_whitelist, ipRules: attributes.rules };
|
|
18
18
|
}
|
|
19
|
-
catch {
|
|
20
|
-
|
|
19
|
+
catch (e) {
|
|
20
|
+
this.handleResponseError(e);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
static async getOpenIdIssuerMetadata(options) {
|
|
@@ -27,8 +27,8 @@ class ForestHttpApi {
|
|
|
27
27
|
.set('forest-secret-key', options.envSecret);
|
|
28
28
|
return response.body;
|
|
29
29
|
}
|
|
30
|
-
catch {
|
|
31
|
-
|
|
30
|
+
catch (e) {
|
|
31
|
+
this.handleResponseError(e);
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
static async getUserInformation(options, renderingId, accessToken) {
|
|
@@ -50,16 +50,21 @@ class ForestHttpApi {
|
|
|
50
50
|
renderingId,
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
|
-
catch {
|
|
54
|
-
|
|
53
|
+
catch (e) {
|
|
54
|
+
this.handleResponseError(e);
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
static async hasSchema(options, hash) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
58
|
+
try {
|
|
59
|
+
const response = await superagent_1.default
|
|
60
|
+
.post(new URL('/forest/apimaps/hashcheck', options.forestServerUrl).toString())
|
|
61
|
+
.send({ schemaFileHash: hash })
|
|
62
|
+
.set('forest-secret-key', options.envSecret);
|
|
63
|
+
return !response?.body?.sendSchema;
|
|
64
|
+
}
|
|
65
|
+
catch (e) {
|
|
66
|
+
this.handleResponseError(e);
|
|
67
|
+
}
|
|
63
68
|
}
|
|
64
69
|
static async uploadSchema(options, apimap) {
|
|
65
70
|
try {
|
|
@@ -69,48 +74,31 @@ class ForestHttpApi {
|
|
|
69
74
|
.set('forest-secret-key', options.envSecret);
|
|
70
75
|
}
|
|
71
76
|
catch (e) {
|
|
72
|
-
|
|
73
|
-
let message;
|
|
74
|
-
switch (e.response?.status) {
|
|
75
|
-
case 0:
|
|
76
|
-
message = 'Cannot send the apimap to Forest. Are you online?';
|
|
77
|
-
break;
|
|
78
|
-
case 404:
|
|
79
|
-
message =
|
|
80
|
-
'Cannot find the project related to the envSecret you configured. ' +
|
|
81
|
-
'Can you check on Forest that you copied it properly in the Forest initialization?';
|
|
82
|
-
break;
|
|
83
|
-
case 503:
|
|
84
|
-
message =
|
|
85
|
-
'Forest is in maintenance for a few minutes. ' +
|
|
86
|
-
'We are upgrading your experience in the forest. ' +
|
|
87
|
-
'We just need a few more minutes to get it right.';
|
|
88
|
-
break;
|
|
89
|
-
default:
|
|
90
|
-
message =
|
|
91
|
-
'An error occured with the apimap sent to Forest. ' +
|
|
92
|
-
'Please contact support@forestadmin.com for further investigations.';
|
|
93
|
-
}
|
|
94
|
-
throw new Error(message);
|
|
77
|
+
this.handleResponseError(e);
|
|
95
78
|
}
|
|
96
79
|
}
|
|
97
80
|
static async getPermissions(options, renderingId) {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
81
|
+
try {
|
|
82
|
+
const { body } = await superagent_1.default
|
|
83
|
+
.get(`${options.forestServerUrl}/liana/v3/permissions`)
|
|
84
|
+
.set('forest-secret-key', options.envSecret)
|
|
85
|
+
.query(`renderingId=${renderingId}`);
|
|
86
|
+
if (!body.meta?.rolesACLActivated) {
|
|
87
|
+
throw new Error('Roles V2 are unsupported');
|
|
88
|
+
}
|
|
89
|
+
const actions = new Set();
|
|
90
|
+
const actionsByUser = {};
|
|
91
|
+
ForestHttpApi.decodeChartPermissions(body?.stats ?? {}, actions);
|
|
92
|
+
ForestHttpApi.decodeActionPermissions(body?.data?.collections ?? {}, actions, actionsByUser);
|
|
93
|
+
return {
|
|
94
|
+
actions,
|
|
95
|
+
actionsByUser,
|
|
96
|
+
scopes: ForestHttpApi.decodeScopePermissions(body?.data?.renderings?.[renderingId] ?? {}),
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
catch (e) {
|
|
100
|
+
this.handleResponseError(e);
|
|
104
101
|
}
|
|
105
|
-
const actions = new Set();
|
|
106
|
-
const actionsByUser = {};
|
|
107
|
-
ForestHttpApi.decodeChartPermissions(body?.stats ?? {}, actions);
|
|
108
|
-
ForestHttpApi.decodeActionPermissions(body?.data?.collections ?? {}, actions, actionsByUser);
|
|
109
|
-
return {
|
|
110
|
-
actions,
|
|
111
|
-
actionsByUser,
|
|
112
|
-
scopes: ForestHttpApi.decodeScopePermissions(body?.data?.renderings?.[renderingId] ?? {}),
|
|
113
|
-
};
|
|
114
102
|
}
|
|
115
103
|
/** Helper to format permissions into something easy to validate against */
|
|
116
104
|
static decodeChartPermissions(chartsByType, actions) {
|
|
@@ -168,6 +156,26 @@ class ForestHttpApi {
|
|
|
168
156
|
}
|
|
169
157
|
return scopes;
|
|
170
158
|
}
|
|
159
|
+
static handleResponseError(e) {
|
|
160
|
+
if (/certificate/i.test(e.message))
|
|
161
|
+
throw new Error('ForestAdmin server TLS certificate cannot be verified. ' +
|
|
162
|
+
'Please check that your system time is set properly.');
|
|
163
|
+
if (e.response) {
|
|
164
|
+
const status = e?.response?.status;
|
|
165
|
+
// 0 == offline, 502 == bad gateway from proxy
|
|
166
|
+
if (status === 0 || status === 502)
|
|
167
|
+
throw new Error('Failed to reach ForestAdmin server. Are you online?');
|
|
168
|
+
if (status === 404)
|
|
169
|
+
throw new Error('ForestAdmin server failed to find the project related to the envSecret you configured.' +
|
|
170
|
+
' Can you check that you copied it properly in the Forest initialization?');
|
|
171
|
+
if (status === 503)
|
|
172
|
+
throw new Error('Forest is in maintenance for a few minutes. We are upgrading your experience in ' +
|
|
173
|
+
'the forest. We just need a few more minutes to get it right.');
|
|
174
|
+
throw new Error('An unexpected error occured while contacting the ForestAdmin server. ' +
|
|
175
|
+
'Please contact support@forestadmin.com for further investigations.');
|
|
176
|
+
}
|
|
177
|
+
throw e;
|
|
178
|
+
}
|
|
171
179
|
}
|
|
172
180
|
exports.default = ForestHttpApi;
|
|
173
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"forest-http-api.js","sourceRoot":"","sources":["../../../src/agent/utils/forest-http-api.ts"],"names":[],"mappings":"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"}
|