@forestadmin/forestadmin-client 1.1.8 → 1.1.10
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/forest-admin-client-with-cache.d.ts +2 -2
- package/dist/forest-admin-client-with-cache.js +3 -3
- package/dist/schema/index.d.ts +3 -3
- package/dist/schema/index.js +7 -18
- package/dist/schema/types.d.ts +11 -0
- package/dist/schema/types.js +1 -1
- package/dist/types.d.ts +2 -2
- package/package.json +2 -2
|
@@ -7,7 +7,7 @@ import { IpWhitelistConfiguration } from './ip-whitelist/types';
|
|
|
7
7
|
import RenderingPermissionService from './permissions/rendering-permission';
|
|
8
8
|
import { RawTree } from './permissions/types';
|
|
9
9
|
import SchemaService from './schema';
|
|
10
|
-
import {
|
|
10
|
+
import { ForestSchema } from './schema/types';
|
|
11
11
|
import { ForestAdminClient, ForestAdminClientOptionsWithDefaults, PermissionService } from './types';
|
|
12
12
|
import ContextVariablesInstantiator from './utils/context-variables-instantiator';
|
|
13
13
|
export default class ForestAdminClientWithCache implements ForestAdminClient {
|
|
@@ -22,7 +22,7 @@ export default class ForestAdminClientWithCache implements ForestAdminClient {
|
|
|
22
22
|
constructor(options: ForestAdminClientOptionsWithDefaults, permissionService: PermissionService, renderingPermissionService: RenderingPermissionService, contextVariablesInstantiator: ContextVariablesInstantiator, chartHandler: ChartHandler, ipWhitelistService: IpWhiteListService, schemaService: SchemaService, authService: AuthService);
|
|
23
23
|
verifySignedActionParameters<TSignedParameters>(signedParameters: string): TSignedParameters;
|
|
24
24
|
getIpWhitelistConfiguration(): Promise<IpWhitelistConfiguration>;
|
|
25
|
-
postSchema(schema:
|
|
25
|
+
postSchema(schema: ForestSchema): Promise<boolean>;
|
|
26
26
|
getOpenIdClient(): Promise<Client>;
|
|
27
27
|
getUserInfo(renderingId: number, accessToken: string): Promise<UserInfo>;
|
|
28
28
|
getScope({ renderingId, userId, collectionName, }: {
|
|
@@ -21,8 +21,8 @@ class ForestAdminClientWithCache {
|
|
|
21
21
|
getIpWhitelistConfiguration() {
|
|
22
22
|
return this.ipWhitelistService.getConfiguration();
|
|
23
23
|
}
|
|
24
|
-
async postSchema(schema
|
|
25
|
-
return this.schemaService.postSchema(schema
|
|
24
|
+
async postSchema(schema) {
|
|
25
|
+
return this.schemaService.postSchema(schema);
|
|
26
26
|
}
|
|
27
27
|
getOpenIdClient() {
|
|
28
28
|
return this.authService.getOpenIdClient();
|
|
@@ -42,4 +42,4 @@ class ForestAdminClientWithCache {
|
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
exports.default = ForestAdminClientWithCache;
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9yZXN0LWFkbWluLWNsaWVudC13aXRoLWNhY2hlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZvcmVzdC1hZG1pbi1jbGllbnQtd2l0aC1jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQVNBLG9GQUFxRTtBQVVyRSxNQUFxQiwwQkFBMEI7SUFDN0MsWUFDcUIsT0FBNkMsRUFDaEQsaUJBQW9DLEVBQ2pDLDBCQUFzRCxFQUN6RCw0QkFBMEQsRUFDMUQsWUFBMEIsRUFDdkIsa0JBQXNDLEVBQ3RDLGFBQTRCLEVBQzVCLFdBQXdCO1FBUHhCLFlBQU8sR0FBUCxPQUFPLENBQXNDO1FBQ2hELHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBbUI7UUFDakMsK0JBQTBCLEdBQTFCLDBCQUEwQixDQUE0QjtRQUN6RCxpQ0FBNEIsR0FBNUIsNEJBQTRCLENBQThCO1FBQzFELGlCQUFZLEdBQVosWUFBWSxDQUFjO1FBQ3ZCLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7UUFDdEMsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFDNUIsZ0JBQVcsR0FBWCxXQUFXLENBQWE7SUFDMUMsQ0FBQztJQUVKLDRCQUE0QixDQUFvQixnQkFBd0I7UUFDdEUsT0FBTyxJQUFBLHlCQUF3QixFQUFDLGdCQUFnQixFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDNUUsQ0FBQztJQUVELDJCQUEyQjtRQUN6QixPQUFPLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO0lBQ3BELENBQUM7SUFFRCxLQUFLLENBQUMsVUFBVSxDQUFDLE1BQW9CO1FBQ25DLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVELGVBQWU7UUFDYixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsZUFBZSxFQUFFLENBQUM7SUFDNUMsQ0FBQztJQUVELFdBQVcsQ0FBQyxXQUFtQixFQUFFLFdBQW1CO1FBQ2xELE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsV0FBVyxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ2hFLENBQUM7SUFFTSxLQUFLLENBQUMsUUFBUSxDQUFDLEVBQ3BCLFdBQVcsRUFDWCxNQUFNLEVBQ04sY0FBYyxHQUtmO1FBQ0MsT0FBTyxJQUFJLENBQUMsMEJBQTBCLENBQUMsUUFBUSxDQUFDO1lBQzlDLFdBQVc7WUFDWCxjQUFjO1lBQ2QsTUFBTTtTQUNQLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTSxtQkFBbUIsQ0FBQyxXQUE0QjtRQUNyRCxJQUFJLENBQUMsMEJBQTBCLENBQUMsZUFBZSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQy9ELENBQUM7Q0FDRjtBQW5ERCw2Q0FtREMifQ==
|
package/dist/schema/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ForestSchema } from './types';
|
|
2
2
|
import { ForestAdminClientOptionsWithDefaults } from '../types';
|
|
3
3
|
type SerializedSchema = {
|
|
4
4
|
meta: {
|
|
@@ -8,8 +8,8 @@ type SerializedSchema = {
|
|
|
8
8
|
export default class SchemaService {
|
|
9
9
|
private options;
|
|
10
10
|
constructor(options: ForestAdminClientOptionsWithDefaults);
|
|
11
|
-
postSchema(schema:
|
|
12
|
-
static serialize(schema:
|
|
11
|
+
postSchema(schema: ForestSchema): Promise<boolean>;
|
|
12
|
+
static serialize(schema: ForestSchema): SerializedSchema;
|
|
13
13
|
private static get serializer();
|
|
14
14
|
private doServerWantsSchema;
|
|
15
15
|
}
|
package/dist/schema/index.js
CHANGED
|
@@ -10,30 +10,19 @@ class SchemaService {
|
|
|
10
10
|
constructor(options) {
|
|
11
11
|
this.options = options;
|
|
12
12
|
}
|
|
13
|
-
async postSchema(schema
|
|
14
|
-
const apimap = SchemaService.serialize(schema
|
|
13
|
+
async postSchema(schema) {
|
|
14
|
+
const apimap = SchemaService.serialize(schema);
|
|
15
15
|
const shouldSend = await this.doServerWantsSchema(apimap.meta.schemaFileHash);
|
|
16
16
|
if (shouldSend) {
|
|
17
17
|
await server_1.default.query(this.options, 'post', '/forest/apimaps', {}, apimap);
|
|
18
18
|
}
|
|
19
19
|
return shouldSend;
|
|
20
20
|
}
|
|
21
|
-
static serialize(schema
|
|
22
|
-
const data = schema.map(c => ({ id: c.name, ...c }));
|
|
23
|
-
const
|
|
24
|
-
liana: agentName,
|
|
25
|
-
liana_version: agentVersion,
|
|
26
|
-
stack: {
|
|
27
|
-
engine: 'nodejs',
|
|
28
|
-
engine_version: process.versions && process.versions.node,
|
|
29
|
-
},
|
|
30
|
-
};
|
|
31
|
-
const schemaFileHash = crypto_1.default
|
|
32
|
-
.createHash('sha1')
|
|
33
|
-
.update(JSON.stringify({ ...schema, meta }))
|
|
34
|
-
.digest('hex');
|
|
21
|
+
static serialize(schema) {
|
|
22
|
+
const data = schema.collections.map(c => ({ id: c.name, ...c }));
|
|
23
|
+
const schemaFileHash = crypto_1.default.createHash('sha1').update(JSON.stringify(schema)).digest('hex');
|
|
35
24
|
return SchemaService.serializer.serialize('collections', data, {
|
|
36
|
-
...
|
|
25
|
+
...schema.metadata,
|
|
37
26
|
schemaFileHash,
|
|
38
27
|
});
|
|
39
28
|
}
|
|
@@ -58,4 +47,4 @@ class SchemaService {
|
|
|
58
47
|
}
|
|
59
48
|
}
|
|
60
49
|
exports.default = SchemaService;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2NoZW1hL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsb0RBQTRCO0FBQzVCLDhFQUFvRDtBQUlwRCw2REFBMEM7QUFJMUMsTUFBcUIsYUFBYTtJQUNoQyxZQUFvQixPQUE2QztRQUE3QyxZQUFPLEdBQVAsT0FBTyxDQUFzQztJQUFHLENBQUM7SUFFckUsS0FBSyxDQUFDLFVBQVUsQ0FBQyxNQUFvQjtRQUNuQyxNQUFNLE1BQU0sR0FBRyxhQUFhLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQy9DLE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7UUFFOUUsSUFBSSxVQUFVLEVBQUU7WUFDZCxNQUFNLGdCQUFXLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLGlCQUFpQixFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQztTQUM5RTtRQUVELE9BQU8sVUFBVSxDQUFDO0lBQ3BCLENBQUM7SUFFRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQW9CO1FBQ25DLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2pFLE1BQU0sY0FBYyxHQUFHLGdCQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRTlGLE9BQU8sYUFBYSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsYUFBYSxFQUFFLElBQUksRUFBRTtZQUM3RCxHQUFHLE1BQU0sQ0FBQyxRQUFRO1lBQ2xCLGNBQWM7U0FDZixDQUFxQixDQUFDO0lBQ3pCLENBQUM7SUFFTyxNQUFNLEtBQUssVUFBVTtRQUMzQixNQUFNLFVBQVUsR0FBRyxJQUFJLDZCQUFpQixFQUFFLENBQUM7UUFDM0MsVUFBVSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUU7WUFDakMscURBQXFEO1lBQ3JELFlBQVksRUFBRSxDQUFDLFNBQWtCLEVBQUUsRUFBRSxDQUFDLFNBQVM7WUFDL0MsYUFBYSxFQUFFO2dCQUNiLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUU7Z0JBQzlCLE9BQU8sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUU7YUFDN0I7U0FDRixDQUFDLENBQUM7UUFDSCxVQUFVLENBQUMsUUFBUSxDQUFDLFVBQVUsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNwQyxVQUFVLENBQUMsUUFBUSxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUVuQyxPQUFPLFVBQVUsQ0FBQztJQUNwQixDQUFDO0lBRU8sS0FBSyxDQUFDLG1CQUFtQixDQUFDLElBQVk7UUFDNUMsd0RBQXdEO1FBQ3hELE1BQU0sRUFBRSxVQUFVLEVBQUUsR0FBRyxNQUFNLGdCQUFXLENBQUMsS0FBSyxDQUM1QyxJQUFJLENBQUMsT0FBTyxFQUNaLE1BQU0sRUFDTiwyQkFBMkIsRUFDM0IsRUFBRSxFQUNGLEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxDQUN6QixDQUFDO1FBRUYsT0FBTyxVQUFVLENBQUM7SUFDcEIsQ0FBQztDQUNGO0FBcERELGdDQW9EQyJ9
|
package/dist/schema/types.d.ts
CHANGED
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
import type { PrimitiveTypes } from '@forestadmin/datasource-toolkit';
|
|
2
|
+
export type ForestSchema = {
|
|
3
|
+
collections: ForestServerCollection[];
|
|
4
|
+
metadata: {
|
|
5
|
+
liana: string;
|
|
6
|
+
liana_version: string;
|
|
7
|
+
stack: {
|
|
8
|
+
engine: string;
|
|
9
|
+
engine_version: string;
|
|
10
|
+
};
|
|
11
|
+
};
|
|
12
|
+
};
|
|
2
13
|
export type ForestServerColumnType = PrimitiveTypes | [ForestServerColumnType] | {
|
|
3
14
|
fields: Array<{
|
|
4
15
|
field: string;
|
package/dist/schema/types.js
CHANGED
|
@@ -13,4 +13,4 @@ var ValidationType;
|
|
|
13
13
|
ValidationType["Contains"] = "contains";
|
|
14
14
|
ValidationType["Like"] = "is like";
|
|
15
15
|
})(ValidationType = exports.ValidationType || (exports.ValidationType = {}));
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2NoZW1hL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQXNGQSxJQUFZLGNBVVg7QUFWRCxXQUFZLGNBQWM7SUFDeEIsd0NBQXNCLENBQUE7SUFDdEIsaURBQStCLENBQUE7SUFDL0IsMkNBQXlCLENBQUE7SUFDekIsc0NBQW9CLENBQUE7SUFDcEIsb0NBQWtCLENBQUE7SUFDbEIsK0NBQTZCLENBQUE7SUFDN0IsaURBQStCLENBQUE7SUFDL0IsdUNBQXFCLENBQUE7SUFDckIsa0NBQWdCLENBQUE7QUFDbEIsQ0FBQyxFQVZXLGNBQWMsR0FBZCxzQkFBYyxLQUFkLHNCQUFjLFFBVXpCIn0=
|
package/dist/types.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import type { Client } from 'openid-client';
|
|
|
4
4
|
import { UserInfo } from './auth/types';
|
|
5
5
|
import { IpWhitelistConfiguration } from './ip-whitelist/types';
|
|
6
6
|
import { CollectionActionEvent, EnvironmentPermissionsV4, RawTree, RawTreeWithSources, RenderingPermissionV4, UserPermissionV4 } from './permissions/types';
|
|
7
|
-
import {
|
|
7
|
+
import { ForestSchema } from './schema/types';
|
|
8
8
|
import ContextVariables, { RequestContextVariables } from './utils/context-variables';
|
|
9
9
|
export type { CollectionActionEvent, RawTree, RawTreeWithSources } from './permissions/types';
|
|
10
10
|
export type LoggerLevel = 'Debug' | 'Info' | 'Warn' | 'Error';
|
|
@@ -22,7 +22,7 @@ export interface ForestAdminClient {
|
|
|
22
22
|
readonly chartHandler: ChartHandlerInterface;
|
|
23
23
|
verifySignedActionParameters<TSignedParameters>(signedParameters: string): TSignedParameters;
|
|
24
24
|
getIpWhitelistConfiguration(): Promise<IpWhitelistConfiguration>;
|
|
25
|
-
postSchema(schema:
|
|
25
|
+
postSchema(schema: ForestSchema): Promise<boolean>;
|
|
26
26
|
getOpenIdClient(): Promise<Client>;
|
|
27
27
|
getUserInfo(renderingId: number, accessToken: string): Promise<UserInfo>;
|
|
28
28
|
getScope(params: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/forestadmin-client",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.10",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"test": "jest"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@forestadmin/datasource-toolkit": "1.4.
|
|
34
|
+
"@forestadmin/datasource-toolkit": "1.4.1",
|
|
35
35
|
"@types/json-api-serializer": "^2.6.3",
|
|
36
36
|
"@types/jsonwebtoken": "^9.0.1",
|
|
37
37
|
"@types/lru-cache": "^7.10.10",
|