unleash-server 4.1.4 → 4.2.0-beta.1

package/dist/test/e2e/helpers/database-init.js

@@ -4,13 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const events_1 = require("events");
-const migrator_1 = __importDefault(require("../../../migrator"));
+const migrator_1 = require("../../../migrator");
 const db_1 = require("../../../lib/db");
 const db_pool_1 = require("../../../lib/db/db-pool");
-const database_config_1 = __importDefault(require("./database-config"));
+const database_config_1 = require("./database-config");
 const test_config_1 = require("../../config/test-config");
 const database_json_1 = __importDefault(require("./database.json"));
 const no_logger_1 = __importDefault(require("../../fixtures/no-logger"));
+const constants_1 = require("../../../lib/util/constants");
 // require('db-migrate-shared').log.silence(false);
 // because of migrator bug
 delete process.env.DATABASE_URL;
@@ -46,10 +47,10 @@ function createTagTypes(store) {
     return database_json_1.default.tag_types.map((t) => store.createTagType(t));
 }
 async function connectProject(store) {
-    await store.connectProject(':global:', 'default');
+    await store.connectProject(constants_1.DEFAULT_ENV, 'default');
 }
 async function createEnvironments(store) {
-    await Promise.all(database_json_1.default.environments.map(async (e) => store.upsert(e)));
+    await Promise.all(database_json_1.default.environments.map(async (e) => store.create(e)));
 }
 async function setupDatabase(stores) {
     await createEnvironments(stores.environmentStore);
@@ -57,12 +58,12 @@ async function setupDatabase(stores) {
     await Promise.all(createContextFields(stores.contextFieldStore));
     await Promise.all(createProjects(stores.projectStore));
     await Promise.all(createTagTypes(stores.tagTypeStore));
-    await connectProject(stores.environmentStore);
+    await connectProject(stores.featureEnvironmentStore);
 }
 async function init(databaseSchema = 'test', getLogger = no_logger_1.default) {
     const config = test_config_1.createTestConfig({
         db: {
-            ...database_config_1.default.getDb(),
+            ...database_config_1.getDbConfig(),
             pool: { min: 2, max: 8 },
             schema: databaseSchema,
             ssl: false,
@@ -74,7 +75,7 @@ async function init(databaseSchema = 'test', getLogger = no_logger_1.default) {
     await db.raw(`DROP SCHEMA IF EXISTS ${config.db.schema} CASCADE`);
     await db.raw(`CREATE SCHEMA IF NOT EXISTS ${config.db.schema}`);
     // @ts-ignore
-    await migrator_1.default({ ...config, databaseSchema: config.db.schema });
+    await migrator_1.migrateDb({ ...config, databaseSchema: config.db.schema });
     await db.destroy();
     const testDb = db_pool_1.createDb(config);
     const stores = await db_1.createStores(config, eventBus, testDb);

package/dist/test/e2e/helpers/database-init.js.map

@@ -1 +1 @@
-{"version":3,"file":"database-init.js","sourceRoot":"","sources":["../../../../src/test/e2e/helpers/database-init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"database-init.js","sourceRoot":"","sources":["../../../../src/test/e2e/helpers/database-init.ts"],"names":[],"mappings":"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"}

package/dist/test/e2e/helpers/database.json

@@ -29,8 +29,11 @@
     ],
     "environments": [
         {
-            "name": ":global:",
-            "displayName": "Across all environments"
+            "name": "default",
+            "type": "production",
+            "sortOrder": 1,
+            "enabled": true,
+            "protected": true
         }
     ],
     "tag_types": [

package/dist/test/e2e/helpers/test-helper.d.ts

@@ -8,6 +8,6 @@ export interface IUnleashTest {
 }
 export declare function setupApp(stores: IUnleashStores): Promise<IUnleashTest>;
 export declare function setupAppWithCustomConfig(stores: IUnleashStores, customOptions: any): Promise<IUnleashTest>;
-export declare function setupAppWithAuth(stores: IUnleashStores): Promise<IUnleashTest>;
+export declare function setupAppWithAuth(stores: IUnleashStores, customOptions?: any): Promise<IUnleashTest>;
 export declare function setupAppWithCustomAuth(stores: IUnleashStores, preHook: Function): Promise<IUnleashTest>;
 export declare function setupAppWithBaseUrl(stores: IUnleashStores): Promise<IUnleashTest>;

package/dist/test/e2e/helpers/test-helper.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupAppWithBaseUrl = exports.setupAppWithCustomAuth = exports.setupAppWithAuth = exports.setupAppWithCustomConfig = exports.setupApp = void 0;
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 const supertest_1 = __importDefault(require("supertest"));
 const events_1 = __importDefault(require("events"));
 const app_1 = __importDefault(require("../../../lib/app"));
@@ -41,14 +42,12 @@ async function setupApp(stores) {
     return createApp(stores);
 }
 exports.setupApp = setupApp;
-async function setupAppWithCustomConfig(stores, 
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-customOptions) {
+async function setupAppWithCustomConfig(stores, customOptions) {
     return createApp(stores, undefined, undefined, customOptions);
 }
 exports.setupAppWithCustomConfig = setupAppWithCustomConfig;
-async function setupAppWithAuth(stores) {
-    return createApp(stores, option_1.IAuthType.DEMO);
+async function setupAppWithAuth(stores, customOptions) {
+    return createApp(stores, option_1.IAuthType.DEMO, undefined, customOptions);
 }
 exports.setupAppWithAuth = setupAppWithAuth;
 async function setupAppWithCustomAuth(stores, preHook) {

package/dist/test/e2e/helpers/test-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-helper.js","sourceRoot":"","sources":["../../../../src/test/e2e/helpers/test-helper.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAElC,oDAAkC;AAClC,2DAAsC;AACtC,0DAA4D;AAC5D,sDAAsD;AACtD,oDAAuD;AACvD,oFAA2D;AAI3D,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC;AAQ9B,SAAS,SAAS,CACd,MAAM,EACN,mBAAmB,GAAG,kBAAS,CAAC,IAAI,EACpC,OAAkB,EAClB,aAAmB;IAEnB,MAAM,MAAM,GAAG,8BAAgB,CAAC;QAC5B,cAAc,EAAE;YACZ,IAAI,EAAE,mBAAmB;YACzB,iBAAiB,EAAE,OAAO;SAC7B;QACD,MAAM,EAAE;YACJ,UAAU,EAAE,uBAAuB;SACtC;QACD,GAAG,aAAa;KACnB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,yBAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,cAAc,GAAG,oBAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,gBAAY,EAAE,CAAC;IACnC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,GAAG,GAAG,aAAM,CACd,MAAM,EACN,MAAM,EACN,QAAQ,EACR,IAAI,gBAAY,EAAE,EAClB,cAAc,CACjB,CAAC;IACF,MAAM,OAAO,GAAG,mBAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAErC,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;QACvB,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QAClC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;QACxC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;IACvC,CAAC,CAAC;IAEF,6CAA6C;IAC7C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AAC1C,CAAC;AAEM,KAAK,UAAU,QAAQ,CAAC,MAAsB;IACjD,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAFD,4BAEC;AAEM,KAAK,UAAU,wBAAwB,CAC1C,MAAsB;AACtB,6EAA6E;AAC7E,aAAkB;IAElB,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AAClE,CAAC;AAND,4DAMC;AAEM,KAAK,UAAU,gBAAgB,CAClC,MAAsB;IAEtB,OAAO,SAAS,CAAC,MAAM,EAAE,kBAAS,CAAC,IAAI,CAAC,CAAC;AAC7C,CAAC;AAJD,4CAIC;AAEM,KAAK,UAAU,sBAAsB,CACxC,MAAsB,EACtB,OAAiB;IAEjB,OAAO,SAAS,CAAC,MAAM,EAAE,kBAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACxD,CAAC;AALD,wDAKC;AACM,KAAK,UAAU,mBAAmB,CACrC,MAAsB;IAEtB,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE;QAC3C,MAAM,EAAE;YACJ,UAAU,EAAE,uBAAuB;YACnC,WAAW,EAAE,SAAS;SACzB;KACJ,CAAC,CAAC;AACP,CAAC;AATD,kDASC"}
+{"version":3,"file":"test-helper.js","sourceRoot":"","sources":["../../../../src/test/e2e/helpers/test-helper.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAsE;AACtE,0DAAkC;AAElC,oDAAkC;AAClC,2DAAsC;AACtC,0DAA4D;AAC5D,sDAAsD;AACtD,oDAAuD;AACvD,oFAA2D;AAI3D,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC;AAQ9B,SAAS,SAAS,CACd,MAAM,EACN,mBAAmB,GAAG,kBAAS,CAAC,IAAI,EACpC,OAAkB,EAClB,aAAmB;IAEnB,MAAM,MAAM,GAAG,8BAAgB,CAAC;QAC5B,cAAc,EAAE;YACZ,IAAI,EAAE,mBAAmB;YACzB,iBAAiB,EAAE,OAAO;SAC7B;QACD,MAAM,EAAE;YACJ,UAAU,EAAE,uBAAuB;SACtC;QACD,GAAG,aAAa;KACnB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,yBAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,cAAc,GAAG,oBAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,gBAAY,EAAE,CAAC;IACnC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,GAAG,GAAG,aAAM,CACd,MAAM,EACN,MAAM,EACN,QAAQ,EACR,IAAI,gBAAY,EAAE,EAClB,cAAc,CACjB,CAAC;IACF,MAAM,OAAO,GAAG,mBAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAErC,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;QACvB,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QAClC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;QACxC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;IACvC,CAAC,CAAC;IAEF,6CAA6C;IAC7C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AAC1C,CAAC;AAEM,KAAK,UAAU,QAAQ,CAAC,MAAsB;IACjD,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAFD,4BAEC;AAEM,KAAK,UAAU,wBAAwB,CAC1C,MAAsB,EACtB,aAAkB;IAElB,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AAClE,CAAC;AALD,4DAKC;AAEM,KAAK,UAAU,gBAAgB,CAClC,MAAsB,EACtB,aAAmB;IAEnB,OAAO,SAAS,CAAC,MAAM,EAAE,kBAAS,CAAC,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AACvE,CAAC;AALD,4CAKC;AAEM,KAAK,UAAU,sBAAsB,CACxC,MAAsB,EACtB,OAAiB;IAEjB,OAAO,SAAS,CAAC,MAAM,EAAE,kBAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACxD,CAAC;AALD,wDAKC;AACM,KAAK,UAAU,mBAAmB,CACrC,MAAsB;IAEtB,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE;QAC3C,MAAM,EAAE;YACJ,UAAU,EAAE,uBAAuB;YACnC,WAAW,EAAE,SAAS;SACzB;KACJ,CAAC,CAAC;AACP,CAAC;AATD,kDASC"}

package/dist/test/e2e/services/api-token-service.e2e.test.js

@@ -7,7 +7,8 @@ const database_init_1 = __importDefault(require("../helpers/database-init"));
 const no_logger_1 = __importDefault(require("../../fixtures/no-logger"));
 const api_token_service_1 = require("../../../lib/services/api-token-service");
 const test_config_1 = require("../../config/test-config");
-const api_token_store_1 = require("../../../lib/types/stores/api-token-store");
+const api_token_1 = require("../../../lib/types/models/api-token");
+const constants_1 = require("../../../lib/util/constants");
 let db;
 let stores;
 let apiTokenService;
@@ -37,31 +38,37 @@ test('should have empty list of tokens', async () => {
     expect(activeTokens.length).toBe(0);
 });
 test('should create client token', async () => {
-    const token = await apiTokenService.creteApiToken({
+    const token = await apiTokenService.createApiToken({
         username: 'default-client',
-        type: api_token_store_1.ApiTokenType.CLIENT,
+        type: api_token_1.ApiTokenType.CLIENT,
+        project: '*',
+        environment: constants_1.DEFAULT_ENV,
     });
     const allTokens = await apiTokenService.getAllTokens();
     expect(allTokens.length).toBe(1);
     expect(token.secret.length > 32).toBe(true);
-    expect(token.type).toBe(api_token_store_1.ApiTokenType.CLIENT);
+    expect(token.type).toBe(api_token_1.ApiTokenType.CLIENT);
     expect(token.username).toBe('default-client');
     expect(allTokens[0].secret).toBe(token.secret);
 });
 test('should create admin token', async () => {
-    const token = await apiTokenService.creteApiToken({
+    const token = await apiTokenService.createApiToken({
         username: 'admin',
-        type: api_token_store_1.ApiTokenType.ADMIN,
+        type: api_token_1.ApiTokenType.ADMIN,
+        project: '*',
+        environment: '*',
     });
     expect(token.secret.length > 32).toBe(true);
-    expect(token.type).toBe(api_token_store_1.ApiTokenType.ADMIN);
+    expect(token.type).toBe(api_token_1.ApiTokenType.ADMIN);
 });
 test('should set expiry of token', async () => {
     const time = new Date('2022-01-01');
-    await apiTokenService.creteApiToken({
+    await apiTokenService.createApiToken({
         username: 'default-client',
-        type: api_token_store_1.ApiTokenType.CLIENT,
+        type: api_token_1.ApiTokenType.CLIENT,
         expiresAt: time,
+        project: '*',
+        environment: constants_1.DEFAULT_ENV,
     });
     const [token] = await apiTokenService.getAllTokens();
     expect(token.expiresAt).toEqual(time);
@@ -69,10 +76,12 @@ test('should set expiry of token', async () => {
 test('should update expiry of token', async () => {
     const time = new Date('2022-01-01');
     const newTime = new Date('2023-01-01');
-    const token = await apiTokenService.creteApiToken({
+    const token = await apiTokenService.createApiToken({
         username: 'default-client',
-        type: api_token_store_1.ApiTokenType.CLIENT,
+        type: api_token_1.ApiTokenType.CLIENT,
         expiresAt: time,
+        project: '*',
+        environment: constants_1.DEFAULT_ENV,
     });
     await apiTokenService.updateExpiry(token.secret, newTime);
     const [updatedToken] = await apiTokenService.getAllTokens();
@@ -81,15 +90,19 @@ test('should update expiry of token', async () => {
 test('should only return valid tokens', async () => {
     const today = new Date();
     const tomorrow = new Date(today.getTime() + 24 * 60 * 60 * 1000);
-    await apiTokenService.creteApiToken({
+    await apiTokenService.createApiToken({
         username: 'default-expired',
-        type: api_token_store_1.ApiTokenType.CLIENT,
+        type: api_token_1.ApiTokenType.CLIENT,
         expiresAt: new Date('2021-01-01'),
+        project: '*',
+        environment: constants_1.DEFAULT_ENV,
     });
-    const activeToken = await apiTokenService.creteApiToken({
+    const activeToken = await apiTokenService.createApiToken({
         username: 'default-valid',
-        type: api_token_store_1.ApiTokenType.CLIENT,
+        type: api_token_1.ApiTokenType.CLIENT,
         expiresAt: tomorrow,
+        project: '*',
+        environment: constants_1.DEFAULT_ENV,
     });
     const tokens = await apiTokenService.getAllActiveTokens();
     expect(tokens.length).toBe(1);

package/dist/test/e2e/services/api-token-service.e2e.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-token-service.e2e.test.js","sourceRoot":"","sources":["../../../../src/test/e2e/services/api-token-service.e2e.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-token-service.e2e.test.js","sourceRoot":"","sources":["../../../../src/test/e2e/services/api-token-service.e2e.test.ts"],"names":[],"mappings":"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"}

package/dist/test/e2e/services/environment-service.test.js

@@ -20,91 +20,89 @@ beforeAll(async () => {
 afterAll(async () => {
     await db.destroy();
 });
-test('Can create and get environment', async () => {
-    const created = await service.create({
+test('Can get environment', async () => {
+    const created = await db.stores.environmentStore.create({
         name: 'testenv',
-        displayName: 'Environment for testing',
+        type: 'production',
     });
     const retrieved = await service.get('testenv');
     expect(retrieved).toEqual(created);
 });
-test('Can delete environment', async () => {
-    await service.create({
-        name: 'testenv',
-        displayName: 'Environment for testing',
-    });
-    await service.delete('testenv');
-    return expect(async () => service.get('testenv')).rejects.toThrow(notfound_error_1.default);
-});
 test('Can get all', async () => {
-    await service.create({
-        name: 'testenv',
-        displayName: 'Environment for testing',
+    await db.stores.environmentStore.create({
+        name: 'testenv2',
+        type: 'production',
     });
     const environments = await service.getAll();
-    expect(environments).toHaveLength(2); // the one we created plus ':global:'
-});
-test('Can update display name', async () => {
-    await service.create({
-        name: 'testenv',
-        displayName: 'Environment for testing',
-    });
-    await service.update('testenv', { displayName: 'Different name' });
-    const updated = await service.get('testenv');
-    expect(updated.displayName).toEqual('Different name');
+    expect(environments).toHaveLength(3); // the one we created plus 'default'
 });
 test('Can connect environment to project', async () => {
-    await service.create({ name: 'test-connection', displayName: '' });
-    await stores.featureToggleStore.createFeature('default', {
+    await db.stores.environmentStore.create({
+        name: 'test-connection',
+        type: 'production',
+    });
+    await stores.featureToggleStore.create('default', {
         name: 'test-connection',
         type: 'release',
         description: '',
         stale: false,
         variants: [],
     });
-    await service.connectProjectToEnvironment('test-connection', 'default');
-    const overview = await stores.projectStore.getProjectOverview('default', false);
+    await service.addEnvironmentToProject('test-connection', 'default');
+    const overview = await stores.featureStrategiesStore.getFeatureOverview('default', false);
     overview.forEach((f) => {
         expect(f.environments).toEqual([
             {
                 name: 'test-connection',
-                displayName: '',
                 enabled: false,
+                sortOrder: 9999,
+                type: 'production',
             },
         ]);
     });
 });
 test('Can remove environment from project', async () => {
-    await service.create({ name: 'removal-test', displayName: '' });
-    await stores.featureToggleStore.createFeature('default', {
+    await db.stores.environmentStore.create({
+        name: 'removal-test',
+        type: 'production',
+    });
+    await stores.featureToggleStore.create('default', {
         name: 'removal-test',
     });
     await service.removeEnvironmentFromProject('test-connection', 'default');
-    await service.connectProjectToEnvironment('removal-test', 'default');
-    let overview = await stores.projectStore.getProjectOverview('default', false);
+    await service.addEnvironmentToProject('removal-test', 'default');
+    let overview = await stores.featureStrategiesStore.getFeatureOverview('default', false);
     expect(overview.length).toBeGreaterThan(0);
     overview.forEach((f) => {
         expect(f.environments).toEqual([
             {
                 name: 'removal-test',
-                displayName: '',
                 enabled: false,
+                sortOrder: 9999,
+                type: 'production',
             },
         ]);
     });
     await service.removeEnvironmentFromProject('removal-test', 'default');
-    overview = await stores.projectStore.getProjectOverview('default', false);
+    overview = await stores.featureStrategiesStore.getFeatureOverview('default', false);
     expect(overview.length).toBeGreaterThan(0);
     overview.forEach((o) => {
         expect(o.environments).toEqual([]);
     });
 });
 test('Adding same environment twice should throw a NameExistsError', async () => {
-    await service.create({ name: 'uniqueness-test', displayName: '' });
+    await db.stores.environmentStore.create({
+        name: 'uniqueness-test',
+        type: 'production',
+    });
     await service.removeEnvironmentFromProject('test-connection', 'default');
     await service.removeEnvironmentFromProject('removal-test', 'default');
-    await service.connectProjectToEnvironment('uniqueness-test', 'default');
-    return expect(async () => service.connectProjectToEnvironment('uniqueness-test', 'default')).rejects.toThrow(new name_exists_error_1.default('default already has the environment uniqueness-test enabled'));
+    await service.addEnvironmentToProject('uniqueness-test', 'default');
+    return expect(async () => service.addEnvironmentToProject('uniqueness-test', 'default')).rejects.toThrow(new name_exists_error_1.default('default already has the environment uniqueness-test enabled'));
 });
 test('Removing environment not connected to project should be a noop', async () => expect(async () => service.removeEnvironmentFromProject('some-non-existing-environment', 'default')).resolves);
+test('Trying to get an environment that does not exist throws NotFoundError', async () => {
+    const envName = 'this-should-not-exist';
+    await expect(async () => service.get(envName)).rejects.toThrow(new notfound_error_1.default(`Could not find environment with name: ${envName}`));
+});
 //# sourceMappingURL=environment-service.test.js.map

package/dist/test/e2e/services/environment-service.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"environment-service.test.js","sourceRoot":"","sources":["../../../../src/test/e2e/services/environment-service.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"environment-service.test.js","sourceRoot":"","sources":["../../../../src/test/e2e/services/environment-service.test.ts"],"names":[],"mappings":";;;;;AAAA,oGAA2E;AAC3E,0DAA4D;AAC5D,6EAA8C;AAC9C,uFAA8D;AAE9D,6FAAmE;AAEnE,IAAI,MAAsB,CAAC;AAC3B,IAAI,EAAE,CAAC;AACP,IAAI,OAA2B,CAAC;AAEhC,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,MAAM,GAAG,8BAAgB,EAAE,CAAC;IAClC,EAAE,GAAG,MAAM,uBAAM,CAAC,4BAA4B,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAClE,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;IACnB,OAAO,GAAG,IAAI,6BAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACrD,CAAC,CAAC,CAAC;AACH,QAAQ,CAAC,KAAK,IAAI,EAAE;IAChB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;IACnC,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC;QACpD,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,YAAY;KACrB,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/C,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;IAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,YAAY;KACrB,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;IAC5C,MAAM,CAAC,YAAY,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,oCAAoC;AAC9E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;IAClD,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,YAAY;KACrB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,SAAS,EAAE;QAC9C,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,EAAE;KACf,CAAC,CAAC;IACH,MAAM,OAAO,CAAC,uBAAuB,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,kBAAkB,CACnE,SAAS,EACT,KAAK,CACR,CAAC;IACF,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACnB,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;YAC3B;gBACI,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,IAAI;gBACf,IAAI,EAAE,YAAY;aACrB;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;IACnD,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,YAAY;KACrB,CAAC,CAAC;IACH,MAAM,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,SAAS,EAAE;QAC9C,IAAI,EAAE,cAAc;KACvB,CAAC,CAAC;IACH,MAAM,OAAO,CAAC,4BAA4B,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;IACzE,MAAM,OAAO,CAAC,uBAAuB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IACjE,IAAI,QAAQ,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,kBAAkB,CACjE,SAAS,EACT,KAAK,CACR,CAAC;IACF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACnB,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;YAC3B;gBACI,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,KAAK;gBACd,SAAS,EAAE,IAAI;gBACf,IAAI,EAAE,YAAY;aACrB;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,CAAC,4BAA4B,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IACtE,QAAQ,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,kBAAkB,CAC7D,SAAS,EACT,KAAK,CACR,CAAC;IACF,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACnB,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;IAC5E,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC;QACpC,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,YAAY;KACrB,CAAC,CAAC;IACH,MAAM,OAAO,CAAC,4BAA4B,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;IACzE,MAAM,OAAO,CAAC,4BAA4B,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAEtE,MAAM,OAAO,CAAC,uBAAuB,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;IACpE,OAAO,MAAM,CAAC,KAAK,IAAI,EAAE,CACrB,OAAO,CAAC,uBAAuB,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAChE,CAAC,OAAO,CAAC,OAAO,CACb,IAAI,2BAAe,CACf,6DAA6D,CAChE,CACJ,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE,CAC9E,MAAM,CAAC,KAAK,IAAI,EAAE,CACd,OAAO,CAAC,4BAA4B,CAChC,+BAA+B,EAC/B,SAAS,CACZ,CACJ,CAAC,QAAQ,CAAC,CAAC;AAEhB,IAAI,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;IACrF,MAAM,OAAO,GAAG,uBAAuB,CAAC;IACxC,MAAM,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAC1D,IAAI,wBAAa,CAAC,yCAAyC,OAAO,EAAE,CAAC,CACxE,CAAC;AACN,CAAC,CAAC,CAAC"}

package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js

@@ -8,7 +8,7 @@ const events_1 = require("../../../lib/types/events");
 const feature_toggle_service_v2_1 = __importDefault(require("../../../lib/services/feature-toggle-service-v2"));
 const test_config_1 = require("../../config/test-config");
 const database_init_1 = __importDefault(require("../helpers/database-init"));
-const environment_1 = require("../../../lib/types/environment");
+const constants_1 = require("../../../lib/util/constants");
 let stores;
 let db;
 let service;
@@ -24,6 +24,8 @@ afterAll(async () => {
     await db.destroy();
 });
 test('Should create feature toggle strategy configuration', async () => {
+    const projectId = 'default';
+    const username = 'feature-toggle';
     const config = {
         name: 'default',
         constraints: [],
@@ -32,22 +34,24 @@ test('Should create feature toggle strategy configuration', async () => {
     await service.createFeatureToggle('default', {
         name: 'Demo',
     }, 'test');
-    const createdConfig = await service.createStrategy(config, 'default', 'Demo');
+    const createdConfig = await service.createStrategy(config, projectId, 'Demo', username);
     expect(createdConfig.name).toEqual('default');
     expect(createdConfig.id).toBeDefined();
 });
 test('Should be able to update existing strategy configuration', async () => {
+    const projectId = 'default';
+    const username = 'existing-strategy';
     const config = {
         name: 'default',
         constraints: [],
         parameters: {},
     };
-    await service.createFeatureToggle('default', {
+    await service.createFeatureToggle(projectId, {
         name: 'update-existing-strategy',
     }, 'test');
-    const createdConfig = await service.createStrategy(config, 'default', 'update-existing-strategy');
+    const createdConfig = await service.createStrategy(config, 'default', 'update-existing-strategy', username);
     expect(createdConfig.name).toEqual('default');
-    const updatedConfig = await service.updateStrategy(createdConfig.id, {
+    const updatedConfig = await service.updateStrategy(createdConfig.id, constants_1.DEFAULT_ENV, projectId, username, {
         parameters: { b2b: true },
     });
     expect(createdConfig.id).toEqual(updatedConfig.id);
@@ -64,14 +68,16 @@ test('Should include legacy props in event log when updating strategy configurat
     await service.createFeatureToggle('default', {
         name: featureName,
     }, userName);
-    await service.createStrategy(config, 'default', featureName);
-    await service.updateEnabled(featureName, environment_1.GLOBAL_ENV, true, userName);
+    await service.createStrategy(config, 'default', featureName, userName);
+    await service.updateEnabled('default', featureName, constants_1.DEFAULT_ENV, true, userName);
     const events = await eventService.getEventsForToggle(featureName);
-    expect(events[0].type).toBe(events_1.FEATURE_UPDATED);
-    expect(events[0].data.enabled).toBe(true);
-    expect(events[0].data.strategies).toBeDefined();
+    const updatedEvent = events.find((e) => e.type === events_1.FEATURE_UPDATED);
+    expect(updatedEvent.type).toBe(events_1.FEATURE_UPDATED);
+    expect(updatedEvent.data.enabled).toBe(true);
+    expect(updatedEvent.data.strategies).toBeDefined();
 });
 test('Should be able to get strategy by id', async () => {
+    const userName = 'strategy';
     const config = {
         name: 'default',
         constraints: [],
@@ -80,7 +86,7 @@ test('Should be able to get strategy by id', async () => {
     await service.createFeatureToggle('default', {
         name: 'get-strategy-by-id',
     }, 'test');
-    const createdConfig = await service.createStrategy(config, 'default', 'Demo');
+    const createdConfig = await service.createStrategy(config, 'default', 'Demo', userName, constants_1.DEFAULT_ENV);
     const fetchedConfig = await service.getStrategy(createdConfig.id);
     expect(fetchedConfig).toEqual(createdConfig);
 });

package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"feature-toggle-service-v2.e2e.test.js","sourceRoot":"","sources":["../../../../src/test/e2e/services/feature-toggle-service-v2.e2e.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"feature-toggle-service-v2.e2e.test.js","sourceRoot":"","sources":["../../../../src/test/e2e/services/feature-toggle-service-v2.e2e.test.ts"],"names":[],"mappings":"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"}

package/dist/test/e2e/services/project-health-service.e2e.test.js

@@ -28,7 +28,7 @@ beforeAll(async () => {
     accessService = new access_service_1.AccessService(stores, config);
     featureToggleService = new feature_toggle_service_v2_1.default(stores, config);
     projectService = new project_service_1.default(stores, config, accessService, featureToggleService);
-    projectHealthService = new project_health_service_1.default(stores, config);
+    projectHealthService = new project_health_service_1.default(stores, config, featureToggleService);
 });
 afterAll(async () => {
     await db.destroy();
@@ -40,12 +40,12 @@ test('Project with no stale toggles should have 100% health rating', async () =>
         description: 'Fancy',
     };
     const savedProject = await projectService.createProject(project, user);
-    await stores.featureToggleStore.createFeature('health-rating', {
+    await stores.featureToggleStore.create('health-rating', {
         name: 'health-rating-not-stale',
         description: 'new',
         stale: false,
     });
-    await stores.featureToggleStore.createFeature('health-rating', {
+    await stores.featureToggleStore.create('health-rating', {
         name: 'health-rating-not-stale-2',
         description: 'new too',
         stale: false,
@@ -60,22 +60,22 @@ test('Project with two stale toggles and two non stale should have 50% health ra
         description: 'Fancy',
     };
     const savedProject = await projectService.createProject(project, user);
-    await stores.featureToggleStore.createFeature('health-rating-2', {
+    await stores.featureToggleStore.create('health-rating-2', {
         name: 'health-rating-2-not-stale',
         description: 'new',
         stale: false,
     });
-    await stores.featureToggleStore.createFeature('health-rating-2', {
+    await stores.featureToggleStore.create('health-rating-2', {
         name: 'health-rating-2-not-stale-2',
         description: 'new too',
         stale: false,
     });
-    await stores.featureToggleStore.createFeature('health-rating-2', {
+    await stores.featureToggleStore.create('health-rating-2', {
         name: 'health-rating-2-stale-1',
         description: 'stale',
         stale: true,
     });
-    await stores.featureToggleStore.createFeature('health-rating-2', {
+    await stores.featureToggleStore.create('health-rating-2', {
         name: 'health-rating-2-stale-2',
         description: 'stale too',
         stale: true,
@@ -90,19 +90,19 @@ test('Project with one non-stale, one potentially stale and one stale should hav
         description: 'Fancy',
     };
     const savedProject = await projectService.createProject(project, user);
-    await stores.featureToggleStore.createFeature('health-rating-3', {
+    await stores.featureToggleStore.create('health-rating-3', {
         name: 'health-rating-3-not-stale',
         description: 'new',
         stale: false,
     });
-    await stores.featureToggleStore.createFeature('health-rating-3', {
+    await stores.featureToggleStore.create('health-rating-3', {
         name: 'health-rating-3-potentially-stale',
         description: 'new too',
         type: 'release',
         stale: false,
         createdAt: new Date(Date.UTC(2020, 1, 1)),
     });
-    await stores.featureToggleStore.createFeature('health-rating-3', {
+    await stores.featureToggleStore.create('health-rating-3', {
         name: 'health-rating-3-stale',
         description: 'stale',
         stale: true,

package/dist/test/e2e/services/project-health-service.e2e.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"project-health-service.e2e.test.js","sourceRoot":"","sources":["../../../../src/test/e2e/services/project-health-service.e2e.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"project-health-service.e2e.test.js","sourceRoot":"","sources":["../../../../src/test/e2e/services/project-health-service.e2e.test.ts"],"names":[],"mappings":"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"}