unleash-server 5.4.4 → 5.5.0

package/dist/lib/features/private-project/privateProjectStore.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ALL_PROJECT_ACCESS = void 0;
+const types_1 = require("../../types");
+exports.ALL_PROJECT_ACCESS = {
+    mode: 'all',
+};
+class PrivateProjectStore {
+    constructor(db, getLogger) {
+        this.db = db;
+        this.logger = getLogger('project-permission-store.ts');
+    }
+    destroy() { }
+    async getUserAccessibleProjects(userId) {
+        if (userId === types_1.ADMIN_TOKEN_ID) {
+            return exports.ALL_PROJECT_ACCESS;
+        }
+        const isViewer = await this.db('role_user')
+            .join('roles', 'role_user.role_id', 'roles.id')
+            .where('role_user.user_id', userId)
+            .andWhere({
+            'roles.name': 'Viewer',
+            'roles.type': 'root',
+        })
+            .count('*')
+            .first();
+        if (!isViewer || isViewer.count == 0) {
+            return exports.ALL_PROJECT_ACCESS;
+        }
+        const accessibleProjects = await this.db
+            .from((db) => {
+            db.distinct()
+                .select('projects.id as project_id')
+                .from('projects')
+                .leftJoin('project_settings', 'projects.id', 'project_settings.project')
+                .where((builder) => {
+                builder
+                    .whereNull('project_settings.project')
+                    .orWhere('project_settings.project_mode', '!=', 'private');
+            })
+                .unionAll((queryBuilder) => {
+                queryBuilder
+                    .select('projects.id as project_id')
+                    .from('projects')
+                    .join('project_settings', 'projects.id', 'project_settings.project')
+                    .where('project_settings.project_mode', '=', 'private')
+                    .whereIn('projects.id', (whereBuilder) => {
+                    whereBuilder
+                        .select('role_user.project')
+                        .from('role_user')
+                        .leftJoin('roles', 'role_user.role_id', 'roles.id')
+                        .where('role_user.user_id', userId);
+                })
+                    .orWhereIn('projects.id', (whereBuilder) => {
+                    whereBuilder
+                        .select('group_role.project')
+                        .from('group_role')
+                        .leftJoin('group_user', 'group_user.group_id', 'group_role.group_id')
+                        .where('group_user.user_id', userId);
+                });
+            })
+                .as('accessible_projects');
+        })
+            .select('*')
+            .pluck('project_id');
+        return { mode: 'limited', projects: accessibleProjects };
+    }
+}
+exports.default = PrivateProjectStore;
+//# sourceMappingURL=privateProjectStore.js.map

