unleash-server 5.3.5 → 5.4.0

package/dist/lib/services/access-service.js

@@ -46,7 +46,7 @@ const PROJECT_ADMIN = [
 ];
 const isProjectPermission = (permission) => PROJECT_ADMIN.includes(permission);
 class AccessService {
-    constructor({ accessStore, accountStore, roleStore, environmentStore, }, { getLogger, flagResolver, }, groupService) {
+    constructor({ accessStore, accountStore, roleStore, environmentStore, groupStore, }, { getLogger, flagResolver, }, groupService) {
         this.store = accessStore;
         this.accountStore = accountStore;
         this.roleStore = roleStore;
@@ -54,6 +54,7 @@ class AccessService {
         this.environmentStore = environmentStore;
         this.logger = getLogger('/services/access-service.ts');
         this.flagResolver = flagResolver;
+        this.groupStore = groupStore;
     }
     /**
      * Used to check if a user has access to the requested resource
@@ -219,6 +220,13 @@ class AccessService {
         }
         return [];
     }
+    async getGroupsForRole(roleId) {
+        const groupdIdList = await this.store.getGroupIdsForRole(roleId);
+        if (groupdIdList.length > 0) {
+            return this.groupStore.getAllWithId(groupdIdList);
+        }
+        return [];
+    }
     async getProjectUsersForRole(roleId, projectId) {
         const userRoleList = await this.store.getProjectUsersForRole(roleId, projectId);
         if (userRoleList.length > 0) {
@@ -243,6 +251,9 @@ class AccessService {
         const groups = await this.groupService.getProjectGroups(projectId);
         return [roles, users.flat(), groups];
     }
+    async getProjectRoleUsage(roleId) {
+        return this.store.getProjectUserAndGroupCountsForRole(roleId);
+    }
     async createDefaultProjectRoles(owner, projectId) {
         if (!projectId) {
             throw new Error('ProjectId cannot be empty');
@@ -288,7 +299,7 @@ class AccessService {
             ? constants_1.CUSTOM_ROOT_ROLE_TYPE
             : constants_1.CUSTOM_PROJECT_ROLE_TYPE;
         if (roleType === constants_1.CUSTOM_ROOT_ROLE_TYPE &&
-            !this.flagResolver.isEnabled('customRootRoles')) {
+            this.flagResolver.isEnabled('customRootRolesKillSwitch')) {
             throw new invalid_operation_error_1.default('Custom root roles are not enabled.');
         }
         const baseRole = {
@@ -312,7 +323,7 @@ class AccessService {
             ? constants_1.CUSTOM_ROOT_ROLE_TYPE
             : constants_1.CUSTOM_PROJECT_ROLE_TYPE;
         if (roleType === constants_1.CUSTOM_ROOT_ROLE_TYPE &&
-            !this.flagResolver.isEnabled('customRootRoles')) {
+            this.flagResolver.isEnabled('customRootRolesKillSwitch')) {
             throw new invalid_operation_error_1.default('Custom root roles are not enabled.');
         }
         await this.validateRole(role, role.id);
@@ -338,8 +349,9 @@ class AccessService {
     async deleteRole(id) {
         await this.validateRoleIsNotBuiltIn(id);
         const roleUsers = await this.getUsersForRole(id);
-        if (roleUsers.length > 0) {
-            throw new role_in_use_error_1.default('Role is in use by more than one user. You cannot delete a role that is in use without first removing the role from the users.');
+        const roleGroups = await this.getGroupsForRole(id);
+        if (roleUsers.length > 0 || roleGroups.length > 0) {
+            throw new role_in_use_error_1.default(`Role is in use by users(${roleUsers.length}) or groups(${roleGroups.length}). You cannot delete a role that is in use without first removing the role from the users and groups.`);
         }
         return this.roleStore.delete(id);
     }

package/dist/lib/services/access-service.js.map

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

package/dist/lib/services/access-service.test.js

@@ -6,14 +6,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const name_exists_error_1 = __importDefault(require("../error/name-exists-error"));
 const no_logger_1 = __importDefault(require("../../test/fixtures/no-logger"));
 const createAccessService_1 = require("../features/access/createAccessService");
+const access_service_1 = require("./access-service");
 const test_config_1 = require("../../test/config/test-config");
 const constants_1 = require("../util/constants");
-function getSetup(customRootRoles = false) {
+const fake_group_store_1 = __importDefault(require("../../test/fixtures/fake-group-store"));
+const fake_account_store_1 = require("../../test/fixtures/fake-account-store");
+const fake_role_store_1 = __importDefault(require("../../test/fixtures/fake-role-store"));
+const fake_environment_store_1 = __importDefault(require("../../test/fixtures/fake-environment-store"));
+const fake_access_store_1 = __importDefault(require("../../test/fixtures/fake-access-store"));
+const group_service_1 = require("../services/group-service");
+const fake_event_store_1 = __importDefault(require("../../test/fixtures/fake-event-store"));
+function getSetup(customRootRolesKillSwitch = true) {
     const config = (0, test_config_1.createTestConfig)({
         getLogger: no_logger_1.default,
         experimental: {
             flags: {
-                customRootRoles: customRootRoles,
+                customRootRolesKillSwitch,
             },
         },
     });
@@ -135,7 +143,7 @@ test('should be able to validate and cleanup with additional properties', async
     });
 });
 test('user with custom root role should get a user root role', async () => {
-    const { accessService } = getSetup(true);
+    const { accessService } = getSetup(false);
     const customRootRole = await accessService.createRole({
         name: 'custom-root-role',
         description: 'test custom root role',
@@ -151,4 +159,42 @@ test('user with custom root role should get a user root role', async () => {
     expect(roles).toHaveLength(1);
     expect(roles[0].name).toBe('custom-root-role');
 });
+test('throws error when trying to delete a project role in use by group', async () => {
+    const groupIdResultOverride = async () => {
+        return [1];
+    };
+    const config = (0, test_config_1.createTestConfig)({
+        getLogger: no_logger_1.default,
+    });
+    const eventStore = new fake_event_store_1.default();
+    const groupStore = new fake_group_store_1.default();
+    groupStore.getAllWithId = async () => {
+        return [{ name: 'group' }];
+    };
+    const accountStore = new fake_account_store_1.FakeAccountStore();
+    const roleStore = new fake_role_store_1.default();
+    const environmentStore = new fake_environment_store_1.default();
+    const accessStore = new fake_access_store_1.default();
+    accessStore.getGroupIdsForRole = groupIdResultOverride;
+    accessStore.getUserIdsForRole = async () => {
+        return [];
+    };
+    accessStore.get = async () => {
+        return { id: 1, type: 'custom', name: 'project role' };
+    };
+    const groupService = new group_service_1.GroupService({ groupStore, eventStore, accountStore }, { getLogger: no_logger_1.default });
+    const accessService = new access_service_1.AccessService({
+        accessStore,
+        accountStore,
+        roleStore,
+        environmentStore,
+        groupStore,
+    }, config, groupService);
+    try {
+        await accessService.deleteRole(1);
+    }
+    catch (e) {
+        expect(e.toString()).toBe('RoleInUseError: Role is in use by users(0) or groups(1). You cannot delete a role that is in use without first removing the role from the users and groups.');
+    }
+});
 //# sourceMappingURL=access-service.test.js.map

package/dist/lib/services/access-service.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"access-service.test.js","sourceRoot":"","sources":["../../../src/lib/services/access-service.test.ts"],"names":[],"mappings":";;;;;AAAA,mFAAyD;AACzD,8EAAsD;AACtD,gFAAiF;AAEjF,+DAAiE;AACjE,iDAA0D;AAE1D,SAAS,QAAQ,CAAC,kBAA2B,KAAK;IAC9C,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC;QAC5B,SAAS,EAAT,mBAAS;QACT,YAAY,EAAE;YACV,KAAK,EAAE;gBACH,eAAe,EAAE,eAAe;aACnC;SACJ;KACJ,CAAC,CAAC;IAEH,OAAO;QACH,aAAa,EAAE,IAAA,6CAAuB,EAAC,MAAM,CAAC;KACjD,CAAC;AACN,CAAC;AAED,IAAI,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;IAC5C,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,EAAE,CAAC;IACrC,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC;QAChD,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,aAAa;QAC1B,WAAW,EAAE,EAAE;KAClB,CAAC,CAAC;IAEH,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAC5D,IAAI,2BAAe,CACf,6CAA6C,YAAY,CAAC,IAAI,EAAE,CACnE,CACJ,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;IAC1D,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,EAAE,CAAC;IAErC,MAAM,kBAAkB,GAAoB;QACxC,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,aAAa;KAC7B,CAAC;IACF,MAAM,CAAC,MAAM,aAAa,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAChE,kBAAkB,CACrB,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;IAClE,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,EAAE,CAAC;IACrC,MAAM,kBAAkB,GAAoB;QACxC,IAAI,EAAE,kBAAkB;KAC3B,CAAC;IACF,MAAM,CAAC,MAAM,aAAa,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC;QACjE,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,EAAE;KAClB,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;IAC/C,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,EAAE,CAAC;IACrC,MAAM,oBAAoB,GAAoB;QAC1C,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,aAAa;QAC1B,WAAW,EAAE,EAAE;KAClB,CAAC;IACF,MAAM,CAAC,MAAM,aAAa,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC;QACnE,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,aAAa;QAC1B,WAAW,EAAE,EAAE;KAClB,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;IACjF,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,EAAE,CAAC;IACrC,MAAM,+BAA+B,GAAoB;QACrD,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,aAAa;QAC1B,WAAW,EAAE;YACT;gBACI,EAAE,EAAE,CAAC;aACR;SACJ;KACJ,CAAC;IACF,MAAM,CACF,MAAM,aAAa,CAAC,YAAY,CAAC,+BAA+B,CAAC,CACpE,CAAC,OAAO,CAAC;QACN,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,aAAa;QAC1B,WAAW,EAAE;YACT;gBACI,EAAE,EAAE,CAAC;gBACL,WAAW,EAAE,EAAE;aAClB;SACJ;KACJ,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;IACnF,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,EAAE,CAAC;IAErC,MAAM,iBAAiB,GAAoB;QACvC,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,aAAa;QAC1B,WAAW,EAAE;YACT;gBACI,EAAE,EAAE,CAAC;gBACL,WAAW,EAAE,aAAa;aAC7B;SACJ;KACJ,CAAC;IACF,MAAM,CAAC,MAAM,aAAa,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC;QAChE,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,aAAa;QAC1B,WAAW,EAAE;YACT;gBACI,EAAE,EAAE,CAAC;gBACL,WAAW,EAAE,aAAa;aAC7B;SACJ;KACJ,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;IACjF,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,EAAE,CAAC;IACrC,MAAM,IAAI,GAAG;QACT,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,aAAa;QAC1B,UAAU,EAAE,UAAU;QACtB,WAAW,EAAE;YACT;gBACI,EAAE,EAAE,CAAC;gBACL,WAAW,EAAE,aAAa;gBAC1B,IAAI,EAAE,MAAM;gBACZ,WAAW,EAAE,aAAa;gBAC1B,IAAI,EAAE,MAAM;gBACZ,UAAU,EAAE,UAAU;aACzB;SACJ;KACJ,CAAC;IACF,MAAM,CAAC,MAAM,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;QACnD,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,aAAa;QAC1B,WAAW,EAAE;YACT;gBACI,EAAE,EAAE,CAAC;gBACL,WAAW,EAAE,aAAa;aAC7B;SACJ;KACJ,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;IACtE,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC;QAClD,IAAI,EAAE,kBAAkB;QACxB,WAAW,EAAE,uBAAuB;QACpC,IAAI,EAAE,iCAAqB;QAC3B,WAAW,EAAE,EAAE;KAClB,CAAC,CAAC;IACH,MAAM,IAAI,GAAG;QACT,EAAE,EAAE,CAAC;QACL,QAAQ,EAAE,cAAc,CAAC,EAAE;KAC9B,CAAC;IACF,MAAM,aAAa,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;IAEhE,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5D,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC"}
+{"version":3,"file":"access-service.test.js","sourceRoot":"","sources":["../../../src/lib/services/access-service.test.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/client-metrics/instance-service.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const schema_1 = require("./schema");
 const events_1 = require("../../types/events");
-const schema_2 = require("./schema");
+const schema_1 = require("./schema");
 const date_fns_1 = require("date-fns");
-const schema_3 = require("./schema");
+const schema_2 = require("./schema");
 class ClientInstanceService {
     constructor({ clientMetricsStoreV2, strategyStore, featureToggleStore, clientInstanceStore, clientApplicationsStore, eventStore, }, { getLogger }, bulkInterval = (0, date_fns_1.secondsToMilliseconds)(5), announcementInterval = (0, date_fns_1.minutesToMilliseconds)(5)) {
         this.apps = {};
@@ -24,7 +23,7 @@ class ClientInstanceService {
         this.timers.push(setInterval(() => this.announceUnannounced(), this.announcementInterval).unref());
     }
     async registerInstance(data, clientIp) {
-        const value = await schema_3.clientMetricsSchema.validateAsync(data);
+        const value = await schema_2.clientMetricsSchema.validateAsync(data);
         await this.clientInstanceStore.setLastSeen({
             appName: value.appName,
             instanceId: value.instanceId,
@@ -33,7 +32,7 @@ class ClientInstanceService {
         });
     }
     async registerClient(data, clientIp) {
-        const value = await schema_2.clientRegisterSchema.validateAsync(data);
+        const value = await schema_1.clientRegisterSchema.validateAsync(data);
         value.clientIp = clientIp;
         value.createdBy = clientIp;
         this.seenClients[this.clientKey(value)] = value;
@@ -115,8 +114,7 @@ class ClientInstanceService {
         await this.clientApplicationsStore.delete(appName);
     }
     async createApplication(input) {
-        const applicationData = await schema_1.applicationSchema.validateAsync(input);
-        await this.clientApplicationsStore.upsert(applicationData);
+        await this.clientApplicationsStore.upsert(input);
     }
     async removeInstancesOlderThanTwoDays() {
         return this.clientInstanceStore.removeInstancesOlderThanTwoDays();

package/dist/lib/services/client-metrics/instance-service.js.map

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

package/dist/lib/services/client-metrics/last-seen-service.d.ts

@@ -1,6 +1,10 @@
 import { IUnleashConfig } from '../../server-impl';
 import { IUnleashStores } from '../../types';
 import { IClientMetricsEnv } from '../../types/stores/client-metrics-store-v2';
+export declare type LastSeenInput = {
+    featureName: string;
+    environment: string;
+};
 export declare class LastSeenService {
     private timers;
     private lastSeenToggles;

package/dist/lib/services/client-metrics/last-seen-service.js

@@ -23,7 +23,10 @@ class LastSeenService {
     updateLastSeen(clientMetrics) {
         clientMetrics
             .filter((clientMetric) => clientMetric.yes > 0 || clientMetric.no > 0)
-            .forEach((clientMetric) => this.lastSeenToggles.add(clientMetric.featureName));
+            .forEach((clientMetric) => this.lastSeenToggles.add({
+            featureName: clientMetric.featureName,
+            environment: clientMetric.environment,
+        }));
     }
     destroy() {
         this.timers.forEach(clearInterval);

package/dist/lib/services/client-metrics/last-seen-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"last-seen-service.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/last-seen-service.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AAOjD,MAAa,eAAe;IASxB,YACI,EAAE,kBAAkB,EAA8C,EAClE,MAAsB,EACtB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,EAAE,CAAC;QAXxC,WAAM,GAAqB,EAAE,CAAC;QAE9B,oBAAe,GAAgB,IAAI,GAAG,EAAE,CAAC;QAW7C,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAC1B,+CAA+C,CAClD,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,gBAAgB,CAAC,CAAC,KAAK,EAAE,CAC5D,CAAC;IACN,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;QACxC,IAAI,KAAK,GAAG,CAAC,EAAE;YACX,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;YAClD,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,0BAA0B,eAAe,CAAC,MAAM,UAAU,CAC7D,CAAC;YACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;SAC9D;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,cAAc,CAAC,aAAkC;QAC7C,aAAa;aACR,MAAM,CACH,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,IAAI,YAAY,CAAC,EAAE,GAAG,CAAC,CAChE;aACA,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,CACtB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CACrD,CAAC;IACV,CAAC;IAED,OAAO;QACH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC;CACJ;AAlDD,0CAkDC"}
+{"version":3,"file":"last-seen-service.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/last-seen-service.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AAYjD,MAAa,eAAe;IASxB,YACI,EAAE,kBAAkB,EAA8C,EAClE,MAAsB,EACtB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,EAAE,CAAC;QAXxC,WAAM,GAAqB,EAAE,CAAC;QAE9B,oBAAe,GAAuB,IAAI,GAAG,EAAE,CAAC;QAWpD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAC1B,+CAA+C,CAClD,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,gBAAgB,CAAC,CAAC,KAAK,EAAE,CAC5D,CAAC;IACN,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;QACxC,IAAI,KAAK,GAAG,CAAC,EAAE;YACX,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;YAClD,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,0BAA0B,eAAe,CAAC,MAAM,UAAU,CAC7D,CAAC;YACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;SAC9D;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,cAAc,CAAC,aAAkC;QAC7C,aAAa;aACR,MAAM,CACH,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,IAAI,YAAY,CAAC,EAAE,GAAG,CAAC,CAChE;aACA,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,CACtB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC;YACrB,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,WAAW,EAAE,YAAY,CAAC,WAAW;SACxC,CAAC,CACL,CAAC;IACV,CAAC;IAED,OAAO;QACH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC;CACJ;AArDD,0CAqDC"}

package/dist/lib/services/client-metrics/models.d.ts

@@ -22,5 +22,7 @@ export interface IApplication {
     createdAt?: Date;
     instances?: IClientInstance[];
     seenToggles?: Record<string, any>;
+    project?: string;
+    environment?: string;
     links?: Record<string, string>;
 }

package/dist/lib/services/client-metrics/schema.js

@@ -82,5 +82,6 @@ exports.clientRegisterSchema = joi_1.default
     started: joi_1.default.date().required(),
     interval: joi_1.default.number().required(),
     environment: joi_1.default.string().optional(),
+    project: joi_1.default.string().optional(),
 });
 //# sourceMappingURL=schema.js.map

package/dist/lib/services/client-metrics/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/schema.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/feature-service-potentially-stale.test.js

@@ -36,7 +36,6 @@ test('Should only store events for potentially stale on', async () => {
         flagResolver: { isEnabled: () => true },
         experimental: {
             ...(config.experimental ?? {}),
-            emitPotentiallyStaleEvents: true,
         },
     }, {}, {}, {});
     await featureToggleService.updatePotentiallyStaleFeatures();

package/dist/lib/services/feature-service-potentially-stale.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"feature-service-potentially-stale.test.js","sourceRoot":"","sources":["../../../src/lib/services/feature-service-potentially-stale.test.ts"],"names":[],"mappings":";;;;;AAAA,oCAKkB;AAClB,+DAAiE;AACjE,sFAA4D;AAK5D,IAAI,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;IACjE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,cAAc,GAAG;QACnB,EAAE,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE;QAChE,EAAE,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE;KACpE,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,8BAAgB,GAAE,CAAC;IAClC,MAAM,oBAAoB,GAAG,IAAI,gCAAoB,CACjD;QACI,kBAAkB,EAAE;YAChB,8BAA8B,EAAE,GAAG,EAAE,CAAC,cAAc;SACvD;QACD,eAAe,EAAE;YACb,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE;SACjC;QACD,UAAU,EAAE;YACR,UAAU,EAAE,CAAC,MAAgB,EAAE,EAAE;gBAC7B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;gBAExB,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;oBACzB,WAAW,EAAE,UAAU;oBACvB,OAAO,EAAE,SAAS;oBAClB,IAAI,EAAE,oCAA4B;iBACrC,CAAC,CAAC;YACP,CAAC;SACJ;KACyB,EAC9B;QACI,GAAG,MAAM;QACT,YAAY,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE;QACvC,YAAY,EAAE;YACV,GAAG,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;YAC9B,0BAA0B,EAAE,IAAI;SACnC;KACyB,EAC9B,EAAqB,EACrB,EAAmB,EACnB,EAAmC,CACtC,CAAC;IAEF,MAAM,oBAAoB,CAAC,8BAA8B,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"feature-service-potentially-stale.test.js","sourceRoot":"","sources":["../../../src/lib/services/feature-service-potentially-stale.test.ts"],"names":[],"mappings":";;;;;AAAA,oCAKkB;AAClB,+DAAiE;AACjE,sFAA4D;AAK5D,IAAI,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;IACjE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,cAAc,GAAG;QACnB,EAAE,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE;QAChE,EAAE,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE;KACpE,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,8BAAgB,GAAE,CAAC;IAClC,MAAM,oBAAoB,GAAG,IAAI,gCAAoB,CACjD;QACI,kBAAkB,EAAE;YAChB,8BAA8B,EAAE,GAAG,EAAE,CAAC,cAAc;SACvD;QACD,eAAe,EAAE;YACb,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE;SACjC;QACD,UAAU,EAAE;YACR,UAAU,EAAE,CAAC,MAAgB,EAAE,EAAE;gBAC7B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC9B,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;gBAExB,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC;oBACzB,WAAW,EAAE,UAAU;oBACvB,OAAO,EAAE,SAAS;oBAClB,IAAI,EAAE,oCAA4B;iBACrC,CAAC,CAAC;YACP,CAAC;SACJ;KACyB,EAC9B;QACI,GAAG,MAAM;QACT,YAAY,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE;QACvC,YAAY,EAAE;YACV,GAAG,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;SACjC;KACyB,EAC9B,EAAqB,EACrB,EAAmB,EACnB,EAAmC,CACtC,CAAC;IAEF,MAAM,oBAAoB,CAAC,8BAA8B,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC"}

package/dist/lib/services/feature-toggle-service.js

@@ -431,24 +431,17 @@ class FeatureToggleService {
     }
     async getClientFeatures(query) {
         const result = await this.featureToggleClientStore.getClient(query || {});
-        if (this.flagResolver.isEnabled('cleanClientApi')) {
-            return result.map(({ name, type, enabled, project, stale, strategies, variants, description, createdAt, lastSeenAt, impressionData, }) => ({
-                name,
-                type,
-                enabled,
-                project,
-                stale,
-                strategies,
-                variants,
-                description,
-                createdAt,
-                lastSeenAt,
-                impressionData,
-            }));
-        }
-        else {
-            return result;
-        }
+        return result.map(({ name, type, enabled, project, stale, strategies, variants, description, impressionData, }) => ({
+            name,
+            type,
+            enabled,
+            project,
+            stale,
+            strategies,
+            variants,
+            description,
+            impressionData,
+        }));
     }
     async getPlaygroundFeatures(query) {
         const result = await this.featureToggleClientStore.getPlayground(query || {});
@@ -479,8 +472,7 @@ class FeatureToggleService {
         this.logger.info(`${createdBy} creates feature toggle ${value.name}`);
         await this.validateName(value.name);
         const exists = await this.projectStore.hasProject(projectId);
-        if (this.flagResolver.isEnabled('newProjectLayout') &&
-            (await this.projectStore.isFeatureLimitReached(projectId))) {
+        if (await this.projectStore.isFeatureLimitReached(projectId)) {
             throw new invalid_operation_error_1.default('You have reached the maximum number of feature toggles for this project.');
         }
         if (exists) {
@@ -1014,16 +1006,14 @@ class FeatureToggleService {
     }
     async updatePotentiallyStaleFeatures() {
         const potentiallyStaleFeatures = await this.featureToggleStore.updatePotentiallyStaleFeatures();
-        if (this.flagResolver.isEnabled('emitPotentiallyStaleEvents')) {
-            if (potentiallyStaleFeatures.length > 0) {
-                return this.eventStore.batchStore(await Promise.all(potentiallyStaleFeatures
-                    .filter((feature) => feature.potentiallyStale)
-                    .map(async ({ name, project }) => new types_1.PotentiallyStaleOnEvent({
-                    featureName: name,
-                    project,
-                    tags: await this.tagStore.getAllTagsForFeature(name),
-                }))));
-            }
+        if (potentiallyStaleFeatures.length > 0) {
+            return this.eventStore.batchStore(await Promise.all(potentiallyStaleFeatures
+                .filter((feature) => feature.potentiallyStale)
+                .map(async ({ name, project }) => new types_1.PotentiallyStaleOnEvent({
+                featureName: name,
+                project,
+                tags: await this.tagStore.getAllTagsForFeature(name),
+            }))));
         }
     }
 }