unleash-server 4.19.0-beta.1 → 4.19.0-beta.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/dist/lib/middleware/cors-origin-middleware.d.ts +2 -2
- package/dist/lib/middleware/cors-origin-middleware.js +16 -9
- package/dist/lib/middleware/cors-origin-middleware.js.map +1 -1
- package/dist/lib/middleware/cors-origin-middleware.test.js +69 -31
- package/dist/lib/middleware/cors-origin-middleware.test.js.map +1 -1
- package/dist/lib/routes/admin-api/config.d.ts +2 -1
- package/dist/lib/routes/admin-api/config.js +4 -3
- package/dist/lib/routes/admin-api/config.js.map +1 -1
- package/dist/lib/server-impl.js +1 -0
- package/dist/lib/server-impl.js.map +1 -1
- package/dist/lib/services/index.js +1 -0
- package/dist/lib/services/index.js.map +1 -1
- package/dist/lib/services/proxy-service.d.ts +9 -2
- package/dist/lib/services/proxy-service.js +35 -1
- package/dist/lib/services/proxy-service.js.map +1 -1
- package/dist/lib/services/setting-service.d.ts +0 -4
- package/dist/lib/services/setting-service.js +2 -29
- package/dist/lib/services/setting-service.js.map +1 -1
- package/dist/test/e2e/api/admin/config.e2e.test.js +1 -1
- package/dist/test/e2e/api/admin/config.e2e.test.js.map +1 -1
- package/dist/test/e2e/helpers/database-init.js +1 -0
- package/dist/test/e2e/helpers/database-init.js.map +1 -1
- package/dist/test/e2e/helpers/test-helper.js +1 -0
- package/dist/test/e2e/helpers/test-helper.js.map +1 -1
- package/frontend/build/index.html +1 -1
- package/frontend/build/static/{FeatureMetricsChart.d1bee175.js → FeatureMetricsChart.7a3c46df.js} +1 -1
- package/frontend/build/static/{Playground.492d9f28.js → Playground.fdddf3b5.js} +1 -1
- package/frontend/build/static/{index.0b73d7ac.js → index.9a703745.js} +84 -84
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { RequestHandler } from 'express';
|
|
2
2
|
import { IUnleashConfig, IUnleashServices } from '../types';
|
|
3
|
-
export declare const
|
|
4
|
-
export declare const corsOriginMiddleware: ({
|
|
3
|
+
export declare const resolveOrigin: (allowedOrigins: string[]) => string | string[];
|
|
4
|
+
export declare const corsOriginMiddleware: ({ proxyService }: Pick<IUnleashServices, 'proxyService'>, config: IUnleashConfig) => RequestHandler;
|
|
@@ -3,24 +3,31 @@ 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.corsOriginMiddleware = exports.
|
|
6
|
+
exports.corsOriginMiddleware = exports.resolveOrigin = void 0;
|
|
7
7
|
const cors_1 = __importDefault(require("cors"));
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
return
|
|
11
|
-
}
|
|
8
|
+
const resolveOrigin = (allowedOrigins) => {
|
|
9
|
+
if (allowedOrigins.length === 0) {
|
|
10
|
+
return '*';
|
|
11
|
+
}
|
|
12
|
+
if (allowedOrigins.some((origin) => origin === '*')) {
|
|
13
|
+
return '*';
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
return allowedOrigins;
|
|
17
|
+
}
|
|
12
18
|
};
|
|
13
|
-
exports.
|
|
19
|
+
exports.resolveOrigin = resolveOrigin;
|
|
14
20
|
// Check the request's Origin header against a list of allowed origins.
|
|
15
21
|
// The list may include '*', which `cors` does not support natively.
|
|
16
|
-
const corsOriginMiddleware = ({
|
|
22
|
+
const corsOriginMiddleware = ({ proxyService }, config) => {
|
|
17
23
|
return (0, cors_1.default)(async (req, callback) => {
|
|
18
24
|
try {
|
|
19
|
-
const { frontendApiOrigins = [] } = await
|
|
25
|
+
const { frontendApiOrigins = [] } = await proxyService.getFrontendSettings();
|
|
20
26
|
callback(null, {
|
|
21
|
-
origin: (0, exports.
|
|
27
|
+
origin: (0, exports.resolveOrigin)(frontendApiOrigins),
|
|
22
28
|
maxAge: config.accessControlMaxAge,
|
|
23
29
|
exposedHeaders: 'ETag',
|
|
30
|
+
credentials: true,
|
|
24
31
|
});
|
|
25
32
|
}
|
|
26
33
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cors-origin-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/cors-origin-middleware.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAGjB,MAAM,
|
|
1
|
+
{"version":3,"file":"cors-origin-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/cors-origin-middleware.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAGjB,MAAM,aAAa,GAAG,CAAC,cAAwB,EAAqB,EAAE;IACzE,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,GAAG,CAAC;KACd;IACD,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,KAAK,GAAG,CAAC,EAAE;QACzD,OAAO,GAAG,CAAC;KACd;SAAM;QACH,OAAO,cAAc,CAAC;KACzB;AACL,CAAC,CAAC;AATW,QAAA,aAAa,iBASxB;AAEF,uEAAuE;AACvE,oEAAoE;AAC7D,MAAM,oBAAoB,GAAG,CAChC,EAAE,YAAY,EAA0C,EACxD,MAAsB,EACR,EAAE;IAChB,OAAO,IAAA,cAAI,EAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;QAChC,IAAI;YACA,MAAM,EAAE,kBAAkB,GAAG,EAAE,EAAE,GAC7B,MAAM,YAAY,CAAC,mBAAmB,EAAE,CAAC;YAC7C,QAAQ,CAAC,IAAI,EAAE;gBACX,MAAM,EAAE,IAAA,qBAAa,EAAC,kBAAkB,CAAC;gBACzC,MAAM,EAAE,MAAM,CAAC,mBAAmB;gBAClC,cAAc,EAAE,MAAM;gBACtB,WAAW,EAAE,IAAI;aACpB,CAAC,CAAC;SACN;QAAC,OAAO,KAAK,EAAE;YACZ,QAAQ,CAAC,KAAK,CAAC,CAAC;SACnB;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAlBW,QAAA,oBAAoB,wBAkB/B"}
|
|
@@ -5,73 +5,111 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const cors_origin_middleware_1 = require("./cors-origin-middleware");
|
|
7
7
|
const fake_setting_store_1 = __importDefault(require("../../test/fixtures/fake-setting-store"));
|
|
8
|
-
const setting_service_1 = __importDefault(require("../services/setting-service"));
|
|
9
8
|
const test_config_1 = require("../../test/config/test-config");
|
|
10
9
|
const fake_event_store_1 = __importDefault(require("../../test/fixtures/fake-event-store"));
|
|
11
10
|
const random_id_1 = require("../util/random-id");
|
|
12
|
-
const
|
|
11
|
+
const fake_project_store_1 = __importDefault(require("../../test/fixtures/fake-project-store"));
|
|
12
|
+
const services_1 = require("../../lib/services");
|
|
13
|
+
const frontend_settings_1 = require("../../lib/types/settings/frontend-settings");
|
|
14
|
+
const date_fns_1 = require("date-fns");
|
|
13
15
|
const createSettingService = (frontendApiOrigins) => {
|
|
14
16
|
const config = (0, test_config_1.createTestConfig)({ frontendApiOrigins });
|
|
15
17
|
const stores = {
|
|
16
18
|
settingStore: new fake_setting_store_1.default(),
|
|
17
19
|
eventStore: new fake_event_store_1.default(),
|
|
20
|
+
projectStore: new fake_project_store_1.default(),
|
|
21
|
+
};
|
|
22
|
+
const services = {
|
|
23
|
+
settingService: new services_1.SettingService(stores, config),
|
|
24
|
+
};
|
|
25
|
+
return {
|
|
26
|
+
//@ts-ignore
|
|
27
|
+
proxyService: new services_1.ProxyService(config, stores, services),
|
|
28
|
+
settingStore: stores.settingStore,
|
|
18
29
|
};
|
|
19
|
-
return new setting_service_1.default(stores, config);
|
|
20
30
|
};
|
|
21
|
-
test('
|
|
31
|
+
test('resolveOrigin', () => {
|
|
22
32
|
const dotCom = 'https://example.com';
|
|
23
33
|
const dotOrg = 'https://example.org';
|
|
24
|
-
expect((0, cors_origin_middleware_1.
|
|
25
|
-
expect((0, cors_origin_middleware_1.
|
|
26
|
-
expect((0, cors_origin_middleware_1.
|
|
27
|
-
expect((0, cors_origin_middleware_1.
|
|
28
|
-
expect((0, cors_origin_middleware_1.
|
|
29
|
-
expect((0, cors_origin_middleware_1.allowRequestOrigin)(dotCom, [dotCom, dotCom])).toEqual(true);
|
|
30
|
-
expect((0, cors_origin_middleware_1.allowRequestOrigin)(dotCom, ['*'])).toEqual(true);
|
|
31
|
-
expect((0, cors_origin_middleware_1.allowRequestOrigin)(dotCom, [dotOrg, '*'])).toEqual(true);
|
|
32
|
-
expect((0, cors_origin_middleware_1.allowRequestOrigin)(dotCom, [dotCom, dotOrg, '*'])).toEqual(true);
|
|
34
|
+
expect((0, cors_origin_middleware_1.resolveOrigin)([])).toEqual('*');
|
|
35
|
+
expect((0, cors_origin_middleware_1.resolveOrigin)(['*'])).toEqual('*');
|
|
36
|
+
expect((0, cors_origin_middleware_1.resolveOrigin)([dotOrg])).toEqual([dotOrg]);
|
|
37
|
+
expect((0, cors_origin_middleware_1.resolveOrigin)([dotCom, dotOrg])).toEqual([dotCom, dotOrg]);
|
|
38
|
+
expect((0, cors_origin_middleware_1.resolveOrigin)([dotOrg, '*'])).toEqual('*');
|
|
33
39
|
});
|
|
34
40
|
test('corsOriginMiddleware origin validation', async () => {
|
|
35
|
-
const
|
|
41
|
+
const { proxyService } = createSettingService([]);
|
|
36
42
|
const userName = (0, random_id_1.randomId)();
|
|
37
|
-
await expect(() =>
|
|
43
|
+
await expect(() => proxyService.setFrontendSettings({ frontendApiOrigins: ['a'] }, userName)).rejects.toThrow('Invalid origin: a');
|
|
44
|
+
proxyService.destroy();
|
|
38
45
|
});
|
|
39
46
|
test('corsOriginMiddleware without config', async () => {
|
|
40
|
-
const
|
|
47
|
+
const { proxyService, settingStore } = createSettingService([]);
|
|
41
48
|
const userName = (0, random_id_1.randomId)();
|
|
42
|
-
expect(await
|
|
49
|
+
expect(await proxyService.getFrontendSettings(false)).toEqual({
|
|
43
50
|
frontendApiOrigins: [],
|
|
44
51
|
});
|
|
45
|
-
await
|
|
46
|
-
expect(await
|
|
52
|
+
await proxyService.setFrontendSettings({ frontendApiOrigins: [] }, userName);
|
|
53
|
+
expect(await proxyService.getFrontendSettings(false)).toEqual({
|
|
47
54
|
frontendApiOrigins: [],
|
|
48
55
|
});
|
|
49
|
-
await
|
|
50
|
-
expect(await
|
|
56
|
+
await proxyService.setFrontendSettings({ frontendApiOrigins: ['*'] }, userName);
|
|
57
|
+
expect(await proxyService.getFrontendSettings(false)).toEqual({
|
|
51
58
|
frontendApiOrigins: ['*'],
|
|
52
59
|
});
|
|
53
|
-
await
|
|
54
|
-
expect(await
|
|
60
|
+
await settingStore.delete(frontend_settings_1.frontendSettingsKey);
|
|
61
|
+
expect(await proxyService.getFrontendSettings(false)).toEqual({
|
|
55
62
|
frontendApiOrigins: [],
|
|
56
63
|
});
|
|
64
|
+
proxyService.destroy();
|
|
57
65
|
});
|
|
58
66
|
test('corsOriginMiddleware with config', async () => {
|
|
59
|
-
const
|
|
67
|
+
const { proxyService, settingStore } = createSettingService(['*']);
|
|
60
68
|
const userName = (0, random_id_1.randomId)();
|
|
61
|
-
expect(await
|
|
69
|
+
expect(await proxyService.getFrontendSettings(false)).toEqual({
|
|
62
70
|
frontendApiOrigins: ['*'],
|
|
63
71
|
});
|
|
64
|
-
await
|
|
65
|
-
expect(await
|
|
72
|
+
await proxyService.setFrontendSettings({ frontendApiOrigins: [] }, userName);
|
|
73
|
+
expect(await proxyService.getFrontendSettings(false)).toEqual({
|
|
66
74
|
frontendApiOrigins: [],
|
|
67
75
|
});
|
|
68
|
-
await
|
|
69
|
-
expect(await
|
|
76
|
+
await proxyService.setFrontendSettings({ frontendApiOrigins: ['https://example.com', 'https://example.org'] }, userName);
|
|
77
|
+
expect(await proxyService.getFrontendSettings(false)).toEqual({
|
|
70
78
|
frontendApiOrigins: ['https://example.com', 'https://example.org'],
|
|
71
79
|
});
|
|
72
|
-
await
|
|
73
|
-
expect(await
|
|
80
|
+
await settingStore.delete(frontend_settings_1.frontendSettingsKey);
|
|
81
|
+
expect(await proxyService.getFrontendSettings(false)).toEqual({
|
|
74
82
|
frontendApiOrigins: ['*'],
|
|
75
83
|
});
|
|
84
|
+
proxyService.destroy();
|
|
85
|
+
});
|
|
86
|
+
test('corsOriginMiddleware with caching enabled', async () => {
|
|
87
|
+
jest.useFakeTimers();
|
|
88
|
+
const { proxyService } = createSettingService([]);
|
|
89
|
+
const userName = (0, random_id_1.randomId)();
|
|
90
|
+
expect(await proxyService.getFrontendSettings()).toEqual({
|
|
91
|
+
frontendApiOrigins: [],
|
|
92
|
+
});
|
|
93
|
+
//setting
|
|
94
|
+
await proxyService.setFrontendSettings({ frontendApiOrigins: ['*'] }, userName);
|
|
95
|
+
//still get cached value
|
|
96
|
+
expect(await proxyService.getFrontendSettings()).toEqual({
|
|
97
|
+
frontendApiOrigins: [],
|
|
98
|
+
});
|
|
99
|
+
jest.advanceTimersByTime((0, date_fns_1.minutesToMilliseconds)(2));
|
|
100
|
+
jest.useRealTimers();
|
|
101
|
+
/*
|
|
102
|
+
This is needed because it is not enough to fake time to test the
|
|
103
|
+
updated cache, we also need to make sure that all promises are
|
|
104
|
+
executed and completed, in the right order.
|
|
105
|
+
*/
|
|
106
|
+
await new Promise((resolve) => process.nextTick(async () => {
|
|
107
|
+
const settings = await proxyService.getFrontendSettings();
|
|
108
|
+
expect(settings).toEqual({
|
|
109
|
+
frontendApiOrigins: ['*'],
|
|
110
|
+
});
|
|
111
|
+
resolve();
|
|
112
|
+
}));
|
|
113
|
+
proxyService.destroy();
|
|
76
114
|
});
|
|
77
115
|
//# sourceMappingURL=cors-origin-middleware.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cors-origin-middleware.test.js","sourceRoot":"","sources":["../../../src/lib/middleware/cors-origin-middleware.test.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"cors-origin-middleware.test.js","sourceRoot":"","sources":["../../../src/lib/middleware/cors-origin-middleware.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,10 @@ import { SetUiConfigSchema } from '../../openapi/spec/set-ui-config-schema';
|
|
|
9
9
|
declare class ConfigController extends Controller {
|
|
10
10
|
private versionService;
|
|
11
11
|
private settingService;
|
|
12
|
+
private proxyService;
|
|
12
13
|
private emailService;
|
|
13
14
|
private readonly openApiService;
|
|
14
|
-
constructor(config: IUnleashConfig, { versionService, settingService, emailService, openApiService, }: Pick<IUnleashServices, 'versionService' | 'settingService' | 'emailService' | 'openApiService'>);
|
|
15
|
+
constructor(config: IUnleashConfig, { versionService, settingService, emailService, openApiService, proxyService, }: Pick<IUnleashServices, 'versionService' | 'settingService' | 'emailService' | 'openApiService' | 'proxyService'>);
|
|
15
16
|
getUiConfig(req: AuthedRequest, res: Response<UiConfigSchema>): Promise<void>;
|
|
16
17
|
setUiConfig(req: IAuthRequest<void, void, SetUiConfigSchema>, res: Response<string>): Promise<void>;
|
|
17
18
|
}
|
|
@@ -15,12 +15,13 @@ const extract_user_1 = require("../../util/extract-user");
|
|
|
15
15
|
const notfound_error_1 = __importDefault(require("../../error/notfound-error"));
|
|
16
16
|
const create_request_schema_1 = require("../../openapi/util/create-request-schema");
|
|
17
17
|
class ConfigController extends controller_1.default {
|
|
18
|
-
constructor(config, { versionService, settingService, emailService, openApiService, }) {
|
|
18
|
+
constructor(config, { versionService, settingService, emailService, openApiService, proxyService, }) {
|
|
19
19
|
super(config);
|
|
20
20
|
this.versionService = versionService;
|
|
21
21
|
this.settingService = settingService;
|
|
22
22
|
this.emailService = emailService;
|
|
23
23
|
this.openApiService = openApiService;
|
|
24
|
+
this.proxyService = proxyService;
|
|
24
25
|
this.route({
|
|
25
26
|
method: 'get',
|
|
26
27
|
path: '',
|
|
@@ -53,7 +54,7 @@ class ConfigController extends controller_1.default {
|
|
|
53
54
|
}
|
|
54
55
|
async getUiConfig(req, res) {
|
|
55
56
|
const [frontendSettings, simpleAuthSettings] = await Promise.all([
|
|
56
|
-
this.
|
|
57
|
+
this.proxyService.getFrontendSettings(false),
|
|
57
58
|
this.settingService.get(simple_auth_settings_1.simpleAuthSettingsKey),
|
|
58
59
|
]);
|
|
59
60
|
const disablePasswordAuth = simpleAuthSettings?.disabled ||
|
|
@@ -80,7 +81,7 @@ class ConfigController extends controller_1.default {
|
|
|
80
81
|
}
|
|
81
82
|
async setUiConfig(req, res) {
|
|
82
83
|
if (req.body.frontendSettings) {
|
|
83
|
-
await this.
|
|
84
|
+
await this.proxyService.setFrontendSettings(req.body.frontendSettings, (0, extract_user_1.extractUsername)(req));
|
|
84
85
|
res.sendStatus(204);
|
|
85
86
|
return;
|
|
86
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/config.ts"],"names":[],"mappings":";;;;;AAGA,+CAA+D;AAC/D,iEAAyC;AACzC,+DAAuC;AAGvC,oFAGmD;AACnD,yDAAsD;AACtD,sFAAiF;AACjF,0EAG6C;AAG7C,8EAAsE;AAEtE,0DAA0D;AAC1D,gFAAuD;AAEvD,oFAA+E;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/config.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/server-impl.js
CHANGED
|
@@ -78,6 +78,7 @@ async function createApp(config, startApp) {
|
|
|
78
78
|
metricsMonitor.stopMonitoring();
|
|
79
79
|
stores.clientInstanceStore.destroy();
|
|
80
80
|
services.clientMetricsServiceV2.destroy();
|
|
81
|
+
services.proxyService.destroy();
|
|
81
82
|
await db.destroy();
|
|
82
83
|
};
|
|
83
84
|
if (!config.server.secret) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-impl.js","sourceRoot":"","sources":["../../src/lib/server-impl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAAuD;AACvD,+BAAiC;AACjC,6DAAqC;AACrC,0CAAwC;AACxC,gDAA2B;AAC3B,uCAAiD;AACjD,6BAAoC;AACpC,yCAA4C;AAC5C,mDAA+C;AAC/C,6CAA4C;AAC5C,iFAAgE;AAChE,0CAAwC;AACxC,yEAAgD;AAChD,QAAQ;AACR,mCAOiB;
|
|
1
|
+
{"version":3,"file":"server-impl.js","sourceRoot":"","sources":["../../src/lib/server-impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -127,6 +127,7 @@ const createServices = (stores, config) => {
|
|
|
127
127
|
featureToggleServiceV2,
|
|
128
128
|
clientMetricsServiceV2,
|
|
129
129
|
segmentService,
|
|
130
|
+
settingService,
|
|
130
131
|
});
|
|
131
132
|
const edgeService = new edge_service_1.default(stores, config);
|
|
132
133
|
const patService = new pat_service_1.default(stores, config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":";;;;;;AACA,kFAAwD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,15 +2,18 @@ import { IUnleashConfig, IUnleashServices, IUnleashStores } from '../types';
|
|
|
2
2
|
import { ProxyFeatureSchema, ProxyMetricsSchema } from '../openapi';
|
|
3
3
|
import ApiUser from '../types/api-user';
|
|
4
4
|
import { Context } from 'unleash-client';
|
|
5
|
-
|
|
5
|
+
import { FrontendSettings } from '../types/settings/frontend-settings';
|
|
6
|
+
declare type Config = Pick<IUnleashConfig, 'getLogger' | 'frontendApi' | 'frontendApiOrigins'>;
|
|
6
7
|
declare type Stores = Pick<IUnleashStores, 'projectStore' | 'eventStore'>;
|
|
7
|
-
declare type Services = Pick<IUnleashServices, 'featureToggleServiceV2' | 'segmentService' | 'clientMetricsServiceV2'>;
|
|
8
|
+
declare type Services = Pick<IUnleashServices, 'featureToggleServiceV2' | 'segmentService' | 'clientMetricsServiceV2' | 'settingService'>;
|
|
8
9
|
export declare class ProxyService {
|
|
9
10
|
private readonly config;
|
|
10
11
|
private readonly logger;
|
|
11
12
|
private readonly stores;
|
|
12
13
|
private readonly services;
|
|
13
14
|
private readonly clients;
|
|
15
|
+
private cachedFrontendSettings?;
|
|
16
|
+
private timer;
|
|
14
17
|
constructor(config: Config, stores: Stores, services: Services);
|
|
15
18
|
getProxyFeatures(token: ApiUser, context: Context): Promise<ProxyFeatureSchema[]>;
|
|
16
19
|
getAllProxyFeatures(token: ApiUser, context: Context): Promise<ProxyFeatureSchema[]>;
|
|
@@ -20,5 +23,9 @@ export declare class ProxyService {
|
|
|
20
23
|
deleteClientForProxyToken(secret: string): void;
|
|
21
24
|
stopAll(): void;
|
|
22
25
|
private static assertExpectedTokenType;
|
|
26
|
+
setFrontendSettings(value: FrontendSettings, createdBy: string): Promise<void>;
|
|
27
|
+
private fetchFrontendSettings;
|
|
28
|
+
getFrontendSettings(useCache?: boolean): Promise<FrontendSettings>;
|
|
29
|
+
destroy(): void;
|
|
23
30
|
}
|
|
24
31
|
export {};
|
|
@@ -6,8 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.ProxyService = void 0;
|
|
7
7
|
const unleash_client_1 = require("unleash-client");
|
|
8
8
|
const proxy_1 = require("../proxy");
|
|
9
|
-
const assert_1 = __importDefault(require("assert"));
|
|
10
9
|
const api_token_1 = require("../types/models/api-token");
|
|
10
|
+
const frontend_settings_1 = require("../types/settings/frontend-settings");
|
|
11
|
+
const util_1 = require("../util");
|
|
12
|
+
const error_1 = require("../error");
|
|
13
|
+
const assert_1 = __importDefault(require("assert"));
|
|
14
|
+
const date_fns_1 = require("date-fns");
|
|
11
15
|
class ProxyService {
|
|
12
16
|
constructor(config, stores, services) {
|
|
13
17
|
this.clients = new Map();
|
|
@@ -15,6 +19,7 @@ class ProxyService {
|
|
|
15
19
|
this.logger = config.getLogger('services/proxy-service.ts');
|
|
16
20
|
this.stores = stores;
|
|
17
21
|
this.services = services;
|
|
22
|
+
this.timer = setInterval(() => this.fetchFrontendSettings(), (0, date_fns_1.minutesToMilliseconds)(2)).unref();
|
|
18
23
|
}
|
|
19
24
|
async getProxyFeatures(token, context) {
|
|
20
25
|
const client = await this.clientForProxyToken(token);
|
|
@@ -73,6 +78,35 @@ class ProxyService {
|
|
|
73
78
|
static assertExpectedTokenType({ type }) {
|
|
74
79
|
(0, assert_1.default)(type === api_token_1.ApiTokenType.FRONTEND || type === api_token_1.ApiTokenType.ADMIN);
|
|
75
80
|
}
|
|
81
|
+
async setFrontendSettings(value, createdBy) {
|
|
82
|
+
const error = (0, util_1.validateOrigins)(value.frontendApiOrigins);
|
|
83
|
+
if (error) {
|
|
84
|
+
throw new error_1.BadDataError(error);
|
|
85
|
+
}
|
|
86
|
+
await this.services.settingService.insert(frontend_settings_1.frontendSettingsKey, value, createdBy);
|
|
87
|
+
}
|
|
88
|
+
async fetchFrontendSettings() {
|
|
89
|
+
try {
|
|
90
|
+
this.cachedFrontendSettings =
|
|
91
|
+
await this.services.settingService.get(frontend_settings_1.frontendSettingsKey, {
|
|
92
|
+
frontendApiOrigins: this.config.frontendApiOrigins,
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
catch (error) {
|
|
96
|
+
this.logger.debug('Unable to fetch frontend settings');
|
|
97
|
+
}
|
|
98
|
+
return this.cachedFrontendSettings;
|
|
99
|
+
}
|
|
100
|
+
async getFrontendSettings(useCache = true) {
|
|
101
|
+
if (useCache && this.cachedFrontendSettings) {
|
|
102
|
+
return this.cachedFrontendSettings;
|
|
103
|
+
}
|
|
104
|
+
return this.fetchFrontendSettings();
|
|
105
|
+
}
|
|
106
|
+
destroy() {
|
|
107
|
+
clearInterval(this.timer);
|
|
108
|
+
this.timer = null;
|
|
109
|
+
}
|
|
76
110
|
}
|
|
77
111
|
exports.ProxyService = ProxyService;
|
|
78
112
|
//# sourceMappingURL=proxy-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-service.js","sourceRoot":"","sources":["../../../src/lib/services/proxy-service.ts"],"names":[],"mappings":";;;;;;AAIA,mDAMwB;AACxB,oCAA2C;AAC3C,oDAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"proxy-service.js","sourceRoot":"","sources":["../../../src/lib/services/proxy-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,13 @@
|
|
|
1
1
|
import { IUnleashConfig } from '../types/option';
|
|
2
2
|
import { IUnleashStores } from '../types/stores';
|
|
3
|
-
import { FrontendSettings } from '../types/settings/frontend-settings';
|
|
4
3
|
export default class SettingService {
|
|
5
4
|
private config;
|
|
6
5
|
private logger;
|
|
7
6
|
private settingStore;
|
|
8
7
|
private eventStore;
|
|
9
|
-
private cache;
|
|
10
8
|
constructor({ settingStore, eventStore, }: Pick<IUnleashStores, 'settingStore' | 'eventStore'>, config: IUnleashConfig);
|
|
11
9
|
get<T>(id: string, defaultValue?: T): Promise<T>;
|
|
12
10
|
insert(id: string, value: object, createdBy: string): Promise<void>;
|
|
13
11
|
delete(id: string, createdBy: string): Promise<void>;
|
|
14
12
|
deleteAll(): Promise<void>;
|
|
15
|
-
setFrontendSettings(value: FrontendSettings, createdBy: string): Promise<void>;
|
|
16
|
-
getFrontendSettings(): Promise<FrontendSettings>;
|
|
17
13
|
}
|
|
@@ -1,30 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
const events_1 = require("../types/events");
|
|
7
|
-
const validateOrigin_1 = require("../util/validateOrigin");
|
|
8
|
-
const frontend_settings_1 = require("../types/settings/frontend-settings");
|
|
9
|
-
const bad_data_error_1 = __importDefault(require("../error/bad-data-error"));
|
|
10
4
|
class SettingService {
|
|
11
5
|
constructor({ settingStore, eventStore, }, config) {
|
|
12
|
-
// SettingService.getFrontendSettings is called on every request to the
|
|
13
|
-
// frontend API. Keep fetched settings in a cache for fewer DB queries.
|
|
14
|
-
this.cache = new Map();
|
|
15
6
|
this.config = config;
|
|
16
7
|
this.logger = config.getLogger('services/setting-service.ts');
|
|
17
8
|
this.settingStore = settingStore;
|
|
18
9
|
this.eventStore = eventStore;
|
|
19
10
|
}
|
|
20
11
|
async get(id, defaultValue) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
24
|
-
return this.cache.get(id) || defaultValue;
|
|
12
|
+
const value = await this.settingStore.get(id);
|
|
13
|
+
return value || defaultValue;
|
|
25
14
|
}
|
|
26
15
|
async insert(id, value, createdBy) {
|
|
27
|
-
this.cache.delete(id);
|
|
28
16
|
const exists = await this.settingStore.exists(id);
|
|
29
17
|
if (exists) {
|
|
30
18
|
await this.settingStore.updateRow(id, value);
|
|
@@ -42,7 +30,6 @@ class SettingService {
|
|
|
42
30
|
}
|
|
43
31
|
}
|
|
44
32
|
async delete(id, createdBy) {
|
|
45
|
-
this.cache.delete(id);
|
|
46
33
|
await this.settingStore.delete(id);
|
|
47
34
|
await this.eventStore.store(new events_1.SettingDeletedEvent({
|
|
48
35
|
createdBy,
|
|
@@ -52,22 +39,8 @@ class SettingService {
|
|
|
52
39
|
}));
|
|
53
40
|
}
|
|
54
41
|
async deleteAll() {
|
|
55
|
-
this.cache.clear();
|
|
56
42
|
await this.settingStore.deleteAll();
|
|
57
43
|
}
|
|
58
|
-
async setFrontendSettings(value, createdBy) {
|
|
59
|
-
const error = (0, validateOrigin_1.validateOrigins)(value.frontendApiOrigins);
|
|
60
|
-
if (error) {
|
|
61
|
-
throw new bad_data_error_1.default(error);
|
|
62
|
-
}
|
|
63
|
-
await this.insert(frontend_settings_1.frontendSettingsKey, value, createdBy);
|
|
64
|
-
}
|
|
65
|
-
async getFrontendSettings() {
|
|
66
|
-
return this.get(frontend_settings_1.frontendSettingsKey, {
|
|
67
|
-
frontendApiOrigins: this.config.frontendApiOrigins,
|
|
68
|
-
});
|
|
69
|
-
}
|
|
70
44
|
}
|
|
71
45
|
exports.default = SettingService;
|
|
72
|
-
module.exports = SettingService;
|
|
73
46
|
//# sourceMappingURL=setting-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting-service.js","sourceRoot":"","sources":["../../../src/lib/services/setting-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setting-service.js","sourceRoot":"","sources":["../../../src/lib/services/setting-service.ts"],"names":[],"mappings":";;AAKA,4CAIyB;AAEzB,MAAqB,cAAc;IAS/B,YACI,EACI,YAAY,EACZ,UAAU,GACwC,EACtD,MAAsB;QAEtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC;QAC9D,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,GAAG,CAAI,EAAU,EAAE,YAAgB;QACrC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9C,OAAO,KAAK,IAAI,YAAY,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAa,EAAE,SAAiB;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAClD,IAAI,MAAM,EAAE;YACR,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAC7C,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACvB,IAAI,4BAAmB,CAAC;gBACpB,SAAS;gBACT,IAAI,EAAE,EAAE,EAAE,EAAE;aACf,CAAC,CACL,CAAC;SACL;aAAM;YACH,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAC1C,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACvB,IAAI,4BAAmB,CAAC;gBACpB,SAAS;gBACT,IAAI,EAAE,EAAE,EAAE,EAAE;aACf,CAAC,CACL,CAAC;SACL;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,SAAiB;QACtC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACvB,IAAI,4BAAmB,CAAC;YACpB,SAAS;YACT,IAAI,EAAE;gBACF,EAAE;aACL;SACJ,CAAC,CACL,CAAC;IACN,CAAC;IAED,KAAK,CAAC,SAAS;QACX,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC;IACxC,CAAC;CACJ;AA/DD,iCA+DC"}
|
|
@@ -42,7 +42,7 @@ test('gets ui config with disablePasswordAuth', async () => {
|
|
|
42
42
|
});
|
|
43
43
|
test('gets ui config with frontendSettings', async () => {
|
|
44
44
|
const frontendApiOrigins = ['https://example.net'];
|
|
45
|
-
await app.services.
|
|
45
|
+
await app.services.proxyService.setFrontendSettings({ frontendApiOrigins }, (0, random_id_1.randomId)());
|
|
46
46
|
await app.request
|
|
47
47
|
.get('/api/admin/ui-config')
|
|
48
48
|
.expect('Content-Type', /json/)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/admin/config.e2e.test.ts"],"names":[],"mappings":";;;;;AAAA,gFAA8D;AAC9D,2DAAmE;AACnE,4EAAoD;AACpD,8FAA4F;AAC5F,8DAA0D;AAE1D,IAAI,EAAW,CAAC;AAChB,IAAI,GAAiB,CAAC;AAEtB,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,EAAE,GAAG,MAAM,IAAA,uBAAM,EAAC,mBAAmB,EAAE,mBAAS,CAAC,CAAC;IAClD,GAAG,GAAG,MAAM,IAAA,sBAAQ,EAAC,EAAE,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;IAChB,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,UAAU,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC;AAClD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IACrC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,OAAO;SAC7B,GAAG,CAAC,sBAAsB,CAAC;SAC3B,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;SAC9B,MAAM,CAAC,GAAG,CAAC,CAAC;IACjB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACtD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;IACnC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;IACvD,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,4CAAqB,EAAE;QACvD,QAAQ,EAAE,IAAI;KACjB,CAAC,CAAC;IACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,OAAO;SAC7B,GAAG,CAAC,sBAAsB,CAAC;SAC3B,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;SAC9B,MAAM,CAAC,GAAG,CAAC,CAAC;IACjB,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;IACpD,MAAM,kBAAkB,GAAG,CAAC,qBAAqB,CAAC,CAAC;IACnD,MAAM,GAAG,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"config.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/admin/config.e2e.test.ts"],"names":[],"mappings":"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"}
|