package/dist/lib/features/private-project/privateProjectStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"privateProjectStore.js","sourceRoot":"","sources":["../../../../src/lib/features/private-project/privateProjectStore.ts"],"names":[],"mappings":";;;AAGA,uCAA6C;AAWhC,QAAA,kBAAkB,GAAkB;IAC7C,IAAI,EAAE,KAAK;CACd,CAAC;AAEF,MAAM,mBAAmB;IAKrB,YAAY,EAAM,EAAE,SAAsB;QACtC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,6BAA6B,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,KAAU,CAAC;IAElB,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC1C,IAAI,MAAM,KAAK,sBAAc,EAAE;YAC3B,OAAO,0BAAkB,CAAC;SAC7B;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC;aACtC,IAAI,CAAC,OAAO,EAAE,mBAAmB,EAAE,UAAU,CAAC;aAC9C,KAAK,CAAC,mBAAmB,EAAE,MAAM,CAAC;aAClC,QAAQ,CAAC;YACN,YAAY,EAAE,QAAQ;YACtB,YAAY,EAAE,MAAM;SACvB,CAAC;aACD,KAAK,CAAC,GAAG,CAAC;aACV,KAAK,EAAE,CAAC;QAEb,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,KAAK,IAAI,CAAC,EAAE;YAClC,OAAO,0BAAkB,CAAC;SAC7B;QAED,MAAM,kBAAkB,GAAa,MAAM,IAAI,CAAC,EAAE;aAC7C,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;YACT,EAAE,CAAC,QAAQ,EAAE;iBACR,MAAM,CAAC,2BAA2B,CAAC;iBACnC,IAAI,CAAC,UAAU,CAAC;iBAChB,QAAQ,CACL,kBAAkB,EAClB,aAAa,EACb,0BAA0B,CAC7B;iBACA,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE;gBACf,OAAO;qBACF,SAAS,CAAC,0BAA0B,CAAC;qBACrC,OAAO,CACJ,+BAA+B,EAC/B,IAAI,EACJ,SAAS,CACZ,CAAC;YACV,CAAC,CAAC;iBACD,QAAQ,CAAC,CAAC,YAAY,EAAE,EAAE;gBACvB,YAAY;qBACP,MAAM,CAAC,2BAA2B,CAAC;qBACnC,IAAI,CAAC,UAAU,CAAC;qBAChB,IAAI,CACD,kBAAkB,EAClB,aAAa,EACb,0BAA0B,CAC7B;qBACA,KAAK,CACF,+BAA+B,EAC/B,GAAG,EACH,SAAS,CACZ;qBACA,OAAO,CAAC,aAAa,EAAE,CAAC,YAAY,EAAE,EAAE;oBACrC,YAAY;yBACP,MAAM,CAAC,mBAAmB,CAAC;yBAC3B,IAAI,CAAC,WAAW,CAAC;yBACjB,QAAQ,CACL,OAAO,EACP,mBAAmB,EACnB,UAAU,CACb;yBACA,KAAK,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;gBAC5C,CAAC,CAAC;qBACD,SAAS,CAAC,aAAa,EAAE,CAAC,YAAY,EAAE,EAAE;oBACvC,YAAY;yBACP,MAAM,CAAC,oBAAoB,CAAC;yBAC5B,IAAI,CAAC,YAAY,CAAC;yBAClB,QAAQ,CACL,YAAY,EACZ,qBAAqB,EACrB,qBAAqB,CACxB;yBACA,KAAK,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;gBAC7C,CAAC,CAAC,CAAC;YACX,CAAC,CAAC;iBACD,EAAE,CAAC,qBAAqB,CAAC,CAAC;QACnC,CAAC,CAAC;aACD,MAAM,CAAC,GAAG,CAAC;aACX,KAAK,CAAC,YAAY,CAAC,CAAC;QAEzB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC;IAC7D,CAAC;CACJ;AAED,kBAAe,mBAAmB,CAAC"}

package/dist/lib/features/private-project/privateProjectStoreType.d.ts

@@ -0,0 +1,4 @@
+import { ProjectAccess } from './privateProjectStore';
+export interface IPrivateProjectStore {
+    getUserAccessibleProjects(userId: number): Promise<ProjectAccess>;
+}

package/dist/lib/features/private-project/privateProjectStoreType.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=privateProjectStoreType.js.map

package/dist/lib/features/private-project/privateProjectStoreType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"privateProjectStoreType.js","sourceRoot":"","sources":["../../../../src/lib/features/private-project/privateProjectStoreType.ts"],"names":[],"mappings":""}

package/dist/lib/features/project/createProjectService.js

@@ -15,7 +15,6 @@ const project_store_1 = __importDefault(require("../../db/project-store"));
 const feature_toggle_store_1 = __importDefault(require("../../db/feature-toggle-store"));
 const feature_type_store_1 = __importDefault(require("../../db/feature-type-store"));
 const feature_environment_store_1 = require("../../db/feature-environment-store");
-const feature_tag_store_1 = __importDefault(require("../../db/feature-tag-store"));
 const project_stats_store_1 = __importDefault(require("../../db/project-stats-store"));
 const createAccessService_1 = require("../access/createAccessService");
 const createFeatureToggleService_1 = require("../feature-toggle/createFeatureToggleService");
