unleash-server 4.4.2 → 4.5.0
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 +6 -1
- package/dist/lib/addons/datadog-definition.js +1 -0
- package/dist/lib/addons/datadog-definition.js.map +1 -1
- package/dist/lib/addons/feature-event-formatter-md.js +2 -0
- package/dist/lib/addons/feature-event-formatter-md.js.map +1 -1
- package/dist/lib/addons/slack-definition.js +1 -0
- package/dist/lib/addons/slack-definition.js.map +1 -1
- package/dist/lib/addons/teams-definition.js +1 -0
- package/dist/lib/addons/teams-definition.js.map +1 -1
- package/dist/lib/addons/webhook-definition.js +1 -0
- package/dist/lib/addons/webhook-definition.js.map +1 -1
- package/dist/lib/app.d.ts +1 -1
- package/dist/lib/app.js +4 -8
- package/dist/lib/app.js.map +1 -1
- package/dist/lib/app.test.js +7 -7
- package/dist/lib/app.test.js.map +1 -1
- package/dist/lib/create-config.js +28 -0
- package/dist/lib/create-config.js.map +1 -1
- package/dist/lib/create-config.test.js +82 -1
- package/dist/lib/create-config.test.js.map +1 -1
- package/dist/lib/db/api-token-store.d.ts +1 -0
- package/dist/lib/db/api-token-store.js +5 -0
- package/dist/lib/db/api-token-store.js.map +1 -1
- package/dist/lib/db/feature-toggle-store.d.ts +2 -2
- package/dist/lib/db/feature-toggle-store.js +2 -5
- package/dist/lib/db/feature-toggle-store.js.map +1 -1
- package/dist/lib/middleware/oss-authentication.test.js +6 -6
- package/dist/lib/middleware/oss-authentication.test.js.map +1 -1
- package/dist/lib/routes/admin-api/config.test.js +4 -4
- package/dist/lib/routes/admin-api/config.test.js.map +1 -1
- package/dist/lib/routes/admin-api/context.test.js +4 -4
- package/dist/lib/routes/admin-api/context.test.js.map +1 -1
- package/dist/lib/routes/admin-api/email.test.js +8 -8
- package/dist/lib/routes/admin-api/email.test.js.map +1 -1
- package/dist/lib/routes/admin-api/events.test.js +4 -4
- package/dist/lib/routes/admin-api/events.test.js.map +1 -1
- package/dist/lib/routes/admin-api/feature.js +10 -7
- package/dist/lib/routes/admin-api/feature.js.map +1 -1
- package/dist/lib/routes/admin-api/metrics.test.js +4 -4
- package/dist/lib/routes/admin-api/metrics.test.js.map +1 -1
- package/dist/lib/routes/admin-api/project/variants.d.ts +3 -2
- package/dist/lib/routes/admin-api/project/variants.js +7 -4
- package/dist/lib/routes/admin-api/project/variants.js.map +1 -1
- package/dist/lib/routes/admin-api/strategy.test.js +33 -33
- package/dist/lib/routes/admin-api/strategy.test.js.map +1 -1
- package/dist/lib/routes/admin-api/tag.test.js +4 -4
- package/dist/lib/routes/admin-api/tag.test.js.map +1 -1
- package/dist/lib/routes/admin-api/user.test.js +1 -1
- package/dist/lib/routes/admin-api/user.test.js.map +1 -1
- package/dist/lib/routes/backstage.test.js +1 -1
- package/dist/lib/routes/backstage.test.js.map +1 -1
- package/dist/lib/routes/client-api/feature.test.js +4 -4
- package/dist/lib/routes/client-api/feature.test.js.map +1 -1
- package/dist/lib/routes/client-api/metrics.test.js +5 -5
- package/dist/lib/routes/client-api/metrics.test.js.map +1 -1
- package/dist/lib/routes/client-api/register.test.js +4 -4
- package/dist/lib/routes/client-api/register.test.js.map +1 -1
- package/dist/lib/routes/health-check.test.js +6 -6
- package/dist/lib/routes/health-check.test.js.map +1 -1
- package/dist/lib/routes/index.test.js +4 -4
- package/dist/lib/routes/index.test.js.map +1 -1
- package/dist/lib/server-impl.d.ts +2 -1
- package/dist/lib/server-impl.js +4 -2
- package/dist/lib/server-impl.js.map +1 -1
- package/dist/lib/services/api-token-service.d.ts +3 -2
- package/dist/lib/services/api-token-service.js +23 -15
- package/dist/lib/services/api-token-service.js.map +1 -1
- package/dist/lib/services/api-token-service.test.d.ts +1 -0
- package/dist/lib/services/api-token-service.test.js +32 -0
- package/dist/lib/services/api-token-service.test.js.map +1 -0
- package/dist/lib/services/feature-toggle-service.d.ts +3 -3
- package/dist/lib/services/feature-toggle-service.js +16 -5
- package/dist/lib/services/feature-toggle-service.js.map +1 -1
- package/dist/lib/services/state-service.js +6 -5
- package/dist/lib/services/state-service.js.map +1 -1
- package/dist/lib/services/user-service.js +1 -3
- package/dist/lib/services/user-service.js.map +1 -1
- package/dist/lib/types/api-user.js +0 -1
- package/dist/lib/types/api-user.js.map +1 -1
- package/dist/lib/types/events.d.ts +20 -1
- package/dist/lib/types/events.js +13 -2
- package/dist/lib/types/events.js.map +1 -1
- package/dist/lib/types/model.d.ts +1 -1
- package/dist/lib/types/models/api-token.d.ts +1 -0
- package/dist/lib/types/models/api-token.js +17 -1
- package/dist/lib/types/models/api-token.js.map +1 -1
- package/dist/lib/types/option.d.ts +3 -0
- package/dist/lib/types/option.js.map +1 -1
- package/dist/lib/types/stores/api-token-store.d.ts +1 -0
- package/dist/lib/types/stores/feature-toggle-store.d.ts +1 -1
- package/dist/lib/types/user.js +1 -4
- package/dist/lib/types/user.js.map +1 -1
- package/dist/lib/types/user.test.js +5 -7
- package/dist/lib/types/user.test.js.map +1 -1
- package/dist/lib/util/load-index-html.d.ts +2 -0
- package/dist/lib/util/load-index-html.js +26 -0
- package/dist/lib/util/load-index-html.js.map +1 -0
- package/dist/lib/util/rewriteHTML.d.ts +1 -1
- package/dist/lib/util/rewriteHTML.js +3 -2
- package/dist/lib/util/rewriteHTML.js.map +1 -1
- package/dist/server-dev.js +13 -0
- package/dist/server-dev.js.map +1 -1
- package/dist/test/config/test-config.js +0 -3
- package/dist/test/config/test-config.js.map +1 -1
- package/dist/test/e2e/api/admin/feature.e2e.test.js +2 -2
- package/dist/test/e2e/api/admin/feature.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/features.e2e.test.js +37 -0
- package/dist/test/e2e/api/admin/project/features.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/variants.e2e.test.js +22 -24
- package/dist/test/e2e/api/admin/project/variants.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/state.e2e.test.js +8 -7
- package/dist/test/e2e/api/admin/state.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/feature.e2e.test.js +14 -14
- package/dist/test/e2e/api/client/feature.e2e.test.js.map +1 -1
- package/dist/test/e2e/helpers/test-helper.js +2 -2
- package/dist/test/e2e/helpers/test-helper.js.map +1 -1
- package/dist/test/e2e/services/environment-service.test.js +0 -1
- package/dist/test/e2e/services/environment-service.test.js.map +1 -1
- package/dist/test/e2e/services/user-service.e2e.test.js +18 -0
- package/dist/test/e2e/services/user-service.e2e.test.js.map +1 -1
- package/dist/test/fixtures/fake-api-token-store.d.ts +4 -1
- package/dist/test/fixtures/fake-api-token-store.js +10 -1
- package/dist/test/fixtures/fake-api-token-store.js.map +1 -1
- package/dist/test/fixtures/fake-feature-toggle-store.d.ts +1 -1
- package/dist/test/fixtures/fake-feature-toggle-store.js +1 -1
- package/dist/test/fixtures/fake-feature-toggle-store.js.map +1 -1
- package/package.json +16 -15
- package/CHANGELOG.md +0 -1266
|
@@ -9,7 +9,7 @@ const permissions_1 = __importDefault(require("../../../test/fixtures/permission
|
|
|
9
9
|
const app_1 = __importDefault(require("../../app"));
|
|
10
10
|
const test_config_1 = require("../../../test/config/test-config");
|
|
11
11
|
const services_1 = require("../../services");
|
|
12
|
-
function getSetup() {
|
|
12
|
+
async function getSetup() {
|
|
13
13
|
const base = `/random${Math.round(Math.random() * 1000)}`;
|
|
14
14
|
const stores = (0, store_1.default)();
|
|
15
15
|
const perms = (0, permissions_1.default)();
|
|
@@ -18,7 +18,7 @@ function getSetup() {
|
|
|
18
18
|
preRouterHook: perms.hook,
|
|
19
19
|
});
|
|
20
20
|
const services = (0, services_1.createServices)(stores, config);
|
|
21
|
-
const app = (0, app_1.default)(config, stores, services);
|
|
21
|
+
const app = await (0, app_1.default)(config, stores, services);
|
|
22
22
|
return {
|
|
23
23
|
base,
|
|
24
24
|
perms,
|
|
@@ -35,8 +35,8 @@ let base;
|
|
|
35
35
|
let tagStore;
|
|
36
36
|
let request;
|
|
37
37
|
let destroy;
|
|
38
|
-
beforeEach(() => {
|
|
39
|
-
const setup = getSetup();
|
|
38
|
+
beforeEach(async () => {
|
|
39
|
+
const setup = await getSetup();
|
|
40
40
|
base = setup.base;
|
|
41
41
|
tagStore = setup.tagStore;
|
|
42
42
|
request = setup.request;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/tag.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,yEAAwD;AACxD,qFAA6D;AAC7D,oDAA+B;AAC/B,kEAAoE;AACpE,6CAAgD;AAEhD,
|
|
1
|
+
{"version":3,"file":"tag.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/tag.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ async function getSetup() {
|
|
|
24
24
|
server: { baseUriPath: base },
|
|
25
25
|
});
|
|
26
26
|
const services = (0, services_1.createServices)(stores, config);
|
|
27
|
-
const app = (0, app_1.default)(config, stores, services);
|
|
27
|
+
const app = await (0, app_1.default)(config, stores, services);
|
|
28
28
|
return {
|
|
29
29
|
base,
|
|
30
30
|
userStore: stores.userStore,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/user.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,6CAAgD;AAChD,kEAAoE;AAEpE,yEAAwD;AACxD,oDAA+B;AAC/B,4DAAoC;AAEpC,MAAM,WAAW,GAAG,IAAI,cAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;AAEnE,KAAK,UAAU,QAAQ;IACnB,MAAM,IAAI,GAAG,UAAU,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAG,IAAA,eAAY,GAAE,CAAC;IAC9B,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC;QAC5B,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACX,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;gBACrB,GAAG,CAAC,IAAI,GAAG,WAAW,CAAC;gBACvB,IAAI,EAAE,CAAC;YACX,CAAC,CAAC,CAAC;QACP,CAAC;QACD,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;KAChC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,IAAA,aAAM,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"user.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/user.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ test('should enable prometheus', async () => {
|
|
|
13
13
|
const stores = (0, store_1.default)();
|
|
14
14
|
const config = (0, test_config_1.createTestConfig)();
|
|
15
15
|
const services = (0, services_1.createServices)(stores, config);
|
|
16
|
-
const app = (0, app_1.default)(config, stores, services);
|
|
16
|
+
const app = await (0, app_1.default)(config, stores, services);
|
|
17
17
|
const request = (0, supertest_1.default)(app);
|
|
18
18
|
await request
|
|
19
19
|
.get('/internal-backstage/prometheus')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backstage.test.js","sourceRoot":"","sources":["../../../src/lib/routes/backstage.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,0CAA6C;AAC7C,+DAAiE;AAEjE,sEAAqD;AACrD,iDAA4B;AAE5B,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;IACxC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,MAAM,GAAG,IAAA,eAAY,GAAE,CAAC;IAC9B,MAAM,MAAM,GAAG,IAAA,8BAAgB,GAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,IAAA,aAAM,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"backstage.test.js","sourceRoot":"","sources":["../../../src/lib/routes/backstage.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,0CAA6C;AAC7C,+DAAiE;AAEjE,sEAAqD;AACrD,iDAA4B;AAE5B,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;IACxC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,MAAM,GAAG,IAAA,eAAY,GAAE,CAAC;IAC9B,MAAM,MAAM,GAAG,IAAA,8BAAgB,GAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,IAAA,aAAM,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEnD,MAAM,OAAO,GAAG,IAAA,mBAAS,EAAC,GAAG,CAAC,CAAC;IAE/B,MAAM,OAAO;SACR,GAAG,CAAC,gCAAgC,CAAC;SACrC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;SAC9B,MAAM,CAAC,GAAG,CAAC,CAAC;IACjB,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;IAClC,QAAQ,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;IACzC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;AACvC,CAAC,CAAC,CAAC"}
|
|
@@ -11,14 +11,14 @@ const services_1 = require("../../services");
|
|
|
11
11
|
const feature_1 = __importDefault(require("./feature"));
|
|
12
12
|
const test_config_1 = require("../../../test/config/test-config");
|
|
13
13
|
const date_fns_1 = require("date-fns");
|
|
14
|
-
function getSetup() {
|
|
14
|
+
async function getSetup() {
|
|
15
15
|
const base = `/random${Math.round(Math.random() * 1000)}`;
|
|
16
16
|
const stores = (0, store_1.default)();
|
|
17
17
|
const config = (0, test_config_1.createTestConfig)({
|
|
18
18
|
server: { baseUriPath: base },
|
|
19
19
|
});
|
|
20
20
|
const services = (0, services_1.createServices)(stores, config);
|
|
21
|
-
const app = (0, app_1.default)(config, stores, services);
|
|
21
|
+
const app = await (0, app_1.default)(config, stores, services);
|
|
22
22
|
return {
|
|
23
23
|
base,
|
|
24
24
|
featureToggleStore: stores.featureToggleStore,
|
|
@@ -35,8 +35,8 @@ let base;
|
|
|
35
35
|
let request;
|
|
36
36
|
let destroy;
|
|
37
37
|
let featureToggleClientStore;
|
|
38
|
-
beforeEach(() => {
|
|
39
|
-
const setup = getSetup();
|
|
38
|
+
beforeEach(async () => {
|
|
39
|
+
const setup = await getSetup();
|
|
40
40
|
base = setup.base;
|
|
41
41
|
request = setup.request;
|
|
42
42
|
featureToggleClientStore = setup.featureToggleClientStore;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/feature.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,yEAAwD;AACxD,iFAAyD;AACzD,oDAA+B;AAC/B,6CAAgD;AAChD,wDAA0C;AAC1C,kEAAoE;AACpE,uCAAiD;AAEjD,
|
|
1
|
+
{"version":3,"file":"feature.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/feature.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,11 +9,11 @@ const app_1 = __importDefault(require("../../app"));
|
|
|
9
9
|
const test_config_1 = require("../../../test/config/test-config");
|
|
10
10
|
const schema_1 = require("../../services/client-metrics/schema");
|
|
11
11
|
const services_1 = require("../../services");
|
|
12
|
-
function getSetup(opts) {
|
|
12
|
+
async function getSetup(opts) {
|
|
13
13
|
const stores = (0, store_1.default)();
|
|
14
14
|
const config = (0, test_config_1.createTestConfig)(opts);
|
|
15
15
|
const services = (0, services_1.createServices)(stores, config);
|
|
16
|
-
const app = (0, app_1.default)(config, stores, services);
|
|
16
|
+
const app = await (0, app_1.default)(config, stores, services);
|
|
17
17
|
return {
|
|
18
18
|
request: (0, supertest_1.default)(app),
|
|
19
19
|
stores,
|
|
@@ -27,8 +27,8 @@ function getSetup(opts) {
|
|
|
27
27
|
let request;
|
|
28
28
|
let stores;
|
|
29
29
|
let destroy;
|
|
30
|
-
beforeEach(() => {
|
|
31
|
-
const setup = getSetup();
|
|
30
|
+
beforeEach(async () => {
|
|
31
|
+
const setup = await getSetup();
|
|
32
32
|
request = setup.request;
|
|
33
33
|
stores = setup.stores;
|
|
34
34
|
destroy = setup.destroy;
|
|
@@ -76,7 +76,7 @@ test('should accept client metrics with yes/no', () => {
|
|
|
76
76
|
.expect(202);
|
|
77
77
|
});
|
|
78
78
|
test('should accept client metrics with yes/no with metricsV2', async () => {
|
|
79
|
-
const testRunner = getSetup({
|
|
79
|
+
const testRunner = await getSetup({
|
|
80
80
|
experimental: { metricsV2: { enabled: true } },
|
|
81
81
|
});
|
|
82
82
|
await testRunner.request
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,yEAAwD;AACxD,oDAA+B;AAC/B,kEAAoE;AACpE,iEAA2E;AAC3E,6CAAgD;AAIhD,
|
|
1
|
+
{"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,yEAAwD;AACxD,oDAA+B;AAC/B,kEAAoE;AACpE,iEAA2E;AAC3E,6CAAgD;AAIhD,KAAK,UAAU,QAAQ,CAAC,IAAsB;IAC1C,MAAM,MAAM,GAAG,IAAA,eAAY,GAAE,CAAC;IAE9B,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC,IAAI,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,MAAM,IAAA,aAAM,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEnD,OAAO;QACH,OAAO,EAAE,IAAA,mBAAS,EAAC,GAAG,CAAC;QACvB,MAAM;QACN,OAAO,EAAE,GAAG,EAAE;YACV,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;YAClC,QAAQ,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;YACzC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QACvC,CAAC;KACJ,CAAC;AACN,CAAC;AAED,IAAI,OAAO,CAAC;AACZ,IAAI,MAAsB,CAAC;AAC3B,IAAI,OAAO,CAAC;AAEZ,UAAU,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,KAAK,GAAG,MAAM,QAAQ,EAAE,CAAC;IAC/B,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IACxB,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IACtB,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,SAAS,CAAC,GAAG,EAAE;IACX,OAAO,EAAE,CAAC;AACd,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE;IACxC,OAAO,OAAO;SACT,IAAI,CAAC,qBAAqB,CAAC;SAC3B,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;SACzB,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAC5C,OAAO,OAAO;SACT,IAAI,CAAC,qBAAqB,CAAC;SAC3B,IAAI,CAAC;QACF,OAAO,EAAE,MAAM;QACf,UAAU,EAAE,GAAG;QACf,MAAM,EAAE;YACJ,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;YACjB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,OAAO,EAAE,EAAE;SACd;KACJ,CAAC;SACD,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0CAA0C,EAAE,GAAG,EAAE;IAClD,OAAO,OAAO;SACT,IAAI,CAAC,qBAAqB,CAAC;SAC3B,IAAI,CAAC;QACF,OAAO,EAAE,MAAM;QACf,UAAU,EAAE,GAAG;QACf,MAAM,EAAE;YACJ,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;YACjB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,OAAO,EAAE;gBACL,OAAO,EAAE;oBACL,GAAG,EAAE,GAAG;oBACR,EAAE,EAAE,CAAC;iBACR;aACJ;SACJ;KACJ,CAAC;SACD,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;IACvE,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC;QAC9B,YAAY,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;KACjD,CAAC,CAAC;IACH,MAAM,UAAU,CAAC,OAAO;SACnB,IAAI,CAAC,qBAAqB,CAAC;SAC3B,IAAI,CAAC;QACF,OAAO,EAAE,MAAM;QACf,UAAU,EAAE,GAAG;QACf,MAAM,EAAE;YACJ,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;YACjB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,OAAO,EAAE;gBACL,OAAO,EAAE;oBACL,GAAG,EAAE,GAAG;oBACR,EAAE,EAAE,CAAC;iBACR;aACJ;SACJ;KACJ,CAAC;SACD,MAAM,CAAC,GAAG,CAAC,CAAC;IAEjB,UAAU,CAAC,OAAO,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4CAA4C,EAAE,GAAG,EAAE;IACpD,OAAO,OAAO;SACT,IAAI,CAAC,qBAAqB,CAAC;SAC3B,IAAI,CAAC;QACF,OAAO,EAAE,MAAM;QACf,UAAU,EAAE,GAAG;QACf,MAAM,EAAE;YACJ,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;YACjB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,OAAO,EAAE;gBACL,OAAO,EAAE;oBACL,GAAG,EAAE,GAAG;oBACR,EAAE,EAAE,CAAC;oBACL,QAAQ,EAAE;wBACN,QAAQ,EAAE,CAAC;wBACX,QAAQ,EAAE,CAAC;qBACd;iBACJ;aACJ;SACJ;KACJ,CAAC;SACD,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;IACrD,OAAO,OAAO;SACT,IAAI,CAAC,qBAAqB,CAAC;SAC3B,IAAI,CAAC;QACF,OAAO,EAAE,MAAM;QACf,UAAU,EAAE,GAAG;QACf,MAAM,EAAE;YACJ,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;YACjB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,OAAO,EAAE;gBACL,OAAO,EAAE;oBACL,IAAI,EAAE,GAAG;oBACT,KAAK,EAAE,CAAC;iBACX;aACJ;SACJ;KACJ,CAAC;SACD,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACpC,MAAM,IAAI,GAAG;QACT,OAAO,EAAE,WAAW;QACpB,UAAU,EAAE,YAAY;QACxB,MAAM,EAAE;YACJ,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE;YACrD,KAAK,EAAE,0BAA0B;YACjC,IAAI,EAAE,0BAA0B;SACnC;KACJ,CAAC;IACF,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,4BAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5D,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;IAC1B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;IACvC,MAAM,IAAI,GAAG;QACT,OAAO,EAAE,WAAW;QACpB,UAAU,EAAE,YAAY;QACxB,MAAM,EAAE;YACJ,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE;YACxD,KAAK,EAAE,0BAA0B;YACjC,IAAI,EAAE,0BAA0B;SACnC;KACJ,CAAC;IACF,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,4BAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5D,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;IAC1B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACpD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;IAC7C,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,SAAS,EAAE;QACxC,IAAI,EAAE,gBAAgB;KACzB,CAAC,CAAC;IACH,MAAM,OAAO;SACR,IAAI,CAAC,qBAAqB,CAAC;SAC3B,IAAI,CAAC;QACF,OAAO,EAAE,MAAM;QACf,UAAU,EAAE,GAAG;QACf,MAAM,EAAE;YACJ,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;YACjB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;YAChB,OAAO,EAAE;gBACL,cAAc,EAAE;oBACZ,GAAG,EAAE,GAAG;oBACR,EAAE,EAAE,CAAC;iBACR;aACJ;SACJ;KACJ,CAAC;SACD,MAAM,CAAC,GAAG,CAAC,CAAC;IAEjB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAErE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,UAAU,EAAE,CAAC;AAC3C,CAAC,CAAC,CAAC"}
|
|
@@ -9,11 +9,11 @@ const store_1 = __importDefault(require("../../../test/fixtures/store"));
|
|
|
9
9
|
const no_logger_1 = __importDefault(require("../../../test/fixtures/no-logger"));
|
|
10
10
|
const app_1 = __importDefault(require("../../app"));
|
|
11
11
|
const services_1 = require("../../services");
|
|
12
|
-
function getSetup() {
|
|
12
|
+
async function getSetup() {
|
|
13
13
|
const stores = (0, store_1.default)();
|
|
14
14
|
const config = (0, test_config_1.createTestConfig)();
|
|
15
15
|
const services = (0, services_1.createServices)(stores, config);
|
|
16
|
-
const app = (0, app_1.default)(config, stores, services);
|
|
16
|
+
const app = await (0, app_1.default)(config, stores, services);
|
|
17
17
|
return {
|
|
18
18
|
request: (0, supertest_1.default)(app),
|
|
19
19
|
stores,
|
|
@@ -26,8 +26,8 @@ function getSetup() {
|
|
|
26
26
|
}
|
|
27
27
|
let request;
|
|
28
28
|
let destroy;
|
|
29
|
-
beforeEach(() => {
|
|
30
|
-
const setup = getSetup();
|
|
29
|
+
beforeEach(async () => {
|
|
30
|
+
const setup = await getSetup();
|
|
31
31
|
request = setup.request;
|
|
32
32
|
destroy = setup.destroy;
|
|
33
33
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/register.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,kEAAoE;AACpE,yEAAwD;AACxD,iFAAyD;AACzD,oDAA+B;AAC/B,6CAAgD;AAEhD,
|
|
1
|
+
{"version":3,"file":"register.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/register.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,11 +9,11 @@ const test_config_1 = require("../../test/config/test-config");
|
|
|
9
9
|
const store_1 = __importDefault(require("../../test/fixtures/store"));
|
|
10
10
|
const no_logger_1 = __importDefault(require("../../test/fixtures/no-logger"));
|
|
11
11
|
const app_1 = __importDefault(require("../app"));
|
|
12
|
-
function getSetup() {
|
|
12
|
+
async function getSetup() {
|
|
13
13
|
const stores = (0, store_1.default)();
|
|
14
14
|
const config = (0, test_config_1.createTestConfig)();
|
|
15
15
|
const services = (0, services_1.createServices)(stores, config);
|
|
16
|
-
const app = (0, app_1.default)(config, stores, services);
|
|
16
|
+
const app = await (0, app_1.default)(config, stores, services);
|
|
17
17
|
return {
|
|
18
18
|
request: (0, supertest_1.default)(app),
|
|
19
19
|
stores,
|
|
@@ -27,8 +27,8 @@ function getSetup() {
|
|
|
27
27
|
let request;
|
|
28
28
|
let destroy;
|
|
29
29
|
let stores;
|
|
30
|
-
beforeEach(() => {
|
|
31
|
-
const setup = getSetup();
|
|
30
|
+
beforeEach(async () => {
|
|
31
|
+
const setup = await getSetup();
|
|
32
32
|
request = setup.request;
|
|
33
33
|
destroy = setup.destroy;
|
|
34
34
|
stores = setup.stores;
|
|
@@ -37,7 +37,7 @@ afterEach(() => {
|
|
|
37
37
|
destroy();
|
|
38
38
|
no_logger_1.default.setMuteError(false);
|
|
39
39
|
});
|
|
40
|
-
test('should give 500 when db is failing', () => {
|
|
40
|
+
test('should give 500 when db is failing', async () => {
|
|
41
41
|
jest.spyOn(global.console, 'error').mockImplementation(() => jest.fn());
|
|
42
42
|
const config = (0, test_config_1.createTestConfig)();
|
|
43
43
|
const failingStores = {
|
|
@@ -53,7 +53,7 @@ test('should give 500 when db is failing', () => {
|
|
|
53
53
|
// @ts-ignore
|
|
54
54
|
const services = (0, services_1.createServices)(failingStores, config);
|
|
55
55
|
// @ts-ignore
|
|
56
|
-
const app = (0, app_1.default)((0, test_config_1.createTestConfig)(), failingStores, services);
|
|
56
|
+
const app = await (0, app_1.default)((0, test_config_1.createTestConfig)(), failingStores, services);
|
|
57
57
|
request = (0, supertest_1.default)(app);
|
|
58
58
|
no_logger_1.default.setMuteError(true);
|
|
59
59
|
expect.assertions(2);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-check.test.js","sourceRoot":"","sources":["../../../src/lib/routes/health-check.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,0CAA6C;AAC7C,+DAAiE;AAEjE,sEAAqD;AACrD,8EAAsD;AACtD,iDAA4B;AAG5B,
|
|
1
|
+
{"version":3,"file":"health-check.test.js","sourceRoot":"","sources":["../../../src/lib/routes/health-check.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,14 +8,14 @@ const test_config_1 = require("../../test/config/test-config");
|
|
|
8
8
|
const store_1 = __importDefault(require("../../test/fixtures/store"));
|
|
9
9
|
const app_1 = __importDefault(require("../app"));
|
|
10
10
|
const services_1 = require("../services");
|
|
11
|
-
function getSetup() {
|
|
11
|
+
async function getSetup() {
|
|
12
12
|
const base = `/random${Math.round(Math.random() * 1000)}`;
|
|
13
13
|
const stores = (0, store_1.default)();
|
|
14
14
|
const config = (0, test_config_1.createTestConfig)({
|
|
15
15
|
server: { baseUriPath: base },
|
|
16
16
|
});
|
|
17
17
|
const services = (0, services_1.createServices)(stores, config);
|
|
18
|
-
const app = (0, app_1.default)(config, stores, services);
|
|
18
|
+
const app = await (0, app_1.default)(config, stores, services);
|
|
19
19
|
return {
|
|
20
20
|
base,
|
|
21
21
|
request: (0, supertest_1.default)(app),
|
|
@@ -29,8 +29,8 @@ function getSetup() {
|
|
|
29
29
|
let base;
|
|
30
30
|
let request;
|
|
31
31
|
let destroy;
|
|
32
|
-
beforeEach(() => {
|
|
33
|
-
const setup = getSetup();
|
|
32
|
+
beforeEach(async () => {
|
|
33
|
+
const setup = await getSetup();
|
|
34
34
|
base = setup.base;
|
|
35
35
|
request = setup.request;
|
|
36
36
|
destroy = setup.destroy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/lib/routes/index.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,+DAAiE;AACjE,sEAAqD;AACrD,iDAA4B;AAC5B,0CAA6C;AAE7C,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/lib/routes/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { IUnleash } from './types/core';
|
|
|
2
2
|
import { IUnleashConfig, IUnleashOptions, IAuthType } from './types/option';
|
|
3
3
|
import { IUnleashServices } from './types/services';
|
|
4
4
|
import User, { IUser } from './types/user';
|
|
5
|
+
import ApiUser from './types/api-user';
|
|
5
6
|
import { Logger, LogLevel } from './logger';
|
|
6
7
|
import AuthenticationRequired from './types/authentication-required';
|
|
7
8
|
import Controller from './routes/controller';
|
|
@@ -12,7 +13,7 @@ import { RoleName } from './types/model';
|
|
|
12
13
|
import { SimpleAuthSettings } from './types/settings/simple-auth-settings';
|
|
13
14
|
declare function start(opts?: IUnleashOptions): Promise<IUnleash>;
|
|
14
15
|
declare function create(opts: IUnleashOptions): Promise<IUnleash>;
|
|
15
|
-
export { start, create, permissions, eventType, Controller, AuthenticationRequired, User, LogLevel, RoleName, IAuthType, };
|
|
16
|
+
export { start, create, permissions, eventType, Controller, AuthenticationRequired, User, ApiUser, LogLevel, RoleName, IAuthType, };
|
|
16
17
|
declare const _default: {
|
|
17
18
|
start: typeof start;
|
|
18
19
|
create: typeof create;
|
package/dist/lib/server-impl.js
CHANGED
|
@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
22
22
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
23
|
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
exports.IAuthType = exports.RoleName = exports.LogLevel = exports.User = exports.AuthenticationRequired = exports.Controller = exports.eventType = exports.permissions = exports.create = exports.start = void 0;
|
|
25
|
+
exports.IAuthType = exports.RoleName = exports.LogLevel = exports.ApiUser = exports.User = exports.AuthenticationRequired = exports.Controller = exports.eventType = exports.permissions = exports.create = exports.start = void 0;
|
|
26
26
|
const stoppable_1 = __importDefault(require("stoppable"));
|
|
27
27
|
const util_1 = require("util");
|
|
28
28
|
const version_1 = __importDefault(require("./util/version"));
|
|
@@ -40,6 +40,8 @@ const option_1 = require("./types/option");
|
|
|
40
40
|
Object.defineProperty(exports, "IAuthType", { enumerable: true, get: function () { return option_1.IAuthType; } });
|
|
41
41
|
const user_1 = __importDefault(require("./types/user"));
|
|
42
42
|
exports.User = user_1.default;
|
|
43
|
+
const api_user_1 = __importDefault(require("./types/api-user"));
|
|
44
|
+
exports.ApiUser = api_user_1.default;
|
|
43
45
|
const logger_1 = require("./logger");
|
|
44
46
|
Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function () { return logger_1.LogLevel; } });
|
|
45
47
|
const authentication_required_1 = __importDefault(require("./types/authentication-required"));
|
|
@@ -77,7 +79,7 @@ async function createApp(config, startApp) {
|
|
|
77
79
|
// eslint-disable-next-line no-param-reassign
|
|
78
80
|
config.server.secret = secret;
|
|
79
81
|
}
|
|
80
|
-
const app = (0, app_1.default)(config, stores, services, unleashSession);
|
|
82
|
+
const app = await (0, app_1.default)(config, stores, services, unleashSession);
|
|
81
83
|
if (typeof config.eventHook === 'function') {
|
|
82
84
|
(0, event_hook_1.addEventHook)(config.eventHook, stores.eventStore);
|
|
83
85
|
}
|
|
@@ -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;AAGhD,2CAA4E;
|
|
1
|
+
{"version":3,"file":"server-impl.js","sourceRoot":"","sources":["../../src/lib/server-impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,15 +7,16 @@ export declare class ApiTokenService {
|
|
|
7
7
|
private logger;
|
|
8
8
|
private timer;
|
|
9
9
|
private activeTokens;
|
|
10
|
-
constructor({ apiTokenStore }: Pick<IUnleashStores, 'apiTokenStore'>, config: Pick<IUnleashConfig, 'getLogger'>);
|
|
10
|
+
constructor({ apiTokenStore }: Pick<IUnleashStores, 'apiTokenStore'>, config: Pick<IUnleashConfig, 'getLogger' | 'authentication'>);
|
|
11
11
|
private fetchActiveTokens;
|
|
12
12
|
getAllTokens(): Promise<IApiToken[]>;
|
|
13
13
|
getAllActiveTokens(): Promise<IApiToken[]>;
|
|
14
|
+
private initApiTokens;
|
|
14
15
|
getUserForToken(secret: string): ApiUser | undefined;
|
|
15
16
|
updateExpiry(secret: string, expiresAt: Date): Promise<IApiToken>;
|
|
16
17
|
delete(secret: string): Promise<void>;
|
|
17
|
-
private validateNewApiToken;
|
|
18
18
|
createApiToken(newToken: Omit<IApiTokenCreate, 'secret'>): Promise<IApiToken>;
|
|
19
|
+
private insertNewApiToken;
|
|
19
20
|
private generateSecretKey;
|
|
20
21
|
destroy(): void;
|
|
21
22
|
}
|
|
@@ -18,6 +18,9 @@ class ApiTokenService {
|
|
|
18
18
|
this.logger = config.getLogger('/services/api-token-service.ts');
|
|
19
19
|
this.fetchActiveTokens();
|
|
20
20
|
this.timer = setInterval(() => this.fetchActiveTokens(), (0, date_fns_1.minutesToMilliseconds)(1)).unref();
|
|
21
|
+
if (config.authentication.initApiTokens.length > 0) {
|
|
22
|
+
process.nextTick(async () => this.initApiTokens(config.authentication.initApiTokens));
|
|
23
|
+
}
|
|
21
24
|
}
|
|
22
25
|
async fetchActiveTokens() {
|
|
23
26
|
try {
|
|
@@ -34,6 +37,19 @@ class ApiTokenService {
|
|
|
34
37
|
async getAllActiveTokens() {
|
|
35
38
|
return this.store.getAllActive();
|
|
36
39
|
}
|
|
40
|
+
async initApiTokens(tokens) {
|
|
41
|
+
const tokenCount = await this.store.count();
|
|
42
|
+
if (tokenCount > 0) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
try {
|
|
46
|
+
const createAll = tokens.map((t) => this.insertNewApiToken(t));
|
|
47
|
+
await Promise.all(createAll);
|
|
48
|
+
}
|
|
49
|
+
catch (e) {
|
|
50
|
+
this.logger.error('Unable to create initial Admin API tokens');
|
|
51
|
+
}
|
|
52
|
+
}
|
|
37
53
|
getUserForToken(secret) {
|
|
38
54
|
const token = this.activeTokens.find((t) => t.secret === secret);
|
|
39
55
|
if (token) {
|
|
@@ -54,23 +70,15 @@ class ApiTokenService {
|
|
|
54
70
|
async delete(secret) {
|
|
55
71
|
return this.store.delete(secret);
|
|
56
72
|
}
|
|
57
|
-
validateNewApiToken({ type, project, environment }) {
|
|
58
|
-
if (type === api_token_1.ApiTokenType.ADMIN && project !== api_token_1.ALL) {
|
|
59
|
-
throw new bad_data_error_1.default('Admin token cannot be scoped to single project');
|
|
60
|
-
}
|
|
61
|
-
if (type === api_token_1.ApiTokenType.ADMIN && environment !== api_token_1.ALL) {
|
|
62
|
-
throw new bad_data_error_1.default('Admin token cannot be scoped to single environment');
|
|
63
|
-
}
|
|
64
|
-
if (type === api_token_1.ApiTokenType.CLIENT && environment === api_token_1.ALL) {
|
|
65
|
-
throw new bad_data_error_1.default('Client token cannot be scoped to all environments');
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
73
|
async createApiToken(newToken) {
|
|
69
|
-
|
|
74
|
+
(0, api_token_1.validateApiToken)(newToken);
|
|
70
75
|
const secret = this.generateSecretKey(newToken);
|
|
71
76
|
const createNewToken = { ...newToken, secret };
|
|
77
|
+
return this.insertNewApiToken(createNewToken);
|
|
78
|
+
}
|
|
79
|
+
async insertNewApiToken(newApiToken) {
|
|
72
80
|
try {
|
|
73
|
-
const token = await this.store.insert(
|
|
81
|
+
const token = await this.store.insert(newApiToken);
|
|
74
82
|
this.activeTokens.push(token);
|
|
75
83
|
return token;
|
|
76
84
|
}
|
|
@@ -78,10 +86,10 @@ class ApiTokenService {
|
|
|
78
86
|
if (error.code === db_error_1.FOREIGN_KEY_VIOLATION) {
|
|
79
87
|
let { message } = error;
|
|
80
88
|
if (error.constraint === 'api_tokens_project_fkey') {
|
|
81
|
-
message = `Project=${
|
|
89
|
+
message = `Project=${newApiToken.project} does not exist`;
|
|
82
90
|
}
|
|
83
91
|
else if (error.constraint === 'api_tokens_environment_fkey') {
|
|
84
|
-
message = `Environment=${
|
|
92
|
+
message = `Environment=${newApiToken.environment} does not exist`;
|
|
85
93
|
}
|
|
86
94
|
throw new bad_data_error_1.default(message);
|
|
87
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-token-service.js","sourceRoot":"","sources":["../../../src/lib/services/api-token-service.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B,sDAAqD;AAGrD,iEAAwC;AACxC,yDAKmC;AAEnC,gDAA0D;AAC1D,6EAAmD;AACnD,uCAAiD;AAEjD,MAAa,eAAe;IASxB,YACI,EAAE,aAAa,EAAyC,EACxD,
|
|
1
|
+
{"version":3,"file":"api-token-service.js","sourceRoot":"","sources":["../../../src/lib/services/api-token-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,32 @@
|
|
|
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 api_token_service_1 = require("./api-token-service");
|
|
7
|
+
const test_config_1 = require("../../test/config/test-config");
|
|
8
|
+
const api_token_1 = require("../types/models/api-token");
|
|
9
|
+
const fake_api_token_store_1 = __importDefault(require("../../test/fixtures/fake-api-token-store"));
|
|
10
|
+
test('Should init api token', async () => {
|
|
11
|
+
const token = {
|
|
12
|
+
environment: '*',
|
|
13
|
+
project: '*',
|
|
14
|
+
secret: '*:*:some-random-string',
|
|
15
|
+
type: api_token_1.ApiTokenType.ADMIN,
|
|
16
|
+
username: 'admin',
|
|
17
|
+
};
|
|
18
|
+
const config = (0, test_config_1.createTestConfig)({
|
|
19
|
+
authentication: {
|
|
20
|
+
initApiTokens: [token],
|
|
21
|
+
},
|
|
22
|
+
});
|
|
23
|
+
const apiTokenStore = new fake_api_token_store_1.default();
|
|
24
|
+
const insertCalled = new Promise((resolve) => {
|
|
25
|
+
apiTokenStore.on('insert', resolve);
|
|
26
|
+
});
|
|
27
|
+
new api_token_service_1.ApiTokenService({ apiTokenStore }, config);
|
|
28
|
+
await insertCalled;
|
|
29
|
+
const tokens = await apiTokenStore.getAll();
|
|
30
|
+
expect(tokens).toHaveLength(1);
|
|
31
|
+
});
|
|
32
|
+
//# sourceMappingURL=api-token-service.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"api-token-service.test.js","sourceRoot":"","sources":["../../../src/lib/services/api-token-service.test.ts"],"names":[],"mappings":";;;;;AAAA,2DAAsD;AACtD,+DAAiE;AAEjE,yDAAyD;AACzD,oGAAyE;AAEzE,IAAI,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IACrC,MAAM,KAAK,GAAG;QACV,WAAW,EAAE,GAAG;QAChB,OAAO,EAAE,GAAG;QACZ,MAAM,EAAE,wBAAwB;QAChC,IAAI,EAAE,wBAAY,CAAC,KAAK;QACxB,QAAQ,EAAE,OAAO;KACpB,CAAC;IAEF,MAAM,MAAM,GAAmB,IAAA,8BAAgB,EAAC;QAC5C,cAAc,EAAE;YACZ,aAAa,EAAE,CAAC,KAAK,CAAC;SACzB;KACJ,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,IAAI,8BAAiB,EAAE,CAAC;IAC9C,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACzC,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,IAAI,mCAAe,CAAC,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,CAAC;IAE/C,MAAM,YAAY,CAAC;IAEnB,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC;IAE5C,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { IUnleashConfig } from '../types/option';
|
|
2
2
|
import { IUnleashStores } from '../types/stores';
|
|
3
3
|
import { FeatureConfigurationClient } from '../types/stores/feature-strategies-store';
|
|
4
|
-
import { FeatureToggle, FeatureToggleDTO,
|
|
4
|
+
import { FeatureToggle, FeatureToggleDTO, FeatureToggleLegacy, FeatureToggleWithEnvironment, IFeatureEnvironmentInfo, IFeatureOverview, IFeatureStrategy, IFeatureToggleQuery, IStrategyConfig, IVariant } from '../types/model';
|
|
5
5
|
import { Operation } from 'fast-json-patch';
|
|
6
6
|
interface IFeatureContext {
|
|
7
7
|
featureName: string;
|
|
@@ -101,8 +101,8 @@ declare class FeatureToggleService {
|
|
|
101
101
|
getMetadataForAllFeatures(archived: boolean): Promise<FeatureToggle[]>;
|
|
102
102
|
getProjectId(name: string): Promise<string>;
|
|
103
103
|
updateFeatureStrategyProject(featureName: string, newProjectId: string): Promise<void>;
|
|
104
|
-
updateVariants(featureName: string, newVariants: Operation[]): Promise<FeatureToggle>;
|
|
105
|
-
saveVariants(featureName: string, newVariants: IVariant[]): Promise<FeatureToggle>;
|
|
104
|
+
updateVariants(featureName: string, project: string, newVariants: Operation[], createdBy: string): Promise<FeatureToggle>;
|
|
105
|
+
saveVariants(featureName: string, project: string, newVariants: IVariant[], createdBy: string): Promise<FeatureToggle>;
|
|
106
106
|
fixVariantWeights(variants: IVariant[]): IVariant[];
|
|
107
107
|
}
|
|
108
108
|
export default FeatureToggleService;
|