unleash-server 5.4.3 → 5.5.0

package/dist/lib/features/export-import-toggles/import-toggles-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-toggles-store.js","sourceRoot":"","sources":["../../../../src/lib/features/export-import-toggles/import-toggles-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"import-toggles-store.js","sourceRoot":"","sources":["../../../../src/lib/features/export-import-toggles/import-toggles-store.ts"],"names":[],"mappings":"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"}

package/dist/lib/features/export-import-toggles/import-validation-messages.d.ts

@@ -1,7 +1,23 @@
 import { FeatureStrategySchema, ImportTogglesValidateItemSchema } from '../../openapi';
 import { IContextFieldDto } from '../../types/stores/context-field-store';
+import { FeatureNameCheckResultWithFeaturePattern } from '../../services/feature-toggle-service';
+import { ProjectFeaturesLimit } from './import-toggles-store-type';
+export interface IErrorsParams {
+    projectName: string;
+    strategies: FeatureStrategySchema[];
+    contextFields: IContextFieldDto[];
+    otherProjectFeatures: string[];
+    duplicateFeatures: string[];
+    featureNameCheckResult: FeatureNameCheckResultWithFeaturePattern;
+    featureLimitResult: ProjectFeaturesLimit;
+}
+export interface IWarningParams {
+    usedCustomStrategies: string[];
+    archivedFeatures: string[];
+    existingFeatures: string[];
+}
 export declare class ImportValidationMessages {
     static compilePermissionErrors(missingPermissions: string[]): ImportTogglesValidateItemSchema[];
-    static compileErrors(projectName: string, strategies: FeatureStrategySchema[], contextFields: IContextFieldDto[], segments: string[], otherProjectFeatures: string[], changeRequestExists: boolean): ImportTogglesValidateItemSchema[];
-    static compileWarnings(usedCustomStrategies: string[], archivedFeatures: string[], existingFeatures: string[]): ImportTogglesValidateItemSchema[];
+    static compileErrors({ projectName, strategies, contextFields, otherProjectFeatures, duplicateFeatures, featureNameCheckResult, featureLimitResult, }: IErrorsParams): ImportTogglesValidateItemSchema[];
+    static compileWarnings({ usedCustomStrategies, existingFeatures, archivedFeatures, }: IWarningParams): ImportTogglesValidateItemSchema[];
 }

package/dist/lib/features/export-import-toggles/import-validation-messages.js

@@ -12,7 +12,7 @@ class ImportValidationMessages {
         }
         return errors;
     }