@@ -26,11 +25,11 @@ const fake_feature_toggle_store_1 = __importDefault(require("../../../test/fixtu
 const fake_feature_type_store_1 = __importDefault(require("../../../test/fixtures/fake-feature-type-store"));
 const fake_environment_store_1 = __importDefault(require("../../../test/fixtures/fake-environment-store"));
 const fake_feature_environment_store_1 = __importDefault(require("../../../test/fixtures/fake-feature-environment-store"));
-const fake_feature_tag_store_1 = __importDefault(require("../../../test/fixtures/fake-feature-tag-store"));
 const fake_project_stats_store_1 = __importDefault(require("../../../test/fixtures/fake-project-stats-store"));
 const fake_favorite_features_store_1 = __importDefault(require("../../../test/fixtures/fake-favorite-features-store"));
 const fake_favorite_projects_store_1 = __importDefault(require("../../../test/fixtures/fake-favorite-projects-store"));
 const fake_account_store_1 = require("../../../test/fixtures/fake-account-store");
+const createPrivateProjectChecker_1 = require("../private-project/createPrivateProjectChecker");
 const createProjectService = (db, config) => {
     const { eventBus, getLogger, flagResolver } = config;
     const eventStore = new event_store_1.default(db, getLogger);
@@ -41,7 +40,6 @@ const createProjectService = (db, config) => {
     const accountStore = new account_store_1.AccountStore(db, getLogger);
     const environmentStore = new environment_store_1.default(db, eventBus, getLogger);
     const featureEnvironmentStore = new feature_environment_store_1.FeatureEnvironmentStore(db, eventBus, getLogger);
-    const featureTagStore = new feature_tag_store_1.default(db, eventBus, getLogger);
     const projectStatsStore = new project_stats_store_1.default(db, eventBus, getLogger);
     const accessService = (0, createAccessService_1.createAccessService)(db, config);
     const featureToggleService = (0, createFeatureToggleService_1.createFeatureToggleService)(db, config);
@@ -53,6 +51,7 @@ const createProjectService = (db, config) => {
         eventStore,
     }, config);
     const groupService = new services_1.GroupService({ groupStore, eventStore, accountStore }, { getLogger });
+    const privateProjectChecker = (0, createPrivateProjectChecker_1.createPrivateProjectChecker)(db, config);
     return new services_1.ProjectService({
         projectStore,
         eventStore,
@@ -60,10 +59,9 @@ const createProjectService = (db, config) => {
         featureTypeStore,
         environmentStore,
         featureEnvironmentStore,
-        featureTagStore,
         accountStore,
         projectStatsStore,
-    }, config, accessService, featureToggleService, groupService, favoriteService);
+    }, config, accessService, featureToggleService, groupService, favoriteService, privateProjectChecker);
 };
 exports.createProjectService = createProjectService;
 const createFakeProjectService = (config) => {
@@ -76,7 +74,6 @@ const createFakeProjectService = (config) => {
     const accountStore = new fake_account_store_1.FakeAccountStore();
     const environmentStore = new fake_environment_store_1.default();
     const featureEnvironmentStore = new fake_feature_environment_store_1.default();
-    const featureTagStore = new fake_feature_tag_store_1.default();
     const projectStatsStore = new fake_project_stats_store_1.default();
     const accessService = (0, createAccessService_1.createFakeAccessService)(config);
     const featureToggleService = (0, createFeatureToggleService_1.createFakeFeatureToggleService)(config);
@@ -88,6 +85,7 @@ const createFakeProjectService = (config) => {
         eventStore,
     }, config);
     const groupService = new services_1.GroupService({ groupStore, eventStore, accountStore }, { getLogger });
+    const privateProjectChecker = (0, createPrivateProjectChecker_1.createFakePrivateProjectChecker)();
     return new services_1.ProjectService({
         projectStore,
         eventStore,
@@ -95,10 +93,9 @@ const createFakeProjectService = (config) => {
         featureTypeStore,
         environmentStore,
         featureEnvironmentStore,
-        featureTagStore,
         accountStore,
         projectStatsStore,
-    }, config, accessService, featureToggleService, groupService, favoriteService);
+    }, config, accessService, featureToggleService, groupService, favoriteService, privateProjectChecker);
 };
 exports.createFakeProjectService = createFakeProjectService;
 //# sourceMappingURL=createProjectService.js.map

package/dist/lib/features/project/createProjectService.js.map

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

package/dist/lib/features/segment/createSegmentService.js

@@ -12,13 +12,15 @@ const segment_store_1 = __importDefault(require("../../db/segment-store"));
 const fake_segment_store_1 = __importDefault(require("../../../test/fixtures/fake-segment-store"));
 const fake_feature_strategies_store_1 = __importDefault(require("../../../test/fixtures/fake-feature-strategies-store"));
 const createChangeRequestAccessReadModel_1 = require("../change-request-access-service/createChangeRequestAccessReadModel");
