npm - unleash-server - Versions diffs - 4.2.0 → 4.2.4 - Mend

unleash-server 4.2.0 → 4.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (205) hide show

package/dist/lib/services/project-service.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ import { IUnleashConfig } from '../types/option';
 import { IProject, IProjectOverview, IProjectWithCount, IUserWithRole, FeatureToggle } from '../types/model';
 import { IProjectQuery } from '../types/stores/project-store';
 import { IRole } from '../types/stores/access-store';
-import FeatureToggleServiceV2 from './feature-toggle-service-v2';
+import FeatureToggleService from './feature-toggle-service';
 export interface UsersWithRoles {
     users: IUserWithRole[];
     roles: IRole[];
@@ -21,7 +21,7 @@ export default class ProjectService {
     private logger;
     private featureToggleService;
     private environmentsEnabled;
-    constructor({ projectStore, eventStore, featureToggleStore, featureTypeStore, environmentStore, featureEnvironmentStore, }: Pick<IUnleashStores, 'projectStore' | 'eventStore' | 'featureToggleStore' | 'featureTypeStore' | 'environmentStore' | 'featureEnvironmentStore'>, config: IUnleashConfig, accessService: AccessService, featureToggleService: FeatureToggleServiceV2);
+    constructor({ projectStore, eventStore, featureToggleStore, featureTypeStore, environmentStore, featureEnvironmentStore, }: Pick<IUnleashStores, 'projectStore' | 'eventStore' | 'featureToggleStore' | 'featureTypeStore' | 'environmentStore' | 'featureEnvironmentStore'>, config: IUnleashConfig, accessService: AccessService, featureToggleService: FeatureToggleService);
     getProjects(query?: IProjectQuery): Promise<IProjectWithCount[]>;
     getProject(id: string): Promise<IProject>;
     createProject(newProject: IProject, user: User): Promise<IProject>;

package/dist/lib/services/project-service.js CHANGED Viewed

@@ -76,14 +76,15 @@ class ProjectService {
         return data;
     }
     async updateProject(updatedProject, user) {
-        await this.store.get(updatedProject.id);
+        const preData = await this.store.get(updatedProject.id);
         const project = await project_schema_1.projectSchema.validateAsync(updatedProject);
         await this.store.update(project);
         await this.eventStore.store({
             type: events_1.PROJECT_UPDATED,
+            project: project.id,
             createdBy: getCreatedBy(user),
             data: project,
-            project: project.id,
+            preData,
         });
     }
     async checkProjectsCompatibility(feature, newProjectId) {
@@ -130,7 +131,6 @@ class ProjectService {
             type: events_1.PROJECT_DELETED,
             createdBy: getCreatedBy(user),
             project: id,
-            data: { id },
         });
         await this.accessService.removeDefaultProjectRoles(user, id);
     }
@@ -153,6 +153,7 @@ class ProjectService {
             users,
         };
     }
+    // TODO: should be an event too
     async addUser(projectId, roleId, userId) {
         const [roles, users] = await this.accessService.getProjectRoleUsers(projectId);
         const role = roles.find((r) => r.id === roleId);
@@ -165,6 +166,7 @@ class ProjectService {
         }
         await this.accessService.addUserToRole(userId, role.id);
     }