-    static compileErrors(projectName, strategies, contextFields, segments, otherProjectFeatures, changeRequestExists) {
+    static compileErrors({ projectName, strategies, contextFields, otherProjectFeatures, duplicateFeatures, featureNameCheckResult, featureLimitResult, }) {
         const errors = [];
         if (strategies.length > 0) {
             errors.push({
@@ -26,27 +26,43 @@ class ImportValidationMessages {
                 affectedItems: contextFields.map((contextField) => contextField.name),
             });
         }
-        if (segments.length > 0) {
+        if (otherProjectFeatures.length > 0) {
             errors.push({
-                message: 'We detected the following segments in the import file that need to be created first:',
-                affectedItems: segments,
+                message: `You cannot import a features that already exist in other projects. You already have the following features defined outside of project ${projectName}:`,
+                affectedItems: otherProjectFeatures,
             });
         }
-        if (changeRequestExists) {
+        if (duplicateFeatures.length > 0) {
             errors.push({
-                message: 'Before importing any data, please resolve your pending change request in this project and environment as it is preventing you from importing at this time',
-                affectedItems: [],
+                message: 'We detected the following features are duplicate in your import data:',
+                affectedItems: duplicateFeatures,
             });
         }
-        if (otherProjectFeatures.length > 0) {
+        if (featureNameCheckResult.state === 'invalid') {
+            const baseError = `Features imported into this project must match the project's feature naming pattern: "${featureNameCheckResult.featureNaming.pattern}".`;
+            const exampleInfo = featureNameCheckResult.featureNaming.example
+                ? ` For example: "${featureNameCheckResult.featureNaming.example}".`
+                : '';
+            const descriptionInfo = featureNameCheckResult.featureNaming
+                .description
+                ? ` The pattern is described as follows: "${featureNameCheckResult.featureNaming.description}"`
+                : '';
             errors.push({
-                message: `You cannot import a features that already exist in other projects. You already have the following features defined outside of project ${projectName}:`,
-                affectedItems: otherProjectFeatures,
+                message: `${baseError}${exampleInfo}${descriptionInfo} The following features do not match the pattern:`,
+                affectedItems: [...featureNameCheckResult.invalidNames].sort(),
+            });
+        }
+        if (featureLimitResult.currentFeaturesCount +
+            featureLimitResult.newFeaturesCount >
+            featureLimitResult.limit) {
+            errors.push({
+                message: `We detected you want to create ${featureLimitResult.newFeaturesCount} new features to a project that already has ${featureLimitResult.currentFeaturesCount} existing features, exceeding the maximum limit of ${featureLimitResult.limit}.`,
+                affectedItems: [],
             });
         }
         return errors;
     }
-    static compileWarnings(usedCustomStrategies, archivedFeatures, existingFeatures) {
+    static compileWarnings({ usedCustomStrategies, existingFeatures, archivedFeatures, }) {
         const warnings = [];
         if (usedCustomStrategies.length > 0) {
             warnings.push({

package/dist/lib/features/export-import-toggles/import-validation-messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-validation-messages.js","sourceRoot":"","sources":["../../../../src/lib/features/export-import-toggles/import-validation-messages.ts"],"names":[],"mappings":";;;AAMA,MAAa,wBAAwB;IACjC,MAAM,CAAC,uBAAuB,CAC1B,kBAA4B;QAE5B,MAAM,MAAM,GAAsC,EAAE,CAAC;QACrD,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,MAAM,CAAC,IAAI,CAAC;gBACR,OAAO,EACH,wDAAwD;gBAC5D,aAAa,EAAE,kBAAkB;aACpC,CAAC,CAAC;SACN;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,aAAa,CAChB,WAAmB,EACnB,UAAmC,EACnC,aAAiC,EACjC,QAAkB,EAClB,oBAA8B,EAC9B,mBAA4B;QAE5B,MAAM,MAAM,GAAsC,EAAE,CAAC;QAErD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,MAAM,CAAC,IAAI,CAAC;gBACR,OAAO,EACH,8FAA8F;gBAClG,aAAa,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;aAC7D,CAAC,CAAC;SACN;QACD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,MAAM,CAAC,IAAI,CAAC;gBACR,OAAO,EACH,yGAAyG;gBAC7G,aAAa,EAAE,aAAa,CAAC,GAAG,CAC5B,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CACtC;aACJ,CAAC,CAAC;SACN;QACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,CAAC,IAAI,CAAC;gBACR,OAAO,EACH,sFAAsF;gBAC1F,aAAa,EAAE,QAAQ;aAC1B,CAAC,CAAC;SACN;QACD,IAAI,mBAAmB,EAAE;YACrB,MAAM,CAAC,IAAI,CAAC;gBACR,OAAO,EACH,2JAA2J;gBAC/J,aAAa,EAAE,EAAE;aACpB,CAAC,CAAC;SACN;QACD,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC;gBACR,OAAO,EAAE,yIAAyI,WAAW,GAAG;gBAChK,aAAa,EAAE,oBAAoB;aACtC,CAAC,CAAC;SACN;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,eAAe,CAClB,oBAA8B,EAC9B,gBAA0B,EAC1B,gBAA0B;QAE1B,MAAM,QAAQ,GAAsC,EAAE,CAAC;QACvD,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE;YACjC,QAAQ,CAAC,IAAI,CAAC;gBACV,OAAO,EACH,6IAA6I;gBACjJ,aAAa,EAAE,oBAAoB;aACtC,CAAC,CAAC;SACN;QACD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,QAAQ,CAAC,IAAI,CAAC;gBACV,OAAO,EACH,0HAA0H;gBAC9H,aAAa,EAAE,gBAAgB;aAClC,CAAC,CAAC;SACN;QACD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,QAAQ,CAAC,IAAI,CAAC;gBACV,OAAO,EACH,+EAA+E;gBACnF,aAAa,EAAE,gBAAgB;aAClC,CAAC,CAAC;SACN;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ;AA/FD,4DA+FC"}
+{"version":3,"file":"import-validation-messages.js","sourceRoot":"","sources":["../../../../src/lib/features/export-import-toggles/import-validation-messages.ts"],"names":[],"mappings":"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"}

package/dist/lib/features/feature-naming-pattern/feature-naming-validation.d.ts

@@ -0,0 +1,14 @@
+import { IFeatureNaming } from '../../types/model';
+export declare const checkFeatureNamingData: (featureNaming: IFeatureNaming) => {
+    state: 'valid';
+} | {
+    state: 'invalid';
+    reasons: [string, ...string[]];
+};
+export declare type FeatureNameCheckResult = {
+    state: 'valid';
+} | {
+    state: 'invalid';
+    invalidNames: Set<string>;
+};
+export declare const checkFeatureFlagNamesAgainstPattern: (featureNames: string[], pattern: string | null | undefined) => FeatureNameCheckResult;

package/dist/lib/features/feature-naming-pattern/feature-naming-validation.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkFeatureFlagNamesAgainstPattern = exports.checkFeatureNamingData = void 0;
+const compileRegex = (pattern) => new RegExp(`^${pattern}$`);
+const disallowedStrings = [' ', '\\t', '\\s', '\\n', '\\r', '\\f', '\\v'];
+// Helper functions for error messages
+const whitespaceError = (pattern) => `Feature flag names cannot contain whitespace. You've provided a feature flag naming pattern that contains a whitespace character: "${pattern}". Remove any whitespace characters from your pattern.`;
+const exampleMismatchError = (example, pattern) => `You've provided a feature flag naming example ("${example}") that doesn't match your feature flag naming pattern ("${pattern}").`;
+const invalidValueError = (valueName) => `You've provided a feature flag naming ${valueName}, but no feature flag naming pattern. You must specify a pattern to use a ${valueName}.`;
+const checkFeatureNamingData = (featureNaming) => {
+    const { pattern, example, description } = featureNaming;
+    const errors = [];
+    if (disallowedStrings.some((str) => pattern?.includes(str))) {
+        errors.push(whitespaceError(pattern));
+    }
+    else if (pattern && example && !compileRegex(pattern).test(example)) {
+        errors.push(exampleMismatchError(example, pattern));
+    }
+    if (!pattern && example) {
+        errors.push(invalidValueError('example'));
+    }
+    if (!pattern && description) {
+        errors.push(invalidValueError('description'));
+    }
+    const [first, ...rest] = errors;
+    if (first) {
+        return { state: 'invalid', reasons: [first, ...rest] };
+    }
+    return { state: 'valid' };
+};
+exports.checkFeatureNamingData = checkFeatureNamingData;
+const checkFeatureFlagNamesAgainstPattern = (featureNames, pattern) => {
+    if (pattern) {
+        const regex = compileRegex(pattern);
+        const mismatchedNames = featureNames.filter((name) => !regex.test(name));
+        if (mismatchedNames.length > 0) {
+            return {
+                state: 'invalid',
+                invalidNames: new Set(mismatchedNames),
+            };
+        }
+    }
+    return { state: 'valid' };
+};
+exports.checkFeatureFlagNamesAgainstPattern = checkFeatureFlagNamesAgainstPattern;
+//# sourceMappingURL=feature-naming-validation.js.map

package/dist/lib/features/feature-naming-pattern/feature-naming-validation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"feature-naming-validation.js","sourceRoot":"","sources":["../../../../src/lib/features/feature-naming-pattern/feature-naming-validation.ts"],"names":[],"mappings":";;;AAEA,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC;AAErE,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAE1E,sCAAsC;AACtC,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,EAAE,CACxC,sIAAsI,OAAO,wDAAwD,CAAC;AAE1M,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAE,OAAe,EAAE,EAAE,CAC9D,mDAAmD,OAAO,4DAA4D,OAAO,KAAK,CAAC;AAEvI,MAAM,iBAAiB,GAAG,CAAC,SAAiB,EAAE,EAAE,CAC5C,yCAAyC,SAAS,6EAA6E,SAAS,GAAG,CAAC;AAEzI,MAAM,sBAAsB,GAAG,CAClC,aAA6B,EAG0B,EAAE;IACzD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,aAAa,CAAC;IACxD,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE;QACzD,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,OAAiB,CAAC,CAAC,CAAC;KACnD;SAAM,IAAI,OAAO,IAAI,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QACnE,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;KACvD;IAED,IAAI,CAAC,OAAO,IAAI,OAAO,EAAE;QACrB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;KAC7C;IAED,IAAI,CAAC,OAAO,IAAI,WAAW,EAAE;QACzB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,CAAC;KACjD;IAED,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC;IAChC,IAAI,KAAK,EAAE;QACP,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;KAC1D;IAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC9B,CAAC,CAAC;AA5BW,QAAA,sBAAsB,0BA4BjC;AASK,MAAM,mCAAmC,GAAG,CAC/C,YAAsB,EACtB,OAAkC,EACZ,EAAE;IACxB,IAAI,OAAO,EAAE;QACT,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM,CACvC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAC9B,CAAC;QAEF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,OAAO;gBACH,KAAK,EAAE,SAAS;gBAChB,YAAY,EAAE,IAAI,GAAG,CAAC,eAAe,CAAC;aACzC,CAAC;SACL;KACJ;IACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC9B,CAAC,CAAC;AAlBW,QAAA,mCAAmC,uCAkB9C"}

package/dist/lib/features/feature-naming-pattern/feature-naming-validation.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/features/feature-naming-pattern/feature-naming-validation.test.js

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const feature_naming_validation_1 = require("./feature-naming-validation");
+describe('validate incoming feature naming data', () => {
+    test('patterns with leading ^ and trailing $ are treated the same as without', () => {
+        const basePattern = '[a-z]+';
+        const leading = `^${basePattern}`;
+        const trailing = `${basePattern}$`;
+        const leadingAndTrailing = `^${basePattern}$`;
+        const allPatterns = [
+            basePattern,
+            leading,
+            trailing,
+            leadingAndTrailing,
+        ];
+        const invalidExamples = ['-name-', 'name-', '-name'];
+        const validExample = 'justalpha';
+        for (const pattern of allPatterns) {
+            for (const example of invalidExamples) {
+                expect((0, feature_naming_validation_1.checkFeatureNamingData)({ pattern, example })).toMatchObject({
+                    state: 'invalid',
+                });
+            }
+            const validData = {
+                pattern,
+                example: validExample,
+            };
+            expect((0, feature_naming_validation_1.checkFeatureNamingData)(validData)).toMatchObject({
+                state: 'valid',
+            });
+        }
+    });
+    test('pattern examples are tested against the pattern as if it were surrounded by ^ and $', () => {
+        const pattern = '-[0-9]+';
+        const validExample = '-23';
+        const invalidExample1 = 'feat-15';
+        const invalidExample2 = '-15-';
+        expect((0, feature_naming_validation_1.checkFeatureNamingData)({
+            pattern,
+            example: validExample,
+        })).toMatchObject({ state: 'valid' });
+        for (const example of [invalidExample1, invalidExample2]) {
+            expect((0, feature_naming_validation_1.checkFeatureNamingData)({
+                pattern,
+                example,
+            })).toMatchObject({ state: 'invalid' });
+        }
+    });
+    test.each([' ', '\\t', '\\n'])('patterns with illegal characters (%s) are invalid', (string) => {
+        const pattern = `-${string}[0-9]+`;
+        expect((0, feature_naming_validation_1.checkFeatureNamingData)({
+            pattern,
+        })).toMatchObject({ state: 'invalid' });
+    });
+    test('feature naming data with a non-empty example but an empty pattern is invalid', () => {
+        expect((0, feature_naming_validation_1.checkFeatureNamingData)({
+            pattern: '',
+            example: 'example',
+        })).toMatchObject({ state: 'invalid' });
+    });
+    test('feature naming data with a non-empty description but an empty pattern is invalid', () => {
+        expect((0, feature_naming_validation_1.checkFeatureNamingData)({
+            pattern: '',
+            description: 'description',
+        })).toMatchObject({ state: 'invalid' });
+    });
+    test('if the pattern contains disallowed characters, a match is not attempted against the example', () => {
+        const result = (0, feature_naming_validation_1.checkFeatureNamingData)({
+            pattern: 'a. [0-9]+',
+            example: 'obviously-not-a-match',
+        });
+        if (result.state === 'valid') {
+            fail('Expected invalid result');
+        }
+        expect(result.reasons.length).toBe(1);
+    });
+});
+describe('validate feature flag names against a pattern', () => {
+    test('should validate names against a pattern', async () => {
+        const featureNaming = {
+            pattern: 'testpattern.+',
+            example: 'testpattern-one!',
+            description: 'naming description',
+        };
+        const validFeatures = ['testpattern-feature', 'testpattern-feature2'];
+        const invalidFeatures = ['a', 'b', 'c'];
+        const result = (0, feature_naming_validation_1.checkFeatureFlagNamesAgainstPattern)([...validFeatures, ...invalidFeatures], featureNaming.pattern);
+        expect(result).toMatchObject({
+            state: 'invalid',
+            invalidNames: new Set(invalidFeatures),
+        });
+        const validResult = (0, feature_naming_validation_1.checkFeatureFlagNamesAgainstPattern)(validFeatures, featureNaming.pattern);
+        expect(validResult).toMatchObject({ state: 'valid' });
+    });
+    test.each([null, undefined, ''])('should not validate names if the pattern is %s', (pattern) => {
+        const featureNaming = {
+            pattern,
+        };
+        const features = ['a', 'b'];
+        const result = (0, feature_naming_validation_1.checkFeatureFlagNamesAgainstPattern)(features, featureNaming.pattern);
+        expect(result).toMatchObject({ state: 'valid' });
+    });
+    test('should validate names as if the pattern is surrounded by ^ and $.', async () => {
+        const pattern = '-[0-9]+';
+        const featureNaming = {
+            pattern,
+        };
+        const features = ['a-95', '-95-', 'b-52-z'];
+        const result = (0, feature_naming_validation_1.checkFeatureFlagNamesAgainstPattern)(features, featureNaming.pattern);
+        expect(result).toMatchObject({
+            state: 'invalid',
+            invalidNames: new Set(features),
+        });
+    });
+});
+//# sourceMappingURL=feature-naming-validation.test.js.map

package/dist/lib/features/feature-naming-pattern/feature-naming-validation.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"feature-naming-validation.test.js","sourceRoot":"","sources":["../../../../src/lib/features/feature-naming-pattern/feature-naming-validation.test.ts"],"names":[],"mappings":"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"}

package/dist/lib/features/feature-toggle/createFeatureToggleService.js

@@ -33,6 +33,9 @@ const fake_environment_store_1 = __importDefault(require("../../../test/fixtures
 const event_store_1 = __importDefault(require("../../db/event-store"));
 const createChangeRequestAccessReadModel_1 = require("../change-request-access-service/createChangeRequestAccessReadModel");
 const createSegmentService_1 = require("../segment/createSegmentService");
+const strategy_store_1 = __importDefault(require("../../db/strategy-store"));
+const fake_strategies_store_1 = __importDefault(require("../../../test/fixtures/fake-strategies-store"));
+const createPrivateProjectChecker_1 = require("../private-project/createPrivateProjectChecker");
 const createFeatureToggleService = (db, config) => {
     const { getLogger, eventBus, flagResolver } = config;
     const featureStrategiesStore = new feature_strategy_store_1.default(db, eventBus, getLogger, flagResolver);
@@ -43,6 +46,7 @@ const createFeatureToggleService = (db, config) => {
     const featureEnvironmentStore = new feature_environment_store_1.FeatureEnvironmentStore(db, eventBus, getLogger);
     const contextFieldStore = new context_field_store_1.default(db, getLogger, flagResolver);
     const groupStore = new group_store_1.default(db);
+    const strategyStore = new strategy_store_1.default(db, getLogger);
     const accountStore = new account_store_1.AccountStore(db, getLogger);
     const accessStore = new access_store_1.AccessStore(db, eventBus, getLogger);
     const roleStore = new role_store_1.default(db, eventBus, getLogger);
@@ -52,6 +56,7 @@ const createFeatureToggleService = (db, config) => {
     const accessService = new services_1.AccessService({ accessStore, accountStore, roleStore, environmentStore, groupStore }, { getLogger, flagResolver }, groupService);
     const segmentService = (0, createSegmentService_1.createSegmentService)(db, config);
     const changeRequestAccessReadModel = (0, createChangeRequestAccessReadModel_1.createChangeRequestAccessReadModel)(db, config);
+    const privateProjectChecker = (0, createPrivateProjectChecker_1.createPrivateProjectChecker)(db, config);
     const featureToggleService = new services_1.FeatureToggleService({
         featureStrategiesStore,
         featureToggleStore,
@@ -61,13 +66,15 @@ const createFeatureToggleService = (db, config) => {
         featureTagStore,
         featureEnvironmentStore,
         contextFieldStore,
-    }, { getLogger, flagResolver }, segmentService, accessService, changeRequestAccessReadModel);
+        strategyStore,
+    }, { getLogger, flagResolver }, segmentService, accessService, changeRequestAccessReadModel, privateProjectChecker);
     return featureToggleService;
 };
 exports.createFeatureToggleService = createFeatureToggleService;
 const createFakeFeatureToggleService = (config) => {
     const { getLogger, flagResolver } = config;
     const eventStore = new fake_event_store_1.default();
+    const strategyStore = new fake_strategies_store_1.default();
     const featureStrategiesStore = new fake_feature_strategies_store_1.default();
     const featureToggleStore = new fake_feature_toggle_store_1.default();
     const featureToggleClientStore = new fake_feature_toggle_client_store_1.default();
@@ -84,6 +91,7 @@ const createFakeFeatureToggleService = (config) => {
     const accessService = new services_1.AccessService({ accessStore, accountStore, roleStore, environmentStore, groupStore }, { getLogger, flagResolver }, groupService);
     const segmentService = (0, createSegmentService_1.createFakeSegmentService)(config);
     const changeRequestAccessReadModel = (0, createChangeRequestAccessReadModel_1.createFakeChangeRequestAccessService)();
+    const fakeprivateProjectChecker = (0, createPrivateProjectChecker_1.createFakePrivateProjectChecker)();
     const featureToggleService = new services_1.FeatureToggleService({
         featureStrategiesStore,
         featureToggleStore,
@@ -93,7 +101,8 @@ const createFakeFeatureToggleService = (config) => {
         featureTagStore,
         featureEnvironmentStore,
         contextFieldStore,
-    }, { getLogger, flagResolver }, segmentService, accessService, changeRequestAccessReadModel);
+        strategyStore,
+    }, { getLogger, flagResolver }, segmentService, accessService, changeRequestAccessReadModel, fakeprivateProjectChecker);
     return featureToggleService;
 };
 exports.createFakeFeatureToggleService = createFakeFeatureToggleService;

package/dist/lib/features/feature-toggle/createFeatureToggleService.js.map

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

package/dist/lib/features/instance-stats/getActiveUsers.d.ts

@@ -0,0 +1,9 @@
+import { type Db } from 'lib/server-impl';
+export declare type GetActiveUsers = () => Promise<{
+    last7: number;
+    last30: number;
+    last60: number;
+    last90: number;
+}>;
+export declare const createGetActiveUsers: (db: Db) => GetActiveUsers;
+export declare const createFakeGetActiveUsers: (activeUsers?: Awaited<ReturnType<GetActiveUsers>>) => GetActiveUsers;

package/dist/lib/features/instance-stats/getActiveUsers.e2e.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/features/instance-stats/getActiveUsers.e2e.test.js

@@ -0,0 +1,141 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const getActiveUsers_1 = require("./getActiveUsers");
+const database_init_1 = __importDefault(require("../../../test/e2e/helpers/database-init"));
+const no_logger_1 = __importDefault(require("../../../test/fixtures/no-logger"));
+let db;
+let getActiveUsers;
+const mockUserDaysAgo = (days) => {
+    const result = new Date();
+    result.setDate(result.getDate() - days);
+    return {
+        email: `${days}.user@example.com`,
+        seen_at: result,
+    };
+};
+const mockTokenDaysAgo = (userId, days) => {
+    const result = new Date();
+    result.setDate(result.getDate() - days);
+    return {
+        user_id: userId,
+        seen_at: result,
+        secret: 'secret',
+        expires_at: new Date('2031-12-31'),
+    };
+};
+beforeAll(async () => {
+    db = await (0, database_init_1.default)('active_users_serial', no_logger_1.default);
+    getActiveUsers = (0, getActiveUsers_1.createGetActiveUsers)(db.rawDatabase);
+});
+afterEach(async () => {
+    await db.rawDatabase('users').delete();
+    await db.rawDatabase('personal_access_tokens').delete();
+});
+afterAll(async () => {
+    await db.destroy();
+});
+test('should return 0 users', async () => {
+    expect(getActiveUsers()).resolves.toEqual({
+        last7: 0,
+        last30: 0,
+        last60: 0,
+        last90: 0,
+    });
+});
+test('should return 1 user', async () => {
+    await db.rawDatabase('users').insert(mockUserDaysAgo(1));
+    expect(getActiveUsers()).resolves.toEqual({
+        last7: 1,
+        last30: 1,
+        last60: 1,
+        last90: 1,
+    });
+});
+test('should handle intervals of activity', async () => {
+    await db
+        .rawDatabase('users')
+        .insert([
+        mockUserDaysAgo(5),
+        mockUserDaysAgo(10),
+        mockUserDaysAgo(20),
+        mockUserDaysAgo(40),
+        mockUserDaysAgo(70),
+        mockUserDaysAgo(100),
+    ]);
+    expect(getActiveUsers()).resolves.toEqual({
+        last7: 1,
+        last30: 3,
+        last60: 4,
+        last90: 5,
+    });
+});
+test('should count user as active if they have an active token', async () => {
+    const users = await db
+        .rawDatabase('users')
+        .insert(mockUserDaysAgo(100))
+        .returning('id');
+    const userId = users[0].id;
+    await db
+        .rawDatabase('personal_access_tokens')
+        .insert(mockTokenDaysAgo(userId, 31));
+    expect(getActiveUsers()).resolves.toEqual({
+        last7: 0,
+        last30: 0,
+        last60: 1,
+        last90: 1,
+    });
+});
+test('should prioritize user seen_at if newer then token seen_at', async () => {
+    const users = await db
+        .rawDatabase('users')
+        .insert(mockUserDaysAgo(14))
+        .returning('id');
+    const userId = users[0].id;
+    await db
+        .rawDatabase('personal_access_tokens')
+        .insert([
+        mockTokenDaysAgo(userId, 31),
+        mockTokenDaysAgo(userId, 61),
+        mockTokenDaysAgo(userId, 91),
+    ]);
+    expect(getActiveUsers()).resolves.toEqual({
+        last7: 0,
+        last30: 1,
+        last60: 1,
+        last90: 1,
+    });
+});
+test('should handle multiple users and with multiple tokens', async () => {
+    const users = await db
+        .rawDatabase('users')
+        .insert([
+        mockUserDaysAgo(5),
+        mockUserDaysAgo(10),
+        mockUserDaysAgo(20),
+        mockUserDaysAgo(40),
+        mockUserDaysAgo(70),
+        mockUserDaysAgo(100),
+    ])
+        .returning('id');
+    await db
+        .rawDatabase('personal_access_tokens')
+        .insert([
+        mockTokenDaysAgo(users[0].id, 31),
+        mockTokenDaysAgo(users[1].id, 61),
+        mockTokenDaysAgo(users[1].id, 15),
+        mockTokenDaysAgo(users[1].id, 55),
+        mockTokenDaysAgo(users[2].id, 4),
+        mockTokenDaysAgo(users[3].id, 91),
+        mockTokenDaysAgo(users[4].id, 91),
+    ]);
+    expect(getActiveUsers()).resolves.toEqual({
+        last7: 2,
+        last30: 3,
+        last60: 4,
+        last90: 5,
+    });
+});
+//# sourceMappingURL=getActiveUsers.e2e.test.js.map

package/dist/lib/features/instance-stats/getActiveUsers.e2e.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getActiveUsers.e2e.test.js","sourceRoot":"","sources":["../../../../src/lib/features/instance-stats/getActiveUsers.e2e.test.ts"],"names":[],"mappings":";;;;;AAAA,qDAA6E;AAC7E,4FAA+E;AAC/E,iFAAyD;AAEzD,IAAI,EAAW,CAAC;AAChB,IAAI,cAA8B,CAAC;AAEnC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE;IACrC,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;IAC1B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACxC,OAAO;QACH,KAAK,EAAE,GAAG,IAAI,mBAAmB;QACjC,OAAO,EAAE,MAAM;KAClB,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAE,IAAY,EAAE,EAAE;IACtD,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;IAC1B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAExC,OAAO;QACH,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,QAAQ;QAChB,UAAU,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC;KACrC,CAAC;AACN,CAAC,CAAC;AAEF,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,EAAE,GAAG,MAAM,IAAA,uBAAM,EAAC,qBAAqB,EAAE,mBAAS,CAAC,CAAC;IACpD,cAAc,GAAG,IAAA,qCAAoB,EAAC,EAAE,CAAC,WAAW,CAAC,CAAC;AAC1D,CAAC,CAAC,CAAC;AAEH,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,MAAM,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IACvC,MAAM,EAAE,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC,MAAM,EAAE,CAAC;AAC5D,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;IAChB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IACrC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;QACtC,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;KACZ,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;IACpC,MAAM,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzD,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;QACtC,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;KACZ,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;IACnD,MAAM,EAAE;SACH,WAAW,CAAC,OAAO,CAAC;SACpB,MAAM,CAAC;QACJ,eAAe,CAAC,CAAC,CAAC;QAClB,eAAe,CAAC,EAAE,CAAC;QACnB,eAAe,CAAC,EAAE,CAAC;QACnB,eAAe,CAAC,EAAE,CAAC;QACnB,eAAe,CAAC,EAAE,CAAC;QACnB,eAAe,CAAC,GAAG,CAAC;KACvB,CAAC,CAAC;IAEP,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;QACtC,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;KACZ,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;IACxE,MAAM,KAAK,GAAG,MAAM,EAAE;SACjB,WAAW,CAAC,OAAO,CAAC;SACpB,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;SAC5B,SAAS,CAAC,IAAI,CAAC,CAAC;IACrB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3B,MAAM,EAAE;SACH,WAAW,CAAC,wBAAwB,CAAC;SACrC,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;IAE1C,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;QACtC,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;KACZ,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;IAC1E,MAAM,KAAK,GAAG,MAAM,EAAE;SACjB,WAAW,CAAC,OAAO,CAAC;SACpB,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;SAC3B,SAAS,CAAC,IAAI,CAAC,CAAC;IACrB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3B,MAAM,EAAE;SACH,WAAW,CAAC,wBAAwB,CAAC;SACrC,MAAM,CAAC;QACJ,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5B,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5B,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC;KAC/B,CAAC,CAAC;IAEP,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;QACtC,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;KACZ,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;IACrE,MAAM,KAAK,GAAG,MAAM,EAAE;SACjB,WAAW,CAAC,OAAO,CAAC;SACpB,MAAM,CAAC;QACJ,eAAe,CAAC,CAAC,CAAC;QAClB,eAAe,CAAC,EAAE,CAAC;QACnB,eAAe,CAAC,EAAE,CAAC;QACnB,eAAe,CAAC,EAAE,CAAC;QACnB,eAAe,CAAC,EAAE,CAAC;QACnB,eAAe,CAAC,GAAG,CAAC;KACvB,CAAC;SACD,SAAS,CAAC,IAAI,CAAC,CAAC;IAErB,MAAM,EAAE;SACH,WAAW,CAAC,wBAAwB,CAAC;SACrC,MAAM,CAAC;QACJ,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;QACjC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;QACjC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;QACjC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;QACjC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAChC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;QACjC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;KACpC,CAAC,CAAC;IAEP,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;QACtC,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;QACT,MAAM,EAAE,CAAC;KACZ,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/dist/lib/features/instance-stats/getActiveUsers.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createFakeGetActiveUsers = exports.createGetActiveUsers = void 0;
+const createGetActiveUsers = (db) => async () => {
+    const combinedQuery = db
+        .select('id as user_id', 'seen_at')
+        .from('users')
+        .unionAll(db.select('user_id', 'seen_at').from('personal_access_tokens'));
+    const result = await db
+        .with('Combined', combinedQuery)
+        .select({
+        last_week: db.raw("COUNT(DISTINCT CASE WHEN seen_at > NOW() - INTERVAL '1 week' THEN user_id END)"),
+        last_month: db.raw("COUNT(DISTINCT CASE WHEN seen_at > NOW() - INTERVAL '1 month' THEN user_id END)"),
+        last_two_months: db.raw("COUNT(DISTINCT CASE WHEN seen_at > NOW() - INTERVAL '2 months' THEN user_id END)"),
+        last_quarter: db.raw("COUNT(DISTINCT CASE WHEN seen_at > NOW() - INTERVAL '3 months' THEN user_id END)"),
+    })
+        .from('Combined');
+    return {
+        last7: parseInt(result?.[0]?.last_week || '0', 10),
+        last30: parseInt(result?.[0]?.last_month || '0', 10),
+        last60: parseInt(result?.[0]?.last_two_months || '0', 10),
+        last90: parseInt(result?.[0]?.last_quarter || '0', 10),
+    };
+};
+exports.createGetActiveUsers = createGetActiveUsers;
+const createFakeGetActiveUsers = (activeUsers = {
+    last7: 0,
+    last30: 0,
+    last60: 0,
+    last90: 0,
+}) => () => Promise.resolve(activeUsers);
+exports.createFakeGetActiveUsers = createFakeGetActiveUsers;
+//# sourceMappingURL=getActiveUsers.js.map

package/dist/lib/features/instance-stats/getActiveUsers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getActiveUsers.js","sourceRoot":"","sources":["../../../../src/lib/features/instance-stats/getActiveUsers.ts"],"names":[],"mappings":";;;AASO,MAAM,oBAAoB,GAC7B,CAAC,EAAM,EAAkB,EAAE,CAC3B,KAAK,IAAI,EAAE;IACP,MAAM,aAAa,GAAG,EAAE;SACnB,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,IAAI,CAAC,OAAO,CAAC;SACb,QAAQ,CACL,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CACjE,CAAC;IAEN,MAAM,MAAM,GAAG,MAAM,EAAE;SAClB,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC;SAC/B,MAAM,CAAC;QACJ,SAAS,EAAE,EAAE,CAAC,GAAG,CACb,gFAAgF,CACnF;QACD,UAAU,EAAE,EAAE,CAAC,GAAG,CACd,iFAAiF,CACpF;QACD,eAAe,EAAE,EAAE,CAAC,GAAG,CACnB,kFAAkF,CACrF;QACD,YAAY,EAAE,EAAE,CAAC,GAAG,CAChB,kFAAkF,CACrF;KACJ,CAAC;SACD,IAAI,CAAC,UAAU,CAAC,CAAC;IAEtB,OAAO;QACH,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,IAAI,GAAG,EAAE,EAAE,CAAC;QAClD,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,IAAI,GAAG,EAAE,EAAE,CAAC;QACpD,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,IAAI,GAAG,EAAE,EAAE,CAAC;QACzD,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,IAAI,GAAG,EAAE,EAAE,CAAC;KACzD,CAAC;AACN,CAAC,CAAC;AAlCO,QAAA,oBAAoB,wBAkC3B;AAEC,MAAM,wBAAwB,GACjC,CACI,cAAmD;IAC/C,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;CACZ,EACa,EAAE,CACpB,GAAG,EAAE,CACD,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;AAVxB,QAAA,wBAAwB,4BAUA"}