unleash-server 4.2.0-2 → 4.2.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -1
- package/dist/lib/addons/datadog-definition.js +7 -0
- package/dist/lib/addons/datadog-definition.js.map +1 -1
- package/dist/lib/addons/datadog.d.ts +5 -0
- package/dist/lib/addons/datadog.js +53 -0
- package/dist/lib/addons/datadog.js.map +1 -1
- package/dist/lib/addons/datadog.test.js +26 -1
- package/dist/lib/addons/datadog.test.js.map +1 -1
- package/dist/lib/addons/slack-definition.js +7 -0
- package/dist/lib/addons/slack-definition.js.map +1 -1
- package/dist/lib/addons/slack.d.ts +5 -0
- package/dist/lib/addons/slack.js +53 -0
- package/dist/lib/addons/slack.js.map +1 -1
- package/dist/lib/addons/slack.test.js +25 -0
- package/dist/lib/addons/slack.test.js.map +1 -1
- package/dist/lib/addons/teams-definition.js +7 -0
- package/dist/lib/addons/teams-definition.js.map +1 -1
- package/dist/lib/addons/teams.d.ts +5 -0
- package/dist/lib/addons/teams.js +53 -0
- package/dist/lib/addons/teams.js.map +1 -1
- package/dist/lib/addons/teams.test.js +25 -0
- package/dist/lib/addons/teams.test.js.map +1 -1
- package/dist/lib/addons/webhook-definition.js +8 -0
- package/dist/lib/addons/webhook-definition.js.map +1 -1
- package/dist/lib/app.js +3 -2
- package/dist/lib/app.js.map +1 -1
- package/dist/lib/create-config.js +25 -3
- package/dist/lib/create-config.js.map +1 -1
- package/dist/{test/e2e/api/admin/project/feature.strategy.e2e.test.d.ts → lib/create-config.test.d.ts} +0 -0
- package/dist/lib/create-config.test.js +57 -0
- package/dist/lib/create-config.test.js.map +1 -0
- package/dist/lib/db/client-instance-store.js +5 -2
- package/dist/lib/db/client-instance-store.js.map +1 -1
- package/dist/lib/db/client-metrics-store-v2.d.ts +19 -0
- package/dist/lib/db/client-metrics-store-v2.js +126 -0
- package/dist/lib/db/client-metrics-store-v2.js.map +1 -0
- package/dist/lib/db/context-field-store.d.ts +5 -5
- package/dist/lib/db/context-field-store.js +2 -7
- package/dist/lib/db/context-field-store.js.map +1 -1
- package/dist/lib/db/feature-environment-store.d.ts +1 -0
- package/dist/lib/db/feature-environment-store.js +13 -1
- package/dist/lib/db/feature-environment-store.js.map +1 -1
- package/dist/lib/db/feature-strategy-store.d.ts +1 -0
- package/dist/lib/db/feature-strategy-store.js +13 -1
- package/dist/lib/db/feature-strategy-store.js.map +1 -1
- package/dist/lib/db/feature-toggle-client-store.js +5 -7
- package/dist/lib/db/feature-toggle-client-store.js.map +1 -1
- package/dist/lib/db/index.js +2 -0
- package/dist/lib/db/index.js.map +1 -1
- package/dist/lib/middleware/demo-authentication.d.ts +2 -1
- package/dist/lib/middleware/demo-authentication.js +33 -10
- package/dist/lib/middleware/demo-authentication.js.map +1 -1
- package/dist/lib/routes/admin-api/client-metrics.d.ts +12 -0
- package/dist/lib/routes/admin-api/client-metrics.js +35 -0
- package/dist/lib/routes/admin-api/client-metrics.js.map +1 -0
- package/dist/lib/routes/admin-api/index.js +2 -0
- package/dist/lib/routes/admin-api/index.js.map +1 -1
- package/dist/lib/routes/admin-api/project/features.d.ts +5 -1
- package/dist/lib/routes/admin-api/project/features.js +12 -6
- package/dist/lib/routes/admin-api/project/features.js.map +1 -1
- package/dist/lib/routes/client-api/metrics.d.ts +5 -1
- package/dist/lib/routes/client-api/metrics.js +22 -5
- package/dist/lib/routes/client-api/metrics.js.map +1 -1
- package/dist/lib/routes/client-api/metrics.test.js +25 -2
- package/dist/lib/routes/client-api/metrics.test.js.map +1 -1
- package/dist/lib/routes/client-api/register.d.ts +4 -2
- package/dist/lib/routes/client-api/register.js +15 -2
- package/dist/lib/routes/client-api/register.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/access-service.js +4 -2
- package/dist/lib/services/access-service.js.map +1 -1
- package/dist/lib/services/client-metrics/client-metrics-service-v2.d.ts +16 -0
- package/dist/lib/services/client-metrics/client-metrics-service-v2.js +68 -0
- package/dist/lib/services/client-metrics/client-metrics-service-v2.js.map +1 -0
- package/dist/lib/services/client-metrics/index.d.ts +0 -1
- package/dist/lib/services/client-metrics/index.js.map +1 -1
- package/dist/lib/services/client-metrics/register-schema.js +1 -0
- package/dist/lib/services/client-metrics/register-schema.js.map +1 -1
- package/dist/lib/services/event-service.js.map +1 -1
- package/dist/lib/services/feature-toggle-service-v2.d.ts +11 -4
- package/dist/lib/services/feature-toggle-service-v2.js +58 -12
- package/dist/lib/services/feature-toggle-service-v2.js.map +1 -1
- package/dist/lib/services/index.js +3 -0
- package/dist/lib/services/index.js.map +1 -1
- package/dist/lib/services/project-service.js +1 -0
- package/dist/lib/services/project-service.js.map +1 -1
- package/dist/lib/services/user-service.js +2 -2
- package/dist/lib/services/user-service.js.map +1 -1
- package/dist/lib/types/model.d.ts +2 -1
- package/dist/lib/types/model.js.map +1 -1
- package/dist/lib/types/models/metrics.d.ts +11 -0
- package/dist/lib/types/models/metrics.js +3 -0
- package/dist/lib/types/models/metrics.js.map +1 -0
- package/dist/lib/types/option.d.ts +16 -1
- package/dist/lib/types/services.d.ts +2 -0
- package/dist/lib/types/stores/client-instance-store.d.ts +1 -0
- package/dist/lib/types/stores/client-metrics-store-v2.d.ts +17 -0
- package/dist/lib/types/stores/client-metrics-store-v2.js +3 -0
- package/dist/lib/types/stores/client-metrics-store-v2.js.map +1 -0
- package/dist/lib/types/stores/feature-environment-store.d.ts +1 -0
- package/dist/lib/types/stores/feature-strategies-store.d.ts +1 -0
- package/dist/lib/types/stores.d.ts +2 -0
- package/dist/migrations/20211004104917-client-metrics-env.d.ts +2 -0
- package/dist/migrations/20211004104917-client-metrics-env.js +22 -0
- package/dist/migrations/20211004104917-client-metrics-env.js.map +1 -0
- package/dist/migrations/20211011094226-add-environment-to-client-instances.d.ts +5 -0
- package/dist/migrations/20211011094226-add-environment-to-client-instances.js +21 -0
- package/dist/migrations/20211011094226-add-environment-to-client-instances.js.map +1 -0
- package/dist/migrations/20211013093114-feature-strategies-parameters-not-null.d.ts +2 -0
- package/dist/migrations/20211013093114-feature-strategies-parameters-not-null.js +12 -0
- package/dist/migrations/20211013093114-feature-strategies-parameters-not-null.js.map +1 -0
- package/dist/server-dev.js +5 -0
- package/dist/server-dev.js.map +1 -1
- package/dist/test/e2e/api/admin/client-metrics.e2e.test.d.ts +1 -0
- package/dist/test/e2e/api/admin/client-metrics.e2e.test.js +219 -0
- package/dist/test/e2e/api/admin/client-metrics.e2e.test.js.map +1 -0
- package/dist/test/e2e/api/admin/context.e2e.test.js +23 -0
- package/dist/test/e2e/api/admin/context.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/features.e2e.test.d.ts +1 -0
- package/dist/test/e2e/api/admin/project/{feature.strategy.e2e.test.js → features.e2e.test.js} +321 -1
- package/dist/test/e2e/api/admin/project/features.e2e.test.js.map +1 -0
- package/dist/test/e2e/api/admin/project/project.health.e2e.test.js +74 -0
- package/dist/test/e2e/api/admin/project/project.health.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/feature.e2e.test.js +11 -12
- package/dist/test/e2e/api/client/feature.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.js +1 -1
- package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/metrics.e2e.test.js +2 -5
- package/dist/test/e2e/api/client/metrics.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/metricsV2.e2e.test.d.ts +1 -0
- package/dist/test/e2e/api/client/metricsV2.e2e.test.js +95 -0
- package/dist/test/e2e/api/client/metricsV2.e2e.test.js.map +1 -0
- package/dist/test/e2e/helpers/test-helper.d.ts +1 -1
- package/dist/test/e2e/helpers/test-helper.js +4 -5
- package/dist/test/e2e/helpers/test-helper.js.map +1 -1
- package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js +1 -1
- package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/user-service.e2e.test.js +12 -0
- package/dist/test/e2e/services/user-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.d.ts +1 -0
- package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js +338 -0
- package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js.map +1 -0
- package/dist/test/e2e/stores/feature-strategies-store.e2e.test.d.ts +1 -0
- package/dist/test/e2e/stores/feature-strategies-store.e2e.test.js +53 -0
- package/dist/test/e2e/stores/feature-strategies-store.e2e.test.js.map +1 -0
- package/dist/test/fixtures/fake-client-metrics-store-v2.d.ts +20 -0
- package/dist/test/fixtures/fake-client-metrics-store-v2.js +52 -0
- package/dist/test/fixtures/fake-client-metrics-store-v2.js.map +1 -0
- package/dist/test/fixtures/fake-feature-environment-store.d.ts +1 -0
- package/dist/test/fixtures/fake-feature-environment-store.js +7 -0
- package/dist/test/fixtures/fake-feature-environment-store.js.map +1 -1
- package/dist/test/fixtures/fake-feature-strategies-store.d.ts +1 -0
- package/dist/test/fixtures/fake-feature-strategies-store.js +9 -0
- package/dist/test/fixtures/fake-feature-strategies-store.js.map +1 -1
- package/dist/test/fixtures/store.js +2 -0
- package/dist/test/fixtures/store.js.map +1 -1
- package/package.json +13 -12
- package/CHANGELOG.md +0 -920
- package/dist/test/e2e/api/admin/project/feature.strategy.e2e.test.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature-toggle-client-store.js","sourceRoot":"","sources":["../../../src/lib/db/feature-toggle-client-store.ts"],"names":[],"mappings":";;;;;AAEA,4EAAmD;AACnD,oDAA2C;AAQ3C,iDAAgD;AAahD,MAAqB,wBAAwB;IASzC,YAAY,EAAQ,EAAE,QAAsB,EAAE,SAAsB;QAChE,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,gCAAgC,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,GAAG,CAAC,MAAM,EAAE,EAAE,CACpB,wBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,uBAAO,EAAE;YACvC,KAAK,EAAE,gBAAgB;YACvB,MAAM;SACT,CAAC,CAAC;IACX,CAAC;IAEO,gBAAgB,CACpB,CAAM,EACN,YAAqB,IAAI;QAEzB,IAAI,SAAS,EAAE;YACX,OAAO;gBACH,IAAI,EAAE,CAAC,CAAC,aAAa;gBACrB,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,EAAE;gBAChC,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,EAAE,EAAE,CAAC,CAAC,WAAW;aACpB,CAAC;SACL;
|
|
1
|
+
{"version":3,"file":"feature-toggle-client-store.js","sourceRoot":"","sources":["../../../src/lib/db/feature-toggle-client-store.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/db/index.js
CHANGED
|
@@ -29,6 +29,7 @@ const feature_toggle_client_store_1 = __importDefault(require("./feature-toggle-
|
|
|
29
29
|
const environment_store_1 = __importDefault(require("./environment-store"));
|
|
30
30
|
const feature_tag_store_1 = __importDefault(require("./feature-tag-store"));
|
|
31
31
|
const feature_environment_store_1 = require("./feature-environment-store");
|
|
32
|
+
const client_metrics_store_v2_1 = require("./client-metrics-store-v2");
|
|
32
33
|
const createStores = (config, eventBus, db) => {
|
|
33
34
|
const { getLogger } = config;
|
|
34
35
|
const eventStore = new event_store_1.default(db, getLogger);
|
|
@@ -41,6 +42,7 @@ const createStores = (config, eventBus, db) => {
|
|
|
41
42
|
clientApplicationsStore: new client_applications_store_1.default(db, eventBus, getLogger),
|
|
42
43
|
clientInstanceStore: new client_instance_store_1.default(db, eventBus, getLogger),
|
|
43
44
|
clientMetricsStore: new client_metrics_store_1.ClientMetricsStore(clientMetricsDb, eventBus, getLogger),
|
|
45
|
+
clientMetricsStoreV2: new client_metrics_store_v2_1.ClientMetricsStoreV2(db, getLogger),
|
|
44
46
|
contextFieldStore: new context_field_store_1.default(db, getLogger),
|
|
45
47
|
settingStore: new setting_store_1.default(db, getLogger),
|
|
46
48
|
userStore: new user_store_1.default(db, getLogger),
|
package/dist/lib/db/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/db/index.ts"],"names":[],"mappings":";;;;;;AAKA,gEAAuC;AACvC,kFAAwD;AACxD,8EAAoD;AACpD,sEAA6C;AAC7C,oFAA0D;AAC1D,2DAAsD;AACtD,iEAA4D;AAC5D,4FAAkE;AAClE,gFAAsD;AACtD,oEAA2C;AAC3C,8DAAqC;AACrC,oEAA2C;AAC3C,4DAAmC;AACnC,sEAA4C;AAC5C,gEAAuC;AACvC,uDAAkD;AAClD,oEAA2C;AAC3C,iDAA6C;AAC7C,2DAAsD;AACtD,gFAAsD;AACtD,sFAA4D;AAC5D,gGAAqE;AACrE,4EAAmD;AACnD,4EAAkD;AAClD,2EAAsE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/db/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Application } from 'express';
|
|
2
2
|
import { IUnleashServices } from '../types/services';
|
|
3
|
-
|
|
3
|
+
import { IUnleashConfig } from '../types/option';
|
|
4
|
+
declare function demoAuthentication(app: Application, basePath: string, { userService }: Pick<IUnleashServices, 'userService'>, { authentication }: Pick<IUnleashConfig, 'authentication'>): void;
|
|
4
5
|
export default demoAuthentication;
|
|
@@ -4,19 +4,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const authentication_required_1 = __importDefault(require("../types/authentication-required"));
|
|
7
|
-
|
|
7
|
+
const api_user_1 = __importDefault(require("../types/api-user"));
|
|
8
|
+
const api_token_1 = require("../types/models/api-token");
|
|
9
|
+
function demoAuthentication(app, basePath = '', { userService }, { authentication }) {
|
|
8
10
|
app.post(`${basePath}/api/admin/login`, async (req, res) => {
|
|
9
11
|
const { email } = req.body;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
session.user = user;
|
|
14
|
-
// @ts-ignore
|
|
15
|
-
req.session = session;
|
|
16
|
-
res.status(200)
|
|
12
|
+
try {
|
|
13
|
+
const user = await userService.loginUserWithoutPassword(email, true);
|
|
14
|
+
const session = req.session || {};
|
|
17
15
|
// @ts-ignore
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
session.user = user;
|
|
17
|
+
// @ts-ignore
|
|
18
|
+
req.session = session;
|
|
19
|
+
res.status(200)
|
|
20
|
+
// @ts-ignore
|
|
21
|
+
.json(req.session.user)
|
|
22
|
+
.end();
|
|
23
|
+
}
|
|
24
|
+
catch (e) {
|
|
25
|
+
res.status(400)
|
|
26
|
+
.json({ error: `Could not sign in with ${email}` })
|
|
27
|
+
.end();
|
|
28
|
+
}
|
|
20
29
|
});
|
|
21
30
|
app.use(`${basePath}/api/admin/`, (req, res, next) => {
|
|
22
31
|
// @ts-ignore
|
|
@@ -26,6 +35,20 @@ function demoAuthentication(app, basePath = '', { userService }) {
|
|
|
26
35
|
}
|
|
27
36
|
next();
|
|
28
37
|
});
|
|
38
|
+
app.use(`${basePath}/api/client`, (req, res, next) => {
|
|
39
|
+
// @ts-ignore
|
|
40
|
+
if (!authentication.enableApiToken && !req.user) {
|
|
41
|
+
// @ts-ignore
|
|
42
|
+
req.user = new api_user_1.default({
|
|
43
|
+
username: 'unauthed-default-client',
|
|
44
|
+
permissions: [],
|
|
45
|
+
environment: 'default',
|
|
46
|
+
type: api_token_1.ApiTokenType.CLIENT,
|
|
47
|
+
project: '*',
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
next();
|
|
51
|
+
});
|
|
29
52
|
app.use(`${basePath}/api`, (req, res, next) => {
|
|
30
53
|
// @ts-ignore
|
|
31
54
|
if (req.user) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"demo-authentication.js","sourceRoot":"","sources":["../../../src/lib/middleware/demo-authentication.ts"],"names":[],"mappings":";;;;;AACA,+FAAsE;AAGtE,SAAS,kBAAkB,CACvB,GAAgB,EAChB,WAAmB,EAAE,EACrB,EAAE,WAAW,EAAyC;
|
|
1
|
+
{"version":3,"file":"demo-authentication.js","sourceRoot":"","sources":["../../../src/lib/middleware/demo-authentication.ts"],"names":[],"mappings":";;;;;AACA,+FAAsE;AAGtE,iEAAwC;AACxC,yDAAyD;AAEzD,SAAS,kBAAkB,CACvB,GAAgB,EAChB,WAAmB,EAAE,EACrB,EAAE,WAAW,EAAyC,EACtD,EAAE,cAAc,EAA0C;IAE1D,GAAG,CAAC,IAAI,CAAC,GAAG,QAAQ,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACvD,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAC3B,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,wBAAwB,CACnD,KAAK,EACL,IAAI,CACP,CAAC;YACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;YAClC,aAAa;YACb,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;YACpB,aAAa;YACb,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;YACtB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC;gBACX,aAAa;iBACZ,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;iBACtB,GAAG,EAAE,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACR,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC;iBACV,IAAI,CAAC,EAAE,KAAK,EAAE,0BAA0B,KAAK,EAAE,EAAE,CAAC;iBAClD,GAAG,EAAE,CAAC;SACd;IACL,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjD,aAAa;QACb,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;YAC5C,aAAa;YACb,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;SAC/B;QACD,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjD,aAAa;QACb,IAAI,CAAC,cAAc,CAAC,cAAc,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YAC7C,aAAa;YACb,GAAG,CAAC,IAAI,GAAG,IAAI,kBAAO,CAAC;gBACnB,QAAQ,EAAE,yBAAyB;gBACnC,WAAW,EAAE,EAAE;gBACf,WAAW,EAAE,SAAS;gBACtB,IAAI,EAAE,wBAAY,CAAC,MAAM;gBACzB,OAAO,EAAE,GAAG;aACf,CAAC,CAAC;SACN;QACD,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1C,aAAa;QACb,IAAI,GAAG,CAAC,IAAI,EAAE;YACV,OAAO,IAAI,EAAE,CAAC;SACjB;QACD,OAAO,GAAG;aACL,MAAM,CAAC,GAAG,CAAC;aACX,IAAI,CACD,IAAI,iCAAsB,CAAC;YACvB,IAAI,EAAE,GAAG,QAAQ,kBAAkB;YACnC,IAAI,EAAE,MAAM;YACZ,OAAO,EACH,wDAAwD;SAC/D,CAAC,CACL;aACA,GAAG,EAAE,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC;AAED,kBAAe,kBAAkB,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Request, Response } from 'express';
|
|
2
|
+
import Controller from '../controller';
|
|
3
|
+
import { IUnleashConfig } from '../../types/option';
|
|
4
|
+
import { IUnleashServices } from '../../types/services';
|
|
5
|
+
declare class ClientMetricsController extends Controller {
|
|
6
|
+
private logger;
|
|
7
|
+
private metrics;
|
|
8
|
+
constructor(config: IUnleashConfig, { clientMetricsServiceV2, }: Pick<IUnleashServices, 'clientMetricsServiceV2'>);
|
|
9
|
+
getRawToggleMetrics(req: Request, res: Response): Promise<void>;
|
|
10
|
+
getToggleMetricsSummary(req: Request, res: Response): Promise<void>;
|
|
11
|
+
}
|
|
12
|
+
export default ClientMetricsController;
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const controller_1 = __importDefault(require("../controller"));
|
|
7
|
+
class ClientMetricsController extends controller_1.default {
|
|
8
|
+
constructor(config, { clientMetricsServiceV2, }) {
|
|
9
|
+
super(config);
|
|
10
|
+
this.logger = config.getLogger('/admin-api/client-metrics.ts');
|
|
11
|
+
this.metrics = clientMetricsServiceV2;
|
|
12
|
+
this.get('/features/:name/raw', this.getRawToggleMetrics);
|
|
13
|
+
this.get('/features/:name', this.getToggleMetricsSummary);
|
|
14
|
+
}
|
|
15
|
+
async getRawToggleMetrics(req, res) {
|
|
16
|
+
const { name } = req.params;
|
|
17
|
+
const data = await this.metrics.getClientMetricsForToggle(name);
|
|
18
|
+
res.json({
|
|
19
|
+
version: 1,
|
|
20
|
+
maturity: 'experimental',
|
|
21
|
+
data,
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
async getToggleMetricsSummary(req, res) {
|
|
25
|
+
const { name } = req.params;
|
|
26
|
+
const data = await this.metrics.getFeatureToggleMetricsSummary(name);
|
|
27
|
+
res.json({
|
|
28
|
+
version: 1,
|
|
29
|
+
maturity: 'experimental',
|
|
30
|
+
...data,
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
exports.default = ClientMetricsController;
|
|
35
|
+
//# sourceMappingURL=client-metrics.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client-metrics.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/client-metrics.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAMvC,MAAM,uBAAwB,SAAQ,oBAAU;IAK5C,YACI,MAAsB,EACtB,EACI,sBAAsB,GACyB;QAEnD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;QAE/D,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC;QAEtC,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC1D,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,GAAY,EAAE,GAAa;QACjD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;QAChE,GAAG,CAAC,IAAI,CAAC;YACL,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,cAAc;YACxB,IAAI;SACP,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,GAAY,EAAE,GAAa;QACrD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC;QACrE,GAAG,CAAC,IAAI,CAAC;YACL,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,cAAc;YACxB,GAAG,IAAI;SACV,CAAC,CAAC;IACP,CAAC;CACJ;AACD,kBAAe,uBAAuB,CAAC"}
|
|
@@ -14,6 +14,7 @@ const metrics_1 = __importDefault(require("./metrics"));
|
|
|
14
14
|
const user_1 = __importDefault(require("./user"));
|
|
15
15
|
const config_1 = __importDefault(require("./config"));
|
|
16
16
|
const context_1 = __importDefault(require("./context"));
|
|
17
|
+
const client_metrics_1 = __importDefault(require("./client-metrics"));
|
|
17
18
|
const bootstrap_controller_1 = __importDefault(require("./bootstrap-controller"));
|
|
18
19
|
const state_1 = __importDefault(require("./state"));
|
|
19
20
|
const tag_1 = __importDefault(require("./tag"));
|
|
@@ -35,6 +36,7 @@ class AdminApi extends controller_1.default {
|
|
|
35
36
|
this.app.use('/strategies', new strategy_1.default(config, services).router);
|
|
36
37
|
this.app.use('/events', new event_1.default(config, services).router);
|
|
37
38
|
this.app.use('/metrics', new metrics_1.default(config, services).router);
|
|
39
|
+
this.app.use('/client-metrics', new client_metrics_1.default(config, services).router);
|
|
38
40
|
this.app.use('/user', new user_1.default(config, services).router);
|
|
39
41
|
this.app.use('/ui-config', new config_1.default(config, services).router);
|
|
40
42
|
this.app.use('/ui-bootstrap', new bootstrap_controller_1.default(config, services).router);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,11 @@ export default class ProjectFeaturesController extends Controller {
|
|
|
31
31
|
private readonly logger;
|
|
32
32
|
constructor(config: IUnleashConfig, { featureToggleServiceV2 }: ProjectFeaturesServices);
|
|
33
33
|
getFeatures(req: Request<ProjectParam, any, any, any>, res: Response): Promise<void>;
|
|
34
|
-
|
|
34
|
+
cloneFeature(req: IAuthRequest<FeatureParams, any, {
|
|
35
|
+
name: string;
|
|
36
|
+
replaceGroupId: boolean;
|
|
37
|
+
}, any>, res: Response): Promise<void>;
|
|
38
|
+
createFeature(req: IAuthRequest<FeatureParams, any, FeatureToggleDTO, any>, res: Response): Promise<void>;
|
|
35
39
|
getFeature(req: Request<FeatureParams, any, any, any>, res: Response): Promise<void>;
|
|
36
40
|
updateFeature(req: IAuthRequest<ProjectParam, any, FeatureToggleDTO, any>, res: Response): Promise<void>;
|
|
37
41
|
patchFeature(req: IAuthRequest<{
|
|
@@ -9,6 +9,7 @@ const permissions_1 = require("../../../types/permissions");
|
|
|
9
9
|
const extract_user_1 = require("../../../util/extract-user");
|
|
10
10
|
const PATH = '/:projectId/features';
|
|
11
11
|
const PATH_FEATURE = `${PATH}/:featureName`;
|
|
12
|
+
const PATH_FEATURE_CLONE = `${PATH_FEATURE}/clone`;
|
|
12
13
|
const PATH_ENV = `${PATH_FEATURE}/environments/:environment`;
|
|
13
14
|
const PATH_STRATEGIES = `${PATH_ENV}/strategies`;
|
|
14
15
|
const PATH_STRATEGY = `${PATH_STRATEGIES}/:strategyId`;
|
|
@@ -28,6 +29,7 @@ class ProjectFeaturesController extends controller_1.default {
|
|
|
28
29
|
this.delete(`${PATH_STRATEGY}`, this.deleteStrategy, permissions_1.DELETE_FEATURE);
|
|
29
30
|
this.get(PATH, this.getFeatures);
|
|
30
31
|
this.post(PATH, this.createFeature, permissions_1.CREATE_FEATURE);
|
|
32
|
+
this.post(PATH_FEATURE_CLONE, this.cloneFeature, permissions_1.CREATE_FEATURE);
|
|
31
33
|
this.get(PATH_FEATURE, this.getFeature);
|
|
32
34
|
this.put(PATH_FEATURE, this.updateFeature);
|
|
33
35
|
this.patch(PATH_FEATURE, this.patchFeature);
|
|
@@ -38,6 +40,13 @@ class ProjectFeaturesController extends controller_1.default {
|
|
|
38
40
|
const features = await this.featureService.getFeatureOverview(projectId);
|
|
39
41
|
res.json({ version: 1, features });
|
|
40
42
|
}
|
|
43
|
+
async cloneFeature(req, res) {
|
|
44
|
+
const { projectId, featureName } = req.params;
|
|
45
|
+
const { name, replaceGroupId } = req.body;
|
|
46
|
+
const userName = (0, extract_user_1.extractUsername)(req);
|
|
47
|
+
const created = await this.featureService.cloneFeatureToggle(featureName, projectId, name, replaceGroupId, userName);
|
|
48
|
+
res.status(201).json(created);
|
|
49
|
+
}
|
|
41
50
|
async createFeature(req, res) {
|
|
42
51
|
const { projectId } = req.params;
|
|
43
52
|
const userName = (0, extract_user_1.extractUsername)(req);
|
|
@@ -58,10 +67,7 @@ class ProjectFeaturesController extends controller_1.default {
|
|
|
58
67
|
}
|
|
59
68
|
async patchFeature(req, res) {
|
|
60
69
|
const { projectId, featureName } = req.params;
|
|
61
|
-
const
|
|
62
|
-
const { newDocument } = (0, fast_json_patch_1.applyPatch)(featureToggle, req.body);
|
|
63
|
-
const userName = (0, extract_user_1.extractUsername)(req);
|
|
64
|
-
const updated = await this.featureService.updateFeatureToggle(projectId, newDocument, userName);
|
|
70
|
+
const updated = await this.featureService.patchFeature(projectId, featureName, (0, extract_user_1.extractUsername)(req), req.body);
|
|
65
71
|
res.status(200).json(updated);
|
|
66
72
|
}
|
|
67
73
|
// TODO: validate projectId
|
|
@@ -121,11 +127,11 @@ class ProjectFeaturesController extends controller_1.default {
|
|
|
121
127
|
}
|
|
122
128
|
async deleteStrategy(req, res) {
|
|
123
129
|
this.logger.info('Deleting strategy');
|
|
124
|
-
const { environment, projectId } = req.params;
|
|
130
|
+
const { environment, projectId, featureName } = req.params;
|
|
125
131
|
const userName = (0, extract_user_1.extractUsername)(req);
|
|
126
132
|
const { strategyId } = req.params;
|
|
127
133
|
this.logger.info(strategyId);
|
|
128
|
-
const strategy = await this.featureService.deleteStrategy(strategyId, userName, projectId, environment);
|
|
134
|
+
const strategy = await this.featureService.deleteStrategy(strategyId, featureName, userName, projectId, environment);
|
|
129
135
|
res.status(200).json(strategy);
|
|
130
136
|
}
|
|
131
137
|
async updateStrategyParameter(req, res) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"features.js","sourceRoot":"","sources":["../../../../../src/lib/routes/admin-api/project/features.ts"],"names":[],"mappings":";;;;;AACA,qDAAwD;AACxD,kEAA0C;AAK1C,4DAIoC;AAMpC,6DAA6D;AA4B7D,MAAM,IAAI,GAAG,sBAAsB,CAAC;AACpC,MAAM,YAAY,GAAG,GAAG,IAAI,eAAe,CAAC;AAC5C,MAAM,QAAQ,GAAG,GAAG,YAAY,4BAA4B,CAAC;AAC7D,MAAM,eAAe,GAAG,GAAG,QAAQ,aAAa,CAAC;AACjD,MAAM,aAAa,GAAG,GAAG,eAAe,cAAc,CAAC;AAOvD,MAAqB,yBAA0B,SAAQ,oBAAU;IAK7D,YACI,MAAsB,EACtB,EAAE,sBAAsB,EAA2B;QAEnD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,cAAc,GAAG,sBAAsB,CAAC;QAC7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;QAEjE,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,4BAAc,CAAC,CAAC;QACtE,IAAI,CAAC,IAAI,CAAC,GAAG,QAAQ,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,4BAAc,CAAC,CAAC;QAExE,IAAI,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI,CAAC,GAAG,eAAe,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,4BAAc,CAAC,CAAC;QAElE,IAAI,CAAC,GAAG,CAAC,GAAG,aAAa,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,aAAa,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE,4BAAc,CAAC,CAAC;QAClE,IAAI,CAAC,KAAK,CAAC,GAAG,aAAa,EAAE,EAAE,IAAI,CAAC,aAAa,EAAE,4BAAc,CAAC,CAAC;QACnE,IAAI,CAAC,MAAM,CAAC,GAAG,aAAa,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE,4BAAc,CAAC,CAAC;QAErE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,4BAAc,CAAC,CAAC;QAEpD,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,WAAW,CACb,GAAyC,EACzC,GAAa;QAEb,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QACjC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CACzD,SAAS,CACZ,CAAC;QACF,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,aAAa,CACf,
|
|
1
|
+
{"version":3,"file":"features.js","sourceRoot":"","sources":["../../../../../src/lib/routes/admin-api/project/features.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,13 @@ import { IUnleashConfig } from '../../types/option';
|
|
|
5
5
|
import ClientMetricsService from '../../services/client-metrics';
|
|
6
6
|
import { Logger } from '../../logger';
|
|
7
7
|
import { IAuthRequest } from '../unleash-types';
|
|
8
|
+
import ClientMetricsServiceV2 from '../../services/client-metrics/client-metrics-service-v2';
|
|
8
9
|
export default class ClientMetricsController extends Controller {
|
|
9
10
|
logger: Logger;
|
|
10
11
|
metrics: ClientMetricsService;
|
|
11
|
-
|
|
12
|
+
metricsV2: ClientMetricsServiceV2;
|
|
13
|
+
newServiceEnabled: boolean;
|
|
14
|
+
constructor({ clientMetricsService, clientMetricsServiceV2, }: Pick<IUnleashServices, 'clientMetricsService' | 'clientMetricsServiceV2'>, config: IUnleashConfig);
|
|
15
|
+
private resolveEnvironment;
|
|
12
16
|
registerMetrics(req: IAuthRequest, res: Response): Promise<void>;
|
|
13
17
|
}
|
|
@@ -7,20 +7,37 @@ const controller_1 = __importDefault(require("../controller"));
|
|
|
7
7
|
const api_user_1 = __importDefault(require("../../types/api-user"));
|
|
8
8
|
const api_token_1 = require("../../types/models/api-token");
|
|
9
9
|
class ClientMetricsController extends controller_1.default {
|
|
10
|
-
constructor({ clientMetricsService, }, config) {
|
|
10
|
+
constructor({ clientMetricsService, clientMetricsServiceV2, }, config) {
|
|
11
11
|
super(config);
|
|
12
|
-
this.
|
|
12
|
+
this.newServiceEnabled = false;
|
|
13
|
+
const { experimental, getLogger } = config;
|
|
14
|
+
if (experimental && experimental.metricsV2) {
|
|
15
|
+
//@ts-ignore
|
|
16
|
+
this.newServiceEnabled = experimental.metricsV2.enabled;
|
|
17
|
+
}
|
|
18
|
+
this.logger = getLogger('/api/client/metrics');
|
|
13
19
|
this.metrics = clientMetricsService;
|
|
20
|
+
this.metricsV2 = clientMetricsServiceV2;
|
|
14
21
|
this.post('/', this.registerMetrics);
|
|
15
22
|
}
|
|
16
|
-
|
|
17
|
-
const { body: data, ip: clientIp, user } = req;
|
|
23
|
+
resolveEnvironment(user, data) {
|
|
18
24
|
if (user instanceof api_user_1.default) {
|
|
19
25
|
if (user.environment !== api_token_1.ALL) {
|
|
20
|
-
|
|
26
|
+
return user.environment;
|
|
27
|
+
}
|
|
28
|
+
else if (user.environment === api_token_1.ALL && data.environment) {
|
|
29
|
+
return data.environment;
|
|
21
30
|
}
|
|
22
31
|
}
|
|
32
|
+
return 'default';
|
|
33
|
+
}
|
|
34
|
+
async registerMetrics(req, res) {
|
|
35
|
+
const { body: data, ip: clientIp, user } = req;
|
|
36
|
+
data.environment = this.resolveEnvironment(user, data);
|
|
23
37
|
await this.metrics.registerClientMetrics(data, clientIp);
|
|
38
|
+
if (this.newServiceEnabled) {
|
|
39
|
+
await this.metricsV2.registerClientMetrics(data, clientIp);
|
|
40
|
+
}
|
|
24
41
|
return res.status(202).end();
|
|
25
42
|
}
|
|
26
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAMvC,oEAA2C;AAC3C,4DAAmD;
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAMvC,oEAA2C;AAC3C,4DAAmD;AAKnD,MAAqB,uBAAwB,SAAQ,oBAAU;IAS3D,YACI,EACI,oBAAoB,EACpB,sBAAsB,GAIzB,EACD,MAAsB;QAEtB,KAAK,CAAC,MAAM,CAAC,CAAC;QAZlB,sBAAiB,GAAY,KAAK,CAAC;QAa/B,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC3C,IAAI,YAAY,IAAI,YAAY,CAAC,SAAS,EAAE;YACxC,YAAY;YACZ,IAAI,CAAC,iBAAiB,GAAG,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC;SAC3D;QAED,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,sBAAsB,CAAC;QAExC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,CAAC;IAEO,kBAAkB,CAAC,IAAU,EAAE,IAAgB;QACnD,IAAI,IAAI,YAAY,kBAAO,EAAE;YACzB,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,EAAE;gBAC1B,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;iBAAM,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,IAAI,IAAI,CAAC,WAAW,EAAE;gBACrD,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,GAAiB,EAAE,GAAa;QAClD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAEzD,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SAC9D;QAED,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACjC,CAAC;CACJ;AAvDD,0CAuDC;AAED,MAAM,CAAC,OAAO,GAAG,uBAAuB,CAAC"}
|
|
@@ -11,9 +11,9 @@ const test_config_1 = require("../../../test/config/test-config");
|
|
|
11
11
|
const client_metrics_schema_1 = require("../../services/client-metrics/client-metrics-schema");
|
|
12
12
|
const services_1 = require("../../services");
|
|
13
13
|
const eventBus = new events_1.EventEmitter();
|
|
14
|
-
function getSetup() {
|
|
14
|
+
function getSetup(opts) {
|
|
15
15
|
const stores = (0, store_1.default)();
|
|
16
|
-
const config = (0, test_config_1.createTestConfig)();
|
|
16
|
+
const config = (0, test_config_1.createTestConfig)(opts);
|
|
17
17
|
const services = (0, services_1.createServices)(stores, config);
|
|
18
18
|
const app = (0, app_1.default)(config, stores, services, eventBus);
|
|
19
19
|
return {
|
|
@@ -77,6 +77,29 @@ test('should accept client metrics with yes/no', () => {
|
|
|
77
77
|
})
|
|
78
78
|
.expect(202);
|
|
79
79
|
});
|
|
80
|
+
test('should accept client metrics with yes/no with metricsV2', async () => {
|
|
81
|
+
const testRunner = getSetup({
|
|
82
|
+
experimental: { metricsV2: { enabled: true } },
|
|
83
|
+
});
|
|
84
|
+
await testRunner.request
|
|
85
|
+
.post('/api/client/metrics')
|
|
86
|
+
.send({
|
|
87
|
+
appName: 'demo',
|
|
88
|
+
instanceId: '1',
|
|
89
|
+
bucket: {
|
|
90
|
+
start: Date.now(),
|
|
91
|
+
stop: Date.now(),
|
|
92
|
+
toggles: {
|
|
93
|
+
toggleA: {
|
|
94
|
+
yes: 200,
|
|
95
|
+
no: 0,
|
|
96
|
+
},
|
|
97
|
+
},
|
|
98
|
+
},
|
|
99
|
+
})
|
|
100
|
+
.expect(202);
|
|
101
|
+
testRunner.destroy();
|
|
102
|
+
});
|
|
80
103
|
test('should accept client metrics with variants', () => {
|
|
81
104
|
return request
|
|
82
105
|
.post('/api/client/metrics')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,mCAAsC;AACtC,yEAAwD;AACxD,oDAA+B;AAC/B,kEAAoE;AACpE,+FAA0F;AAC1F,6CAAgD;
|
|
1
|
+
{"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Response } from 'express';
|
|
2
2
|
import Controller from '../controller';
|
|
3
3
|
import { IUnleashServices } from '../../types';
|
|
4
4
|
import { IUnleashConfig } from '../../types/option';
|
|
5
5
|
import { Logger } from '../../logger';
|
|
6
6
|
import ClientMetricsService from '../../services/client-metrics';
|
|
7
|
+
import { IAuthRequest } from '../../server-impl';
|
|
7
8
|
export default class RegisterController extends Controller {
|
|
8
9
|
logger: Logger;
|
|
9
10
|
metrics: ClientMetricsService;
|
|
10
11
|
constructor({ clientMetricsService, }: Pick<IUnleashServices, 'clientMetricsService'>, config: IUnleashConfig);
|
|
11
|
-
|
|
12
|
+
private resolveEnvironment;
|
|
13
|
+
handleRegister(req: IAuthRequest, res: Response): Promise<void>;
|
|
12
14
|
}
|
|
@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const controller_1 = __importDefault(require("../controller"));
|
|
7
|
+
const api_user_1 = __importDefault(require("../../types/api-user"));
|
|
8
|
+
const api_token_1 = require("../../types/models/api-token");
|
|
7
9
|
class RegisterController extends controller_1.default {
|
|
8
10
|
constructor({ clientMetricsService, }, config) {
|
|
9
11
|
super(config);
|
|
@@ -11,9 +13,20 @@ class RegisterController extends controller_1.default {
|
|
|
11
13
|
this.metrics = clientMetricsService;
|
|
12
14
|
this.post('/', this.handleRegister);
|
|
13
15
|
}
|
|
16
|
+
resolveEnvironment(user, data) {
|
|
17
|
+
if (user instanceof api_user_1.default) {
|
|
18
|
+
if (user.environment !== api_token_1.ALL) {
|
|
19
|
+
return user.environment;
|
|
20
|
+
}
|
|
21
|
+
else if (user.environment === api_token_1.ALL && data.environment) {
|
|
22
|
+
return data.environment;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return 'default';
|
|
26
|
+
}
|
|
14
27
|
async handleRegister(req, res) {
|
|
15
|
-
const data = req
|
|
16
|
-
|
|
28
|
+
const { body: data, ip: clientIp, user } = req;
|
|
29
|
+
data.environment = this.resolveEnvironment(user, data);
|
|
17
30
|
await this.metrics.registerClient(data, clientIp);
|
|
18
31
|
return res.status(202).end();
|
|
19
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/register.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/register.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAOvC,oEAA2C;AAC3C,4DAAmD;AAEnD,MAAqB,kBAAmB,SAAQ,oBAAU;IAKtD,YACI,EACI,oBAAoB,GACyB,EACjD,MAAsB;QAEtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACxC,CAAC;IAEO,kBAAkB,CAAC,IAAU,EAAE,IAAgB;QACnD,IAAI,IAAI,YAAY,kBAAO,EAAE;YACzB,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,EAAE;gBAC1B,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;iBAAM,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,IAAI,IAAI,CAAC,WAAW,EAAE;gBACrD,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAiB,EAAE,GAAa;QACjD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACjC,CAAC;CACJ;AAlCD,qCAkCC"}
|
package/dist/lib/server-impl.js
CHANGED
|
@@ -72,6 +72,7 @@ async function createApp(config, startApp) {
|
|
|
72
72
|
metricsMonitor.stopMonitoring();
|
|
73
73
|
stores.clientInstanceStore.destroy();
|
|
74
74
|
stores.clientMetricsStore.destroy();
|
|
75
|
+
services.clientMetricsServiceV2.destroy();
|
|
75
76
|
await db.destroy();
|
|
76
77
|
};
|
|
77
78
|
if (!config.server.secret) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-impl.js","sourceRoot":"","sources":["../../src/lib/server-impl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,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;AAGhD,2CAA4E;
|
|
1
|
+
{"version":3,"file":"server-impl.js","sourceRoot":"","sources":["../../src/lib/server-impl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,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;AAGhD,2CAA4E;AAmJxE,0FAnJsC,kBAAS,OAmJtC;AAjJb,wDAA2C;AA8IvC,eA9IG,cAAI,CA8IH;AA7IR,qCAA4C;AA8IxC,yFA9Ia,iBAAQ,OA8Ib;AA7IZ,8FAAqE;AA2IjE,iCA3IG,iCAAsB,CA2IH;AA1I1B,qEAA6C;AAyIzC,qBAzIG,oBAAU,CAyIH;AAvId,iEAAmD;AAqI/C,kCAAW;AApIf,0DAA4C;AAqIxC,8BAAS;AApIb,yCAAyC;AAyIrC,yFAzIK,gBAAQ,OAyIL;AAvIZ,KAAK,UAAU,SAAS,CACpB,MAAsB,EACtB,QAAiB;IAEjB,mCAAmC;IACnC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAClD,MAAM,aAAa,GAAG,iBAAO,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,gBAAY,EAAE,CAAC;IACpC,MAAM,EAAE,GAAG,IAAA,kBAAQ,EAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,MAAM,GAAG,IAAA,iBAAY,EAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD,MAAM,cAAc,GAAG,IAAA,8BAAoB,GAAE,CAAC;IAC9C,MAAM,cAAc,GAAG,IAAA,oBAAS,EAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAE7C,MAAM,WAAW,GAAG,KAAK,EAAE,MAAwB,EAAE,EAAE;QACnD,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACxC,IAAI,MAAM,EAAE;YACR,MAAM,UAAU,GAAG,IAAA,gBAAS,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,UAAU,EAAE,CAAC;SACtB;QACD,cAAc,CAAC,cAAc,EAAE,CAAC;QAChC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QACrC,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;QACpC,QAAQ,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC;QAC1C,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC,CAAC;IAEF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;QACvB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC/D,6CAA6C;QAC7C,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;KACjC;IACD,MAAM,GAAG,GAAG,IAAA,aAAM,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;IAEvE,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,UAAU,EAAE;QACxC,IAAA,yBAAY,EAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;KACrD;IACD,cAAc,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC5E,MAAM,OAAO,GAA2B;QACpC,MAAM;QACN,QAAQ;QACR,QAAQ;QACR,GAAG;QACH,MAAM;QACN,OAAO,EAAE,aAAa;KACzB,CAAC;IAEF,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;QACpB,MAAM,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC;YACnC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;YACxB,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB;YAChD,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY;SAC3C,CAAC,CAAC;KACN;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,QAAQ,EAAE;YACV,MAAM,MAAM,GAAG,IAAA,mBAAS,EACpB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAC3B,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CACxD,EACD,MAAM,CAAC,MAAM,CAAC,uBAAuB,CACxC,CAAC;YAEF,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;YACzD,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;YACrD,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;gBACxB,OAAO,CAAC;oBACJ,GAAG,OAAO;oBACV,MAAM;oBACN,IAAI,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC;iBAClC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SAC9B;aAAM;YACH,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;SAC9C;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,6EAA6E;AAC7E,KAAK,UAAU,KAAK,CAAC,OAAwB,EAAE;IAC3C,MAAM,MAAM,GAAG,IAAA,4BAAY,EAAC,IAAI,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAElD,IAAI;QACA,IAAI,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE;YAC5B,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;SACzC;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACpC,MAAM,IAAA,oBAAS,EAAC,MAAM,CAAC,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;SACrC;KACJ;IAAC,OAAO,GAAG,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;QAC1C,MAAM,GAAG,CAAC;KACb;IAED,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9C,IAAI,MAAM,CAAC,MAAM,CAAC,sBAAsB,EAAE;QACtC,IAAA,2BAAwB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC7C;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAsBG,sBAAK;AApBT,6EAA6E;AAC7E,KAAK,UAAU,MAAM,CAAC,IAAqB;IACvC,MAAM,MAAM,GAAG,IAAA,4BAAY,EAAC,IAAI,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAElD,IAAI;QACA,IAAI,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE;YAC5B,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;SACzC;aAAM;YACH,MAAM,IAAA,oBAAS,EAAC,MAAM,CAAC,CAAC;SAC3B;KACJ;IAAC,OAAO,GAAG,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;QAC1C,MAAM,GAAG,CAAC;KACb;IACD,OAAO,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC;AAKG,wBAAM;AAWV,kBAAe;IACX,KAAK;IACL,MAAM;CACT,CAAC"}
|
|
@@ -63,7 +63,7 @@ class AccessService {
|
|
|
63
63
|
async hasPermission(user, permission, projectId) {
|
|
64
64
|
this.logger.info(`Checking permission=${permission}, userId=${user.id} projectId=${projectId}`);
|
|
65
65
|
try {
|
|
66
|
-
const userP = await this.
|
|
66
|
+
const userP = await this.getPermissionsForUser(user);
|
|
67
67
|
return userP
|
|
68
68
|
.filter((p) => !p.project ||
|
|
69
69
|
p.project === projectId ||
|
|
@@ -77,7 +77,9 @@ class AccessService {
|
|
|
77
77
|
}
|
|
78
78
|
async getPermissionsForUser(user) {
|
|
79
79
|
if (user.isAPI) {
|
|
80
|
-
return
|
|
80
|
+
return user.permissions.map((p) => ({
|
|
81
|
+
permission: p,
|
|
82
|
+
}));
|
|
81
83
|
}
|
|
82
84
|
return this.store.getPermissionsForUser(user.id);
|
|
83
85
|
}
|