+    // TODO: should be an event too
     async removeUser(projectId, roleId, userId) {
         const roles = await this.accessService.getRolesForProject(projectId);
         const role = roles.find((r) => r.id === roleId);

package/dist/lib/services/project-service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"project-service.js","sourceRoot":"","sources":["../../../src/lib/services/project-service.ts"],"names":[],"mappings":";;;;;AAEA,mFAAyD;AACzD,+FAAqE;AACrE,yCAA0C;AAC1C,qDAAiD;AACjD,6EAAoD;AACpD,4CAIyB;AAGzB,0CAOwB;AASxB,sDAAsE;AACtE,+EAAqD;AACrD,qGAA2E;AAE3E,MAAM,YAAY,GAAG,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC;AAEjE,MAAM,eAAe,GAAG,SAAS,CAAC;AAOlC,MAAqB,cAAc;IAqB/B,YACI,EACI,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,uBAAuB,GAS1B,EACD,MAAsB,EACtB,aAA4B,EAC5B,~~oBAA4C~~;~~QArBxC~~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~~QACxC~~,MAAM,OAAO,GAAG,MAAM,8BAAa,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;QAElE,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEjC,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,wBAAe;YACrB,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC;YAC7B,IAAI,EAAE,OAAO;YACb,OAAO~~,EAAE,OAAO,CAAC,EAAE~~;~~SACtB~~,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,0BAA0B,CAC5B,OAAsB,EACtB,YAAoB;QAEpB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC;YAC1D,YAAY,EAAE,OAAO,CAAC,IAAI;SAC7B,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,yBAAyB,CACtD,YAAY,CACf,CAAC;QACF,OAAO,WAAW,CAAC,KAAK,CACpB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CACvD,CAAC;IACN,CAAC;IAED,KAAK,CAAC,aAAa,CACf,YAAoB,EACpB,WAAmB,EACnB,IAAU,EACV,gBAAwB;QAExB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAE/D,IAAI,OAAO,CAAC,OAAO,KAAK,gBAAgB,EAAE;YACtC,MAAM,IAAI,yBAAa,CAAC,4BAAc,CAAC,CAAC;SAC3C;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAEpD,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,IAAI,wBAAa,CAAC,WAAW,YAAY,YAAY,CAAC,CAAC;SAChE;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CACrD,IAAI,EACJ,4BAAc,EACd,YAAY,CACf,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE;YACb,MAAM,IAAI,yBAAa,CAAC,4BAAc,CAAC,CAAC;SAC3C;QAED,MAAM,6BAA6B,GAC/B,MAAM,IAAI,CAAC,0BAA0B,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACjE,IAAI,CAAC,6BAA6B,EAAE;YAChC,MAAM,IAAI,oCAAwB,CAAC,YAAY,CAAC,CAAC;SACpD;QACD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAChE,WAAW,EACX,YAAY,EACZ,IAAI,CAAC,QAAQ,CAChB,CAAC;QACF,MAAM,IAAI,CAAC,oBAAoB,CAAC,4BAA4B,CACxD,WAAW,EACX,YAAY,CACf,CAAC;QAEF,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAU,EAAE,IAAU;QACtC,IAAI,EAAE,KAAK,eAAe,EAAE;YACxB,MAAM,IAAI,iCAAqB,CAC3B,yCAAyC,CAC5C,CAAC;SACL;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;YACjD,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,KAAK;SAClB,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,MAAM,IAAI,iCAAqB,CAC3B,0DAA0D,CAC7D,CAAC;SACL;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE5B,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,wBAAe;YACrB,SAAS,EAAE,YAAY,CAAC,IAAI,CAAC;YAC7B,OAAO,EAAE,EAAE;~~YACX~~,~~IAAI,EAAE,EAAE,EAAE,EAAE;SACf,~~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~~AAlUD~~,~~iCAkUC~~;AAED,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC"}
1	+ {"version":3,"file":"project-service.js","sourceRoot":"","sources":["../../../src/lib/services/project-service.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/reset-token-service.js CHANGED Viewed

@@ -8,7 +8,7 @@ const bcrypt_1 = __importDefault(require("bcrypt"));
 const url_1 = require("url");
 const used_token_error_1 = __importDefault(require("../error/used-token-error"));
 const invalid_token_error_1 = __importDefault(require("../error/invalid-token-error"));
-const ONE_DAY = 86400000;
+const date_fns_1 = require("date-fns");
 class ResetTokenService {
     constructor({ resetTokenStore }, { getLogger, server }) {
         this.store = resetTokenStore;
@@ -67,7 +67,7 @@ class ResetTokenService {
         const path = '/new-user';
         return this.createResetUrl(forUser, creator, path);
     }
-    async createToken(tokenUser, creator, expiryDelta = ONE_DAY) {
+    async createToken(tokenUser, creator, expiryDelta = (0, date_fns_1.hoursToMilliseconds)(24)) {
         const token = await this.generateToken();
         const expiry = new Date(Date.now() + expiryDelta);
         await this.store.expireExistingTokensForUser(tokenUser);

package/dist/lib/services/reset-token-service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"reset-token-service.js","sourceRoot":"","sources":["../../../src/lib/services/reset-token-service.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,oDAA4B;AAC5B,6BAA0B;AAE1B,iFAAuD;AACvD,uFAA6D;~~AAS7D~~,~~MAAM,OAAO,GAAG,QAAU,CAAC~~;~~AAM3B~~,MAAqB,iBAAiB;IAOlC,YACI,EAAE,eAAe,EAA2C,EAC5D,EAAE,SAAS,EAAE,MAAM,EAAgD;QAEnE,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,kCAAkC,CAAC,CAAC;QAC5D,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,KAAkB;QACnC,IAAI;YACA,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAChC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;SACf;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAED,KAAK,CAAC,oBAAoB;QACtB,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;YAClD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACvC,MAAM,UAAU,GACZ,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;gBAEpD,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC;gBAE/B,OAAO,GAAG,CAAC;YACf,CAAC,EAAE,EAAE,CAAC,CAAC;YAEP,OAAO,KAAK,CAAC;SAChB;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,EAAE,CAAC;SACb;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAa;QACvB,IAAI,CAAC,CAAC;QACN,IAAI;YACA,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACtC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE;gBACX,OAAO,CAAC,CAAC;aACZ;SACJ;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,IAAI,6BAAiB,EAAE,CAAC;SACjC;QACD,MAAM,IAAI,0BAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAEO,wBAAwB,CAAC,KAAkB;QAC/C,OAAO,IAAI,SAAG,CAAC,GAAG,IAAI,CAAC,WAAW,mBAAmB,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IACxE,CAAC;IAEO,KAAK,CAAC,cAAc,CACxB,OAAe,EACf,OAAe,EACf,IAAY;QAEZ,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvD,OAAO,OAAO,CAAC,OAAO,CAClB,IAAI,SAAG,CAAC,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,UAAU,KAAK,CAAC,KAAK,EAAE,CAAC,CAC7D,CAAC;IACN,CAAC;IAED,KAAK,CAAC,sBAAsB,CACxB,OAAe,EACf,OAAe;QAEf,MAAM,IAAI,GAAG,iBAAiB,CAAC;QAC/B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAe,EAAE,OAAe;QACnD,MAAM,IAAI,GAAG,WAAW,CAAC;QACzB,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,WAAW,CACb,SAAiB,EACjB,OAAe,EACf,cAAsB,~~OAAO~~;~~QAE7B~~,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,CAAC;QAClD,MAAM,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YACrB,WAAW,EAAE,KAAK;YAClB,OAAO,EAAE,SAAS;YAClB,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,OAAO;SACtB,CAAC,CAAC;IACP,CAAC;IAEO,aAAa;QACjB,OAAO,gBAAM,CAAC,IAAI,CAAC,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC;CACJ;AAxGD,oCAwGC;AAED,MAAM,CAAC,OAAO,GAAG,iBAAiB,CAAC"}
1	+ {"version":3,"file":"reset-token-service.js","sourceRoot":"","sources":["../../../src/lib/services/reset-token-service.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/state-util.js CHANGED Viewed

@@ -25,7 +25,7 @@ const mime = __importStar(require("mime"));
 const YAML = __importStar(require("js-yaml"));
 const readFile = (file) => new Promise((resolve, reject) => fs.readFile(file, (err, v) => err ? reject(err) : resolve(v.toString('utf-8'))));
 exports.readFile = readFile;
-const parseFile = (file, data) => (mime.lookup(file) === 'text/yaml' ? YAML.load(data) : JSON.parse(data));
+const parseFile = (file, data) => (mime.getType(file) === 'text/yaml' ? YAML.load(data) : JSON.parse(data));
 exports.parseFile = parseFile;
 const filterExisting = (keepExisting, existingArray = []) => (item) => {
     if (keepExisting) {

package/dist/lib/services/state-util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"state-util.js","sourceRoot":"","sources":["../../../src/lib/services/state-util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,8CAAgC;AAEzB,MAAM,QAAQ,GAAsC,CAAC,IAAI,EAAE,EAAE,CAChE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC5B,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CACzB,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CACnD,CACJ,CAAC;AALO,QAAA,QAAQ,YAKf;AAEC,MAAM,SAAS,GAAwC,CAC1D,IAAY,EACZ,IAAY,EACd,EAAE,CAAC,CAAC,IAAI,CAAC,~~MAAM~~,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;~~AAHjE~~,QAAA,SAAS,~~aAGwD~~;~~AAEvE~~,MAAM,cAAc,GAIvB,CAAC,YAAY,EAAE,aAAa,GAAG,EAAE,EAAE,EAAE,CACrC,CAAC,IAAI,EAAE,EAAE;IACL,IAAI,YAAY,EAAE;QACd,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,OAAO,CAAC,KAAK,CAAC;KACjB;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAXO,QAAA,cAAc,kBAWrB;AAEC,MAAM,WAAW,GACpB,CAAC,aAAa,GAAG,EAAE,EAAE,EAAE,CACvB,CAAC,IAAI,EAAE,EAAE;IACL,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,IAAI,MAAM,EAAE;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;KAC1D;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AARO,QAAA,WAAW,eAQlB"}
1	+ {"version":3,"file":"state-util.js","sourceRoot":"","sources":["../../../src/lib/services/state-util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,8CAAgC;AAEzB,MAAM,QAAQ,GAAsC,CAAC,IAAI,EAAE,EAAE,CAChE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC5B,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CACzB,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CACnD,CACJ,CAAC;AALO,QAAA,QAAQ,YAKf;AAEC,MAAM,SAAS,GAAwC,CAC1D,IAAY,EACZ,IAAY,EACd,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;AAHlE,QAAA,SAAS,aAGyD;AAExE,MAAM,cAAc,GAIvB,CAAC,YAAY,EAAE,aAAa,GAAG,EAAE,EAAE,EAAE,CACrC,CAAC,IAAI,EAAE,EAAE;IACL,IAAI,YAAY,EAAE;QACd,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,OAAO,CAAC,KAAK,CAAC;KACjB;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAXO,QAAA,cAAc,kBAWrB;AAEC,MAAM,WAAW,GACpB,CAAC,aAAa,GAAG,EAAE,EAAE,EAAE,CACvB,CAAC,IAAI,EAAE,EAAE;IACL,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,IAAI,MAAM,EAAE;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;KAC1D;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AARO,QAAA,WAAW,eAQlB"}

package/dist/lib/services/user-service.d.ts CHANGED Viewed

@@ -65,8 +65,10 @@ declare class UserService {
     search(query: IUserSearch): Promise<IUser[]>;
     getByEmail(email: string): Promise<IUser>;
     createUser({ username, email, name, password, rootRole }: ICreateUser, updatedBy?: User): Promise<IUser>;
-    private updateChangeLog;
+    private getCreatedBy;
+    private mapUserToData;
     updateUser({ id, name, email, rootRole }: IUpdateUser, updatedBy?: User): Promise<IUser>;
+    deleteUser(userId: number, updatedBy?: User): Promise<void>;
     loginUser(usernameOrEmail: string, password: string): Promise<IUser>;
     /**
      * Used to login users without specifying password. Used when integrating
@@ -79,7 +81,6 @@ declare class UserService {
     loginUserWithoutPassword(email: string, autoCreateUser?: boolean): Promise<IUser>;
     loginUserSSO({ email, name, rootRole, autoCreate, }: ILoginUserRequest): Promise<IUser>;
     changePassword(userId: number, password: string): Promise<void>;
-    deleteUser(userId: number, updatedBy?: User): Promise<void>;
     getUserForToken(token: string): Promise<ITokenUser>;
     /**
      * If the password is a strong password will update password and delete all sessions for the user we're changing the password for

package/dist/lib/services/user-service.js CHANGED Viewed

@@ -107,32 +107,56 @@ class UserService {
             const passwordHash = await bcrypt_1.default.hash(password, saltRounds);
             await this.store.setPasswordHash(user.id, passwordHash);
         }
-        await this.updateChangeLog(events_1.USER_CREATED, user, updatedBy);
-        return user;
-    }
-    async updateChangeLog(type, user, updatedBy = systemUser) {
         await this.eventStore.store({
-            type,
-            createdBy: updatedBy.username || updatedBy.email,
-            data: {
-                id: user.id,
-                name: user.name,
-                username: user.username,
-                email: user.email,
-            },
+            type: events_1.USER_CREATED,
+            createdBy: this.getCreatedBy(updatedBy),
+            data: this.mapUserToData(user),
         });
+        return user;
+    }
+    getCreatedBy(updatedBy = systemUser) {
+        return updatedBy.username || updatedBy.email;
+    }
+    mapUserToData(user) {
+        if (!user) {
+            return undefined;
+        }
+        return {
+            id: user.id,
+            name: user.name,
+            username: user.username,
+            email: user.email,
+        };
     }
     async updateUser({ id, name, email, rootRole }, updatedBy) {
         if (email) {
             joi_1.default.assert(email, joi_1.default.string().email(), 'Email');
         }
+        const preUser = await this.store.get(id);
         if (rootRole) {
             await this.accessService.setUserRootRole(id, rootRole);
         }
         const user = await this.store.update(id, { name, email });
-        await this.updateChangeLog(events_1.USER_UPDATED, user, updatedBy);
+        await this.eventStore.store({
+            type: events_1.USER_UPDATED,
+            createdBy: this.getCreatedBy(updatedBy),
+            data: this.mapUserToData(user),
+            preData: this.mapUserToData(preUser),
+        });
         return user;
     }
+    async deleteUser(userId, updatedBy) {
+        const user = await this.store.get(userId);
+        const roles = await this.accessService.getRolesForUser(userId);
+        await Promise.all(roles.map((role) => this.accessService.removeUserFromRole(userId, role.id)));
+        await this.sessionService.deleteSessionsForUser(userId);
+        await this.store.delete(userId);
+        await this.eventStore.store({
+            type: events_1.USER_DELETED,
+            createdBy: this.getCreatedBy(updatedBy),
+            preData: this.mapUserToData(user),
+        });
+    }
     async loginUser(usernameOrEmail, password) {
         const settings = await this.settingService.get(simple_auth_settings_1.simpleAuthKey);
         if (settings && settings.disabled) {
@@ -191,14 +215,6 @@ class UserService {
         const passwordHash = await bcrypt_1.default.hash(password, saltRounds);
         return this.store.setPasswordHash(userId, passwordHash);
     }
-    async deleteUser(userId, updatedBy) {
-        const user = await this.store.get(userId);
-        const roles = await this.accessService.getRolesForUser(userId);
-        await Promise.all(roles.map((role) => this.accessService.removeUserFromRole(userId, role.id)));
-        await this.sessionService.deleteSessionsForUser(userId);
-        await this.store.delete(userId);
-        await this.updateChangeLog(events_1.USER_DELETED, user, updatedBy);
-    }
     async getUserForToken(token) {
         const { createdBy, userId } = await this.resetTokenService.isValid(token);
         const user = await this.getUser(userId);

package/dist/lib/services/user-service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"user-service.js","sourceRoot":"","sources":["../../../src/lib/services/user-service.ts"],"names":[],"mappings":"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~~eAAe~~,CAAC,~~qBAAY~~,~~EAAE~~,IAAI,EAAE,SAAS,CAAC,CAAC;~~QAE1D~~,~~OAAO~~,IAAI,CAAC~~;IAChB~~,CAAC;~~IAEO~~,~~KAAK~~,CAAC,~~eAAe~~,~~CACzB~~,~~IAAY~~,~~EACZ~~,~~IAAW~~,~~EACX~~,YAAkB,UAAU;~~QAE5B~~,~~MAAM~~,~~IAAI~~,CAAC,~~UAAU~~,CAAC,KAAK,CAAC;~~YACxB~~,~~IAAI~~;~~YACJ~~,~~SAAS~~,~~EAAE~~,~~SAAS~~,CAAC,~~QAAQ,~~IAAI,SAAS,CAAC~~,KAAK~~;~~YAChD~~,~~IAAI,EAAE~~;~~gBACF~~,EAAE,EAAE,IAAI,CAAC,EAAE;~~gBACX~~,IAAI,EAAE,IAAI,CAAC,IAAI;~~gBACf~~,QAAQ,EAAE,IAAI,CAAC,QAAQ;~~gBACvB~~,KAAK,EAAE,IAAI,CAAC,KAAK;~~aACpB;SACJ~~,CAAC~~,CAAC~~;~~IACP~~,CAAC;IAED,KAAK,CAAC,UAAU,CACZ,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAe,EAC1C,SAAgB;QAEhB,IAAI,KAAK,EAAE;YACP,aAAG,CAAC,MAAM,CAAC,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;SACpD;QAED,IAAI,QAAQ,EAAE;YACV,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;SAC1D;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAE1D,MAAM,IAAI,CAAC,~~eAAe~~,CAAC,qBAAY,EAAE,IAAI,~~EAAE~~,SAAS,CAAC,CAAC;~~QAE1D~~,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,eAAuB,EAAE,QAAgB;QACrD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAC1C,oCAAa,CAChB,CAAC;QAEF,IAAI,QAAQ,IAAI,QAAQ,CAAC,QAAQ,EAAE;YAC/B,MAAM,IAAI,KAAK,CACX,sDAAsD,CACzD,CAAC;SACL;QAED,MAAM,OAAO,GAAG,IAAA,kBAAO,EAAC,eAAe,CAAC;YACpC,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE;YAC5B,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE/D,MAAM,KAAK,GAAG,MAAM,gBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC3D,IAAI,KAAK,EAAE;YACP,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC;SACf;QACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAClD,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,wBAAwB,CAC1B,KAAa,EACb,iBAA0B,KAAK;QAE/B,OAAO,IAAI,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EACf,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,UAAU,GAAG,KAAK,GACF;QAChB,IAAI,IAAW,CAAC;QAEhB,IAAI;YACA,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9C,uCAAuC;YACvC,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;gBAC5B,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;aAC5D;SACJ;QAAC,OAAO,CAAC,EAAE;YACR,0DAA0D;YAC1D,IAAI,UAAU,EAAE;gBACZ,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC;oBACzB,KAAK;oBACL,IAAI;oBACJ,QAAQ,EAAE,QAAQ,IAAI,gBAAQ,CAAC,MAAM;iBACxC,CAAC,CAAC;aACN;iBAAM;gBACH,MAAM,CAAC,CAAC;aACX;SACJ;QACD,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,QAAgB;QACjD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,YAAY,GAAG,MAAM,gBAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,~~UAAU,CAAC,MAAc,EAAE,SAAgB;QAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,~~eAAe,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,OAAO,CAAC,GAAG,CACb,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACf,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CACzD,CACJ,CAAC;QACF,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAExD,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEhC,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAY,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,KAAa;QAC/B,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAC9D,KAAK,CACR,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7D,OAAO;YACH,KAAK;YACL,SAAS;YACT,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE;gBACF,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;gBAClC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;gBACpB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;aACvB;SACJ,CAAC;IACN,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,QAAgB;QAC/C,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC;YACxD,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,KAAK;SACR,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACT,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC7C,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC5D;aAAM;YACH,MAAM,IAAI,6BAAiB,EAAE,CAAC;SACjC;IACL,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC1B,aAAqB,EACrB,OAAa,UAAU;QAEvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,IAAI,wBAAa,CAAC,kBAAkB,aAAa,EAAE,CAAC,CAAC;SAC9D;QACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CACjE,QAAQ,CAAC,EAAE,EACX,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAC9B,CAAC;QAEF,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CACjC,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,KAAK,EACd,SAAS,CAAC,QAAQ,EAAE,CACvB,CAAC;QACF,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC;AAC7B,kBAAe,WAAW,CAAC"}
1	+ {"version":3,"file":"user-service.js","sourceRoot":"","sources":["../../../src/lib/services/user-service.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/version-service.js CHANGED Viewed

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const version_1 = __importDefault(require("../util/version"));
-const TWO_DAYS = 48 * 60 * 60 * 1000;
+const date_fns_1 = require("date-fns");
 class VersionService {
     constructor({ settingStore }, { getLogger, versionCheck, enterpriseVersion, }) {
         this.logger = getLogger('lib/services/version-service.js');
@@ -22,7 +22,7 @@ class VersionService {
     async setup() {
         await this.setInstanceId();
         await this.checkLatestVersion();
-        this.timer = setInterval(async () => this.checkLatestVersion(), TWO_DAYS);
+        this.timer = setInterval(async () => this.checkLatestVersion(), (0, date_fns_1.hoursToMilliseconds)(48));
         this.timer.unref();
     }
     async setInstanceId() {

package/dist/lib/services/version-service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"version-service.js","sourceRoot":"","sources":["../../../src/lib/services/version-service.ts"],"names":[],"mappings":";;;;;AAAA,4DAA+B;AAG/B,8DAAsC;~~AAItC~~,~~MAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC~~;~~AAcrC~~,MAAqB,cAAc;IAmB/B,YACI,EAAE,YAAY,EAAwC,EACtD,EACI,SAAS,EACT,YAAY,EACZ,iBAAiB,GAIpB;QAED,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,iCAAiC,CAAC,CAAC;QAC3D,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG;YACX,GAAG,EAAE,iBAAO;YACZ,UAAU,EAAE,iBAAiB,IAAI,EAAE;SACtC,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC;QACnC,IAAI,CAAC,eAAe,GAAG,YAAY,CAAC,GAAG,CAAC;QACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC3B,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,WAAW,CACpB,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,EACrC,~~QAAQ~~,~~CACX~~,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,aAAa;QACf,IAAI;YACA,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC3D,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;SACxB;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;SACnD;IACL,CAAC;IAED,KAAK,CAAC,kBAAkB;QACpB,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,IAAI;gBACA,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAK,EAAC,IAAI,CAAC,eAAe,EAAE;oBAC1C,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;wBACjB,QAAQ,EAAE,IAAI,CAAC,OAAO;wBACtB,UAAU,EAAE,IAAI,CAAC,UAAU;qBAC9B,CAAC;oBACF,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;iBAClD,CAAC,CAAC;gBACH,IAAI,GAAG,CAAC,EAAE,EAAE;oBACR,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;oBAC9B,IAAI,CAAC,MAAM,GAAG;wBACV,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG;wBACtB,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;qBACvC,CAAC;oBACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;iBAC/B;qBAAM;oBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,2CAA2C,GAAG,CAAC,MAAM,EAAE,CAC1D,CAAC;iBACL;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;aAC3D;SACJ;IACL,CAAC;IAED,cAAc;QACV,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC;IACN,CAAC;IAED,OAAO;QACH,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;CACJ;AAvGD,iCAuGC;AAED,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC"}
1	+ {"version":3,"file":"version-service.js","sourceRoot":"","sources":["../../../src/lib/services/version-service.ts"],"names":[],"mappings":"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"}

package/dist/lib/types/events.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { FeatureToggle, IStrategyConfig, ITag } from './model';
 export declare const APPLICATION_CREATED = "application-created";
 export declare const FEATURE_CREATED = "feature-created";
 export declare const FEATURE_DELETED = "feature-deleted";
@@ -17,6 +18,8 @@ export declare const FEATURE_UNTAGGED = "feature-untagged";
 export declare const FEATURE_STALE_ON = "feature-stale-on";
 export declare const FEATURE_STALE_OFF = "feature-stale-off";
 export declare const DROP_FEATURES = "drop-features";
+export declare const FEATURE_ENVIRONMENT_ENABLED = "feature-environment-enabled";
+export declare const FEATURE_ENVIRONMENT_DISABLED = "feature-environment-disabled";
 export declare const STRATEGY_CREATED = "strategy-created";
 export declare const STRATEGY_DELETED = "strategy-deleted";
 export declare const STRATEGY_DEPRECATED = "strategy-deprecated";
@@ -50,5 +53,165 @@ export declare const USER_UPDATED = "user-updated";
 export declare const USER_DELETED = "user-deleted";
 export declare const DROP_ENVIRONMENTS = "drop-environments";
 export declare const ENVIRONMENT_IMPORT = "environment-import";
-export declare const FEATURE_ENVIRONMENT_ENABLED = "feature-environment-enabled";
-export declare const FEATURE_ENVIRONMENT_DISABLED = "feature-environment-disabled";
+export interface IBaseEvent {
+    type: string;
+    createdBy: string;
+    project?: string;
+    environment?: string;
+    featureName?: string;
+    data?: any;
+    preData?: any;
+    tags?: ITag[];
+}
+export interface IEvent extends IBaseEvent {
+    id: number;
+    createdAt: Date;
+}
+declare class BaseEvent implements IBaseEvent {
+    readonly type: string;
+    readonly createdBy: string;
+    readonly tags: ITag[];
+    constructor(type: string, createdBy: string, tags?: ITag[]);
+}
+export declare class FeatureStaleEvent extends BaseEvent {
+    readonly project: string;
+    readonly featureName: string;
+    constructor(p: {
+        stale: boolean;
+        project: string;
+        featureName: string;
+        createdBy: string;
+        tags: ITag[];
+    });
+}
+export declare class FeatureEnvironmentEvent extends BaseEvent {
+    readonly project: string;
+    readonly featureName: string;
+    readonly environment: string;
+    constructor(p: {
+        enabled: boolean;
+        project: string;
+        featureName: string;
+        environment: string;
+        createdBy: string;
+        tags: ITag[];
+    });
+}
+export declare class FeatureChangeProjectEvent extends BaseEvent {
+    readonly project: string;
+    readonly featureName: string;
+    readonly data: {
+        oldProject: string;
+        newProject: string;
+    };
+    constructor(p: {
+        oldProject: string;
+        newProject: string;
+        featureName: string;
+        createdBy: string;
+        tags: ITag[];
+    });
+}
+export declare class FeatureCreatedEvent extends BaseEvent {
+    readonly project: string;
+    readonly featureName: string;
+    readonly data: FeatureToggle;
+    constructor(p: {
+        project: string;
+        featureName: string;
+        createdBy: string;
+        data: FeatureToggle;
+        tags: ITag[];
+    });
+}
+export declare class FeatureArchivedEvent extends BaseEvent {
+    readonly project: string;
+    readonly featureName: string;
+    constructor(p: {
+        project: string;
+        featureName: string;
+        createdBy: string;
+        tags: ITag[];
+    });
+}
+export declare class FeatureRevivedEvent extends BaseEvent {
+    readonly project: string;
+    readonly featureName: string;
+    constructor(p: {
+        project: string;
+        featureName: string;
+        createdBy: string;
+        tags: ITag[];
+    });
+}
+export declare class FeatureDeletedEvent extends BaseEvent {
+    readonly project: string;
+    readonly featureName: string;
+    readonly preData: FeatureToggle;
+    constructor(p: {
+        project: string;
+        featureName: string;
+        preData: FeatureToggle;
+        createdBy: string;
+        tags: ITag[];
+    });
+}
+export declare class FeatureMetadataUpdateEvent extends BaseEvent {
+    readonly project: string;
+    readonly featureName: string;
+    readonly data: FeatureToggle;
+    readonly preData: FeatureToggle;
+    constructor(p: {
+        featureName: string;
+        createdBy: string;
+        project: string;
+        data: FeatureToggle;
+        preData: FeatureToggle;
+        tags: ITag[];
+    });
+}
+export declare class FeatureStrategyAddEvent extends BaseEvent {
+    readonly project: string;
+    readonly featureName: string;
+    readonly environment: string;
+    readonly data: IStrategyConfig;
+    constructor(p: {
+        project: string;
+        featureName: string;
+        environment: string;
+        createdBy: string;
+        data: IStrategyConfig;
+        tags: ITag[];
+    });
+}
+export declare class FeatureStrategyUpdateEvent extends BaseEvent {
+    readonly project: string;
+    readonly featureName: string;
+    readonly environment: string;
+    readonly data: IStrategyConfig;
+    readonly preData: IStrategyConfig;
+    constructor(p: {
+        project: string;
+        featureName: string;
+        environment: string;
+        createdBy: string;
+        data: IStrategyConfig;
+        preData: IStrategyConfig;
+        tags: ITag[];
+    });
+}
+export declare class FeatureStrategyRemoveEvent extends BaseEvent {
+    readonly project: string;
+    readonly featureName: string;
+    readonly environment: string;
+    readonly preData: IStrategyConfig;
+    constructor(p: {
+        project: string;
+        featureName: string;
+        environment: string;
+        createdBy: string;
+        preData: IStrategyConfig;
+        tags: ITag[];
+    });
+}
+export {};