+const createPrivateProjectChecker_1 = require("../private-project/createPrivateProjectChecker");
 const createSegmentService = (db, config) => {
     const { eventBus, getLogger, flagResolver } = config;
     const eventStore = new event_store_1.default(db, getLogger);
     const segmentStore = new segment_store_1.default(db, eventBus, getLogger, flagResolver);
     const featureStrategiesStore = new feature_strategy_store_1.default(db, eventBus, getLogger, flagResolver);
     const changeRequestAccessReadModel = (0, createChangeRequestAccessReadModel_1.createChangeRequestAccessReadModel)(db, config);
-    return new services_1.SegmentService({ segmentStore, featureStrategiesStore, eventStore }, changeRequestAccessReadModel, config);
+    const privateProjectChecker = (0, createPrivateProjectChecker_1.createPrivateProjectChecker)(db, config);
+    return new services_1.SegmentService({ segmentStore, featureStrategiesStore, eventStore }, changeRequestAccessReadModel, config, privateProjectChecker);
 };
 exports.createSegmentService = createSegmentService;
 const createFakeSegmentService = (config) => {
@@ -26,7 +28,8 @@ const createFakeSegmentService = (config) => {
     const segmentStore = new fake_segment_store_1.default();
     const featureStrategiesStore = new fake_feature_strategies_store_1.default();
     const changeRequestAccessReadModel = (0, createChangeRequestAccessReadModel_1.createFakeChangeRequestAccessService)();
-    return new services_1.SegmentService({ segmentStore, featureStrategiesStore, eventStore }, changeRequestAccessReadModel, config);
+    const privateProjectChecker = (0, createPrivateProjectChecker_1.createFakePrivateProjectChecker)();
+    return new services_1.SegmentService({ segmentStore, featureStrategiesStore, eventStore }, changeRequestAccessReadModel, config, privateProjectChecker);
 };
 exports.createFakeSegmentService = createFakeSegmentService;
 //# sourceMappingURL=createSegmentService.js.map

package/dist/lib/features/segment/createSegmentService.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSegmentService.js","sourceRoot":"","sources":["../../../../src/lib/features/segment/createSegmentService.ts"],"names":[],"mappings":";;;;;;AACA,uEAA8C;AAC9C,6CAAgD;AAChD,+FAAqE;AAErE,6FAAqE;AACrE,2EAAkD;AAClD,mGAAyE;AACzE,yHAA8F;AAC9F,4HAG6E;AAEtE,MAAM,oBAAoB,GAAG,CAChC,EAAM,EACN,MAAsB,EACR,EAAE;IAChB,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,IAAI,qBAAU,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,IAAI,uBAAY,CACjC,EAAE,EACF,QAAQ,EACR,SAAS,EACT,YAAY,CACf,CAAC;IACF,MAAM,sBAAsB,GAAG,IAAI,gCAAsB,CACrD,EAAE,EACF,QAAQ,EACR,SAAS,EACT,YAAY,CACf,CAAC;IACF,MAAM,4BAA4B,GAAG,IAAA,uEAAkC,EACnE,EAAE,EACF,MAAM,CACT,CAAC;IAEF,OAAO,IAAI,yBAAc,CACrB,EAAE,YAAY,EAAE,sBAAsB,EAAE,UAAU,EAAE,EACpD,4BAA4B,EAC5B,MAAM,CACT,CAAC;AACN,CAAC,CAAC;AA5BW,QAAA,oBAAoB,wBA4B/B;AAEK,MAAM,wBAAwB,GAAG,CACpC,MAAsB,EACP,EAAE;IACjB,MAAM,UAAU,GAAG,IAAI,0BAAc,EAAE,CAAC;IACxC,MAAM,YAAY,GAAG,IAAI,4BAAgB,EAAE,CAAC;IAC5C,MAAM,sBAAsB,GAAG,IAAI,uCAA0B,EAAE,CAAC;IAChE,MAAM,4BAA4B,GAAG,IAAA,yEAAoC,GAAE,CAAC;IAE5E,OAAO,IAAI,yBAAc,CACrB,EAAE,YAAY,EAAE,sBAAsB,EAAE,UAAU,EAAE,EACpD,4BAA4B,EAC5B,MAAM,CACT,CAAC;AACN,CAAC,CAAC;AAbW,QAAA,wBAAwB,4BAanC"}
+{"version":3,"file":"createSegmentService.js","sourceRoot":"","sources":["../../../../src/lib/features/segment/createSegmentService.ts"],"names":[],"mappings":";;;;;;AACA,uEAA8C;AAC9C,6CAAgD;AAChD,+FAAqE;AAErE,6FAAqE;AACrE,2EAAkD;AAClD,mGAAyE;AACzE,yHAA8F;AAC9F,4HAG6E;AAC7E,gGAGwD;AAEjD,MAAM,oBAAoB,GAAG,CAChC,EAAM,EACN,MAAsB,EACR,EAAE;IAChB,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,IAAI,qBAAU,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,IAAI,uBAAY,CACjC,EAAE,EACF,QAAQ,EACR,SAAS,EACT,YAAY,CACf,CAAC;IACF,MAAM,sBAAsB,GAAG,IAAI,gCAAsB,CACrD,EAAE,EACF,QAAQ,EACR,SAAS,EACT,YAAY,CACf,CAAC;IACF,MAAM,4BAA4B,GAAG,IAAA,uEAAkC,EACnE,EAAE,EACF,MAAM,CACT,CAAC;IACF,MAAM,qBAAqB,GAAG,IAAA,yDAA2B,EAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAEtE,OAAO,IAAI,yBAAc,CACrB,EAAE,YAAY,EAAE,sBAAsB,EAAE,UAAU,EAAE,EACpD,4BAA4B,EAC5B,MAAM,EACN,qBAAqB,CACxB,CAAC;AACN,CAAC,CAAC;AA9BW,QAAA,oBAAoB,wBA8B/B;AAEK,MAAM,wBAAwB,GAAG,CACpC,MAAsB,EACP,EAAE;IACjB,MAAM,UAAU,GAAG,IAAI,0BAAc,EAAE,CAAC;IACxC,MAAM,YAAY,GAAG,IAAI,4BAAgB,EAAE,CAAC;IAC5C,MAAM,sBAAsB,GAAG,IAAI,uCAA0B,EAAE,CAAC;IAChE,MAAM,4BAA4B,GAAG,IAAA,yEAAoC,GAAE,CAAC;IAE5E,MAAM,qBAAqB,GAAG,IAAA,6DAA+B,GAAE,CAAC;IAEhE,OAAO,IAAI,yBAAc,CACrB,EAAE,YAAY,EAAE,sBAAsB,EAAE,UAAU,EAAE,EACpD,4BAA4B,EAC5B,MAAM,EACN,qBAAqB,CACxB,CAAC;AACN,CAAC,CAAC;AAhBW,QAAA,wBAAwB,4BAgBnC"}

package/dist/lib/features/segment/segment-controller.d.ts

@@ -0,0 +1,39 @@
+import { Request, Response } from 'express';
+import Controller from '../../routes/controller';
+import { IAuthRequest, IUnleashConfig, IUnleashServices } from '../../server-impl';
+import { AdminSegmentSchema, UpdateFeatureStrategySegmentsSchema, UpsertSegmentSchema } from '../../openapi';
+import { SegmentStrategiesSchema } from '../../openapi/spec/admin-strategies-schema';
+import { SegmentsSchema } from '../../openapi/spec/segments-schema';
+declare type IUpdateFeatureStrategySegmentsRequest = IAuthRequest<{}, undefined, UpdateFeatureStrategySegmentsSchema>;
+export declare class SegmentsController extends Controller {
+    private logger;
+    private segmentService;
+    private accessService;
+    private flagResolver;
+    private openApiService;
+    constructor(config: IUnleashConfig, { segmentService, accessService, openApiService, }: Pick<IUnleashServices, 'segmentService' | 'accessService' | 'openApiService'>);
+    validate(req: Request<unknown, unknown, {
+        name: string;
+    }>, res: Response): Promise<void>;
+    getSegmentsByStrategy(req: Request<{
+        strategyId: string;
+    }>, res: Response<SegmentsSchema>): Promise<void>;
+    updateFeatureStrategySegments(req: IUpdateFeatureStrategySegmentsRequest, res: Response<UpdateFeatureStrategySegmentsSchema>): Promise<void>;
+    getStrategiesBySegment(req: IAuthRequest<{
+        id: number;
+    }>, res: Response<SegmentStrategiesSchema>): Promise<void>;
+    removeSegment(req: IAuthRequest<{
+        id: string;
+    }>, res: Response): Promise<void>;
+    updateSegment(req: IAuthRequest<{
+        id: string;
+    }>, res: Response): Promise<void>;
+    getSegment(req: Request<{
+        id: string;
+    }>, res: Response): Promise<void>;
+    createSegment(req: IAuthRequest<any, any, UpsertSegmentSchema>, res: Response<AdminSegmentSchema>): Promise<void>;
+    getSegments(req: IAuthRequest, res: Response<SegmentsSchema>): Promise<void>;
+    private removeFromStrategy;
+    private addToStrategy;
+}
+export {};

package/dist/lib/features/segment/segment-controller.js

@@ -0,0 +1,291 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SegmentsController = void 0;
+const controller_1 = __importDefault(require("../../routes/controller"));
+const openapi_1 = require("../../openapi");
+const standard_responses_1 = require("../../openapi/util/standard-responses");
+const types_1 = require("../../types");
+const segments_schema_1 = require("../../openapi/spec/segments-schema");
+const util_1 = require("../../util");
+const error_1 = require("../../error");
+class SegmentsController extends controller_1.default {
+    constructor(config, { segmentService, accessService, openApiService, }) {
+        super(config);
+        this.flagResolver = config.flagResolver;
+        this.config = config;
+        this.logger = config.getLogger('/admin-api/segments.ts');
+        this.segmentService = segmentService;
+        this.accessService = accessService;
+        this.openApiService = openApiService;
+        this.route({
+            method: 'post',
+            path: '/validate',
+            handler: this.validate,
+            permission: types_1.NONE,
+            middleware: [
+                openApiService.validPath({
+                    summary: 'Validates if a segment name exists',
+                    description: 'Uses the name provided in the body of the request to validate if the given name exists or not',
+                    tags: ['Segments'],
+                    operationId: 'validateSegment',
+                    requestBody: (0, openapi_1.createRequestSchema)('nameSchema'),
+                    responses: {
+                        204: standard_responses_1.emptyResponse,
+                        ...(0, standard_responses_1.getStandardResponses)(400, 401, 409, 415),
+                    },
+                }),
+            ],
+        });
+        this.route({
+            method: 'get',
+            path: '/strategies/:strategyId',
+            handler: this.getSegmentsByStrategy,
+            permission: types_1.NONE,
+            middleware: [
+                openApiService.validPath({
+                    tags: ['Segments'],
+                    operationId: 'getSegmentsByStrategyId',
+                    summary: 'Get strategy segments',
+                    description: "Retrieve all segments that are referenced by the specified strategy. Returns an empty list of segments if the strategy ID doesn't exist.",
+                    responses: {
+                        200: (0, openapi_1.createResponseSchema)('segmentsSchema'),
+                    },
+                }),
+            ],
+        });
+        this.route({
+            method: 'post',
+            path: '/strategies',
+            handler: this.updateFeatureStrategySegments,
+            permission: types_1.NONE,
+            middleware: [
+                openApiService.validPath({
+                    summary: 'Update strategy segments',
+                    description: 'Sets the segments of the strategy specified to be exactly the ones passed in the payload. Any segments that were used by the strategy before will be removed if they are not in the provided list of segments.',
+                    tags: ['Strategies'],
+                    operationId: 'updateFeatureStrategySegments',
+                    requestBody: (0, openapi_1.createRequestSchema)('updateFeatureStrategySegmentsSchema'),
+                    responses: {
+                        201: (0, openapi_1.resourceCreatedResponseSchema)('updateFeatureStrategySegmentsSchema'),
+                        ...(0, standard_responses_1.getStandardResponses)(400, 401, 403, 415),
+                    },
+                }),
+            ],
+        });
+        this.route({
+            method: 'get',
+            path: '/:id/strategies',
+            handler: this.getStrategiesBySegment,
+            permission: types_1.NONE,
+            middleware: [
+                openApiService.validPath({
+                    tags: ['Segments'],
+                    operationId: 'getStrategiesBySegmentId',
+                    summary: 'Get strategies that reference segment',
+                    description: 'Retrieve all strategies that reference the specified segment.',
+                    responses: {
+                        200: (0, openapi_1.createResponseSchema)('adminStrategiesSchema'),
+                    },
+                }),
+            ],
+        });
+        this.route({
+            method: 'delete',
+            path: '/:id',
+            handler: this.removeSegment,
+            permission: types_1.DELETE_SEGMENT,
+            acceptAnyContentType: true,
+            middleware: [
+                openApiService.validPath({
+                    summary: 'Deletes a segment by id',
+                    description: 'Deletes a segment by its id, if not found returns a 409 error',
+                    tags: ['Segments'],
+                    operationId: 'removeSegment',
+                    responses: {
+                        204: standard_responses_1.emptyResponse,
+                        ...(0, standard_responses_1.getStandardResponses)(401, 403, 409),
+                    },
+                }),
+            ],
+        });
+        this.route({
+            method: 'put',
+            path: '/:id',
+            handler: this.updateSegment,
+            permission: types_1.UPDATE_SEGMENT,
+            middleware: [
+                openApiService.validPath({
+                    summary: 'Update segment by id',
+                    description: 'Updates the content of the segment with the provided payload. Any fields not specified will be left untouched.',
+                    tags: ['Segments'],
+                    operationId: 'updateSegment',
+                    responses: {
+                        204: standard_responses_1.emptyResponse,
+                        ...(0, standard_responses_1.getStandardResponses)(400, 401, 403, 409, 415),
+                    },
+                }),
+            ],
+        });
+        this.route({
+            method: 'get',
+            path: '/:id',
+            handler: this.getSegment,
+            permission: types_1.NONE,
+            middleware: [
+                openApiService.validPath({
+                    summary: 'Get a segment',
+                    description: 'Retrieves a segment based on its ID.',
+                    tags: ['Segments'],
+                    operationId: 'getSegment',
+                    responses: {
+                        200: (0, openapi_1.createResponseSchema)('adminSegmentSchema'),
+                        ...(0, standard_responses_1.getStandardResponses)(404),
+                    },
+                }),
+            ],
+        });
+        this.route({
+            method: 'post',
+            path: '',
+            handler: this.createSegment,
+            permission: types_1.CREATE_SEGMENT,
+            middleware: [
+                openApiService.validPath({
+                    summary: 'Create a new segment',
+                    description: 'Creates a new segment using the payload provided',
+                    tags: ['Segments'],
+                    operationId: 'createSegment',
+                    requestBody: (0, openapi_1.createRequestSchema)('upsertSegmentSchema'),
+                    responses: {
+                        201: (0, openapi_1.resourceCreatedResponseSchema)('adminSegmentSchema'),
+                        ...(0, standard_responses_1.getStandardResponses)(400, 401, 403, 409, 415),
+                    },
+                }),
+            ],
+        });
+        this.route({
+            method: 'get',
+            path: '',
+            handler: this.getSegments,
+            permission: types_1.NONE,
+            middleware: [
+                openApiService.validPath({
+                    summary: 'Get all segments',
+                    description: 'Retrieves all segments that exist in this Unleash instance.',
+                    tags: ['Segments'],
+                    operationId: 'getSegments',
+                    responses: {
+                        200: (0, openapi_1.createResponseSchema)('segmentsSchema'),
+                    },
+                }),
+            ],
+        });
+    }
+    async validate(req, res) {
+        const { name } = req.body;
+        await this.segmentService.validateName(name);
+        res.status(204).send();
+    }
+    async getSegmentsByStrategy(req, res) {
+        const { strategyId } = req.params;
+        const segments = await this.segmentService.getByStrategy(strategyId);
+        const responseBody = this.flagResolver.isEnabled('anonymiseEventLog')
+            ? {
+                segments: (0, util_1.anonymiseKeys)(segments, ['createdBy']),
+            }
+            : { segments };
+        this.openApiService.respondWithValidation(200, res, segments_schema_1.segmentsSchema.$id, (0, types_1.serializeDates)(responseBody));
+    }
+    async updateFeatureStrategySegments(req, res) {
+        const { projectId, environmentId, strategyId, segmentIds } = req.body;
+        const hasFeatureStrategyPermission = this.accessService.hasPermission(req.user, types_1.UPDATE_FEATURE_STRATEGY, projectId, environmentId);
+        if (!hasFeatureStrategyPermission) {
+            res.status(403).send();
+            return;
+        }
+        if (segmentIds.length > this.config.strategySegmentsLimit) {
+            throw new error_1.BadDataError(`Strategies may not have more than ${this.config.strategySegmentsLimit} segments`);
+        }
+        const segments = await this.segmentService.getByStrategy(strategyId);
+        const currentSegmentIds = segments.map((segment) => segment.id);
+        await this.removeFromStrategy(strategyId, currentSegmentIds.filter((id) => !segmentIds.includes(id)));
+        await this.addToStrategy(strategyId, segmentIds.filter((id) => !currentSegmentIds.includes(id)));
+        this.openApiService.respondWithValidation(201, res, openapi_1.updateFeatureStrategySchema.$id, req.body, {
+            location: `strategies/${strategyId}`,
+        });
+    }
+    async getStrategiesBySegment(req, res) {
+        const { id } = req.params;
+        const { user } = req;
+        const strategies = await this.segmentService.getStrategies(id, user.id);
+        // Remove unnecessary IFeatureStrategy fields from the response.
+        const segmentStrategies = strategies.map((strategy) => ({
+            id: strategy.id,
+            projectId: strategy.projectId,
+            featureName: strategy.featureName,
+            strategyName: strategy.strategyName,
+            environment: strategy.environment,
+        }));
+        res.json({
+            strategies: segmentStrategies,
+        });
+    }
+    async removeSegment(req, res) {
+        const id = Number(req.params.id);
+        const { user } = req;
+        const strategies = await this.segmentService.getStrategies(id, user.id);
+        if (strategies.length > 0) {
+            res.status(409).send();
+        }
+        else {
+            await this.segmentService.delete(id, req.user);
+            res.status(204).send();
+        }
+    }
+    async updateSegment(req, res) {
+        const id = Number(req.params.id);
+        const updateRequest = {
+            name: req.body.name,
+            description: req.body.description,
+            project: req.body.project,
+            constraints: req.body.constraints,
+        };
+        await this.segmentService.update(id, updateRequest, req.user);
+        res.status(204).send();
+    }
+    async getSegment(req, res) {
+        const id = Number(req.params.id);
+        const segment = await this.segmentService.get(id);
+        if (this.flagResolver.isEnabled('anonymiseEventLog')) {
+            res.json((0, util_1.anonymiseKeys)(segment, ['createdBy']));
+        }
+        else {
+            res.json(segment);
+        }
+    }
+    async createSegment(req, res) {
+        const createRequest = req.body;
+        const segment = await this.segmentService.create(createRequest, req.user);
+        this.openApiService.respondWithValidation(201, res, openapi_1.adminSegmentSchema.$id, (0, types_1.serializeDates)(segment), { location: `segments/${segment.id}` });
+    }
+    async getSegments(req, res) {
+        const segments = await this.segmentService.getAll();
+        const response = {
+            segments: this.flagResolver.isEnabled('anonymiseEventLog')
+                ? (0, util_1.anonymiseKeys)(segments, ['createdBy'])
+                : segments,
+        };
+        this.openApiService.respondWithValidation(200, res, segments_schema_1.segmentsSchema.$id, (0, types_1.serializeDates)(response));
+    }
+    async removeFromStrategy(strategyId, segmentIds) {
+        await Promise.all(segmentIds.map((id) => this.segmentService.removeFromStrategy(id, strategyId)));
+    }
+    async addToStrategy(strategyId, segmentIds) {
+        await Promise.all(segmentIds.map((id) => this.segmentService.addToStrategy(id, strategyId)));
+    }
+}
+exports.SegmentsController = SegmentsController;
+//# sourceMappingURL=segment-controller.js.map

package/dist/lib/features/segment/segment-controller.js.map

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

package/dist/lib/metrics.d.ts

@@ -5,7 +5,7 @@ import { Knex } from 'knex';
 import { IUnleashConfig } from './types/option';
 import { IUnleashStores } from './types/stores';
 import Timer = NodeJS.Timer;
-import { InstanceStatsService } from './services/instance-stats-service';
+import { InstanceStatsService } from './features/instance-stats/instance-stats-service';
 export default class MetricsMonitor {
     timer?: Timer;
     poolMetricsTimer?: Timer;

package/dist/lib/metrics.js

@@ -77,9 +77,26 @@ class MetricsMonitor {
             name: 'users_total',
             help: 'Number of users',
         });
+        const usersActive7days = new prom_client_1.default.Gauge({
+            name: 'users_active_7',
+            help: 'Number of users active in the last 7 days',
+        });
+        const usersActive30days = new prom_client_1.default.Gauge({
+            name: 'users_active_30',
+            help: 'Number of users active in the last 30 days',
+        });
+        const usersActive60days = new prom_client_1.default.Gauge({
+            name: 'users_active_60',
+            help: 'Number of users active in the last 60 days',
+        });
+        const usersActive90days = new prom_client_1.default.Gauge({
+            name: 'users_active_90',
+            help: 'Number of users active in the last 90 days',
+        });
         const projectsTotal = new prom_client_1.default.Gauge({
             name: 'projects_total',
             help: 'Number of projects',
+            labelNames: ['mode'],
         });
         const environmentsTotal = new prom_client_1.default.Gauge({
             name: 'environments_total',
@@ -143,8 +160,20 @@ class MetricsMonitor {
                 featureTogglesTotal.labels(version).set(stats.featureToggles);
                 usersTotal.reset();
                 usersTotal.set(stats.users);
+                usersActive7days.reset();
+                usersActive7days.set(stats.activeUsers.last7);
+                usersActive30days.reset();
+                usersActive30days.set(stats.activeUsers.last30);
+                usersActive60days.reset();
+                usersActive60days.set(stats.activeUsers.last60);
+                usersActive90days.reset();
+                usersActive90days.set(stats.activeUsers.last90);
                 projectsTotal.reset();
-                projectsTotal.set(stats.projects);
+                stats.projects.forEach((projectStat) => {
+                    projectsTotal
+                        .labels({ mode: projectStat.mode })
+                        .set(projectStat.count);
+                });
                 environmentsTotal.reset();
                 environmentsTotal.set(stats.environments);
                 groupsTotal.reset();