unleash-server 5.7.2 → 5.8.0

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

@@ -11,7 +11,9 @@ const store_1 = __importDefault(require("../../test/fixtures/store"));
 const addon_service_1 = __importDefault(require("./addon-service"));
 const addon_service_test_simple_addon_1 = __importDefault(require("./addon-service-test-simple-addon"));
 const event_service_1 = __importDefault(require("./event-service"));
+const types_1 = require("../types");
 const MASKED_VALUE = '*****';
+const TEST_USER_ID = -9999;
 let addonProvider;
 function getSetup() {
     const stores = (0, store_1.default)();
@@ -50,7 +52,7 @@ test('should not allow addon-config for unknown provider', async () => {
             parameters: {},
             events: [],
             description: '',
-        }, 'test');
+        }, 'test', TEST_USER_ID);
     }).rejects.toThrow(joi_1.ValidationError);
 });
 test('should trigger simple-addon eventHandler', async () => {
@@ -65,11 +67,12 @@ test('should trigger simple-addon eventHandler', async () => {
         events: [events_1.FEATURE_CREATED],
         description: '',
     };
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     // Feature toggle was created
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         data: {
             name: 'some-toggle',
             enabled: false,
@@ -95,10 +98,11 @@ test('should not trigger event handler if project of event is different from add
             url: 'http://localhost:wh',
         },
     };
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: 'someotherproject',
         data: {
             name: 'some-toggle',
@@ -125,10 +129,11 @@ test('should trigger event handler if project for event is one of the desired pr
             url: 'http://localhost:wh',
         },
     };
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: desiredProject,
         data: {
             name: 'some-toggle',
@@ -138,7 +143,8 @@ test('should trigger event handler if project for event is one of the desired pr
     });
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: otherProject,
         data: {
             name: 'other-toggle',
@@ -167,10 +173,11 @@ test('should trigger events for multiple projects if addon is setup to filter mu
             url: 'http://localhost:wh',
         },
     };
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: desiredProjects[0],
         data: {
             name: 'some-toggle',
@@ -180,7 +187,8 @@ test('should trigger events for multiple projects if addon is setup to filter mu
     });
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: otherProject,
         data: {
             name: 'other-toggle',
@@ -190,7 +198,8 @@ test('should trigger events for multiple projects if addon is setup to filter mu
     });
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: desiredProjects[1],
         data: {
             name: 'third-toggle',
@@ -222,10 +231,11 @@ test('should filter events on environment if addon is setup to filter for it', a
             url: 'http://localhost:wh',
         },
     };
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: desiredEnvironment,
         environment: desiredEnvironment,
         data: {
@@ -236,7 +246,8 @@ test('should filter events on environment if addon is setup to filter for it', a
     });
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         environment: otherEnvironment,
         data: {
             name: 'other-toggle',
@@ -267,7 +278,8 @@ test('should not filter out global events (no specific environment) even if addo
     };
     const globalEventWithNoEnvironment = {
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: 'some-project',
         data: {
             name: 'some-toggle',
@@ -275,7 +287,7 @@ test('should not filter out global events (no specific environment) even if addo
             strategies: [{ name: 'default' }],
         },
     };
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     await eventService.storeEvent(globalEventWithNoEnvironment);
     const simpleProvider = addonService.addonProviders.simple;
     // @ts-expect-error
@@ -300,14 +312,15 @@ test('should not filter out global events (no specific project) even if addon is
     };
     const globalEventWithNoProject = {
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         data: {
             name: 'some-toggle',
             enabled: false,
             strategies: [{ name: 'default' }],
         },
     };
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     await eventService.storeEvent(globalEventWithNoProject);
     const simpleProvider = addonService.addonProviders.simple;
     // @ts-expect-error
@@ -330,10 +343,11 @@ test('should support wildcard option for filtering addons', async () => {
             url: 'http://localhost:wh',
         },
     };
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: desiredProjects[0],
         data: {
             name: 'some-toggle',
@@ -343,7 +357,8 @@ test('should support wildcard option for filtering addons', async () => {
     });
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: otherProject,
         data: {
             name: 'other-toggle',
@@ -353,7 +368,8 @@ test('should support wildcard option for filtering addons', async () => {
     });
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: desiredProjects[1],
         data: {
             name: 'third-toggle',
@@ -392,10 +408,11 @@ test('Should support filtering by both project and environment', async () => {
         'desired-toggle2',
         'desired-toggle3',
     ];
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: desiredProjects[0],
         environment: desiredEnvironments[0],
         data: {
@@ -406,7 +423,8 @@ test('Should support filtering by both project and environment', async () => {
     });
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: desiredProjects[0],
         environment: 'wrongenvironment',
         data: {
@@ -417,7 +435,8 @@ test('Should support filtering by both project and environment', async () => {
     });
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: desiredProjects[2],
         environment: desiredEnvironments[1],
         data: {
@@ -428,7 +447,8 @@ test('Should support filtering by both project and environment', async () => {
     });
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: desiredProjects[2],
         environment: desiredEnvironments[2],
         data: {
@@ -439,7 +459,8 @@ test('Should support filtering by both project and environment', async () => {
     });
     await eventService.storeEvent({
         type: events_1.FEATURE_CREATED,
-        createdBy: 'some@user.com',
+        createdBy: types_1.SYSTEM_USER.username,
+        createdByUserId: types_1.SYSTEM_USER.id,
         project: 'wrongproject',
         environment: desiredEnvironments[0],
         data: {
@@ -471,7 +492,7 @@ test('should create simple-addon config', async () => {
         events: [events_1.FEATURE_CREATED],
         description: '',
     };
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     const addons = await addonService.getAddons();
     expect(addons.length).toBe(1);
     expect(addons[0].provider).toBe('simple');
@@ -488,7 +509,7 @@ test('should create tag type for simple-addon', async () => {
         events: [events_1.FEATURE_CREATED],
         description: '',
     };
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     const tagType = await tagTypeService.getTagType('me');
     expect(tagType.name).toBe('me');
 });
@@ -504,7 +525,7 @@ test('should store ADDON_CONFIG_CREATE event', async () => {
         events: [events_1.FEATURE_CREATED],
         description: '',
     };
-    await addonService.createAddon(config, 'me@mail.com');
+    await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     const { events } = await eventService.getEvents();
     expect(events.length).toBe(2); // Also tag-types where created
     expect(events[1].type).toBe(events_1.ADDON_CONFIG_CREATED);
@@ -522,9 +543,9 @@ test('should store ADDON_CONFIG_UPDATE event', async () => {
         },
         events: [events_1.FEATURE_CREATED],
     };
-    const addonConfig = await addonService.createAddon(config, 'me@mail.com');
+    const addonConfig = await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     const updated = { ...addonConfig, description: 'test' };
-    await addonService.updateAddon(addonConfig.id, updated, 'me@mail.com');
+    await addonService.updateAddon(addonConfig.id, updated, 'me@mail.com', TEST_USER_ID);
     const { events } = await eventService.getEvents();
     expect(events.length).toBe(3);
     expect(events[2].type).toBe(events_1.ADDON_CONFIG_UPDATED);
@@ -542,8 +563,8 @@ test('should store ADDON_CONFIG_REMOVE event', async () => {
         },
         events: [events_1.FEATURE_CREATED],
     };
-    const addonConfig = await addonService.createAddon(config, 'me@mail.com');
-    await addonService.removeAddon(addonConfig.id, 'me@mail.com');
+    const addonConfig = await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
+    await addonService.removeAddon(addonConfig.id, 'me@mail.com', TEST_USER_ID);
     const { events } = await eventService.getEvents();
     expect(events.length).toBe(3);
     expect(events[2].type).toBe(events_1.ADDON_CONFIG_DELETED);
@@ -562,7 +583,7 @@ test('should hide sensitive fields when fetching', async () => {
         },
         events: [events_1.FEATURE_CREATED],
     };
-    const createdConfig = await addonService.createAddon(config, 'me@mail.com');
+    const createdConfig = await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     const addons = await addonService.getAddons();
     const addonRetrieved = await addonService.getAddon(createdConfig.id);
     expect(addons.length).toBe(1);
@@ -583,13 +604,13 @@ test('should not overwrite masked values when updating', async () => {
         events: [events_1.FEATURE_CREATED],
         description: '',
     };
-    const addonConfig = await addonService.createAddon(config, 'me@mail.com');
+    const addonConfig = await addonService.createAddon(config, 'me@mail.com', TEST_USER_ID);
     const updated = {
         ...addonConfig,
         parameters: { url: MASKED_VALUE, var: 'some-new-value' },
         description: 'test',
     };
-    await addonService.updateAddon(addonConfig.id, updated, 'me@mail.com');
+    await addonService.updateAddon(addonConfig.id, updated, 'me@mail.com', TEST_USER_ID);
     const updatedConfig = await stores.addonStore.get(addonConfig.id);
     // @ts-ignore
     expect(updatedConfig.parameters.url).toBe('http://localhost/wh');
@@ -607,7 +628,7 @@ test('should reject addon config with missing required parameter when creating',
         events: [events_1.FEATURE_CREATED],
         description: '',
     };
-    await expect(async () => addonService.createAddon(config, 'me@mail.com')).rejects.toThrow(joi_1.ValidationError);
+    await expect(async () => addonService.createAddon(config, 'me@mail.com', TEST_USER_ID)).rejects.toThrow(joi_1.ValidationError);
 });
 test('should reject updating addon config with missing required parameter', async () => {
     const { addonService } = getSetup();
@@ -621,13 +642,13 @@ test('should reject updating addon config with missing required parameter', asyn
         events: [events_1.FEATURE_CREATED],
         description: '',
     };
-    const config = await addonService.createAddon(addonConfig, 'me@mail.com');
+    const config = await addonService.createAddon(addonConfig, 'me@mail.com', TEST_USER_ID);
     const updated = {
         ...config,
         parameters: { var: 'some-new-value' },
         description: 'test',
     };
-    await expect(async () => addonService.updateAddon(config.id, updated, 'me@mail.com')).rejects.toThrow(joi_1.ValidationError);
+    await expect(async () => addonService.updateAddon(config.id, updated, 'me@mail.com', TEST_USER_ID)).rejects.toThrow(joi_1.ValidationError);
 });
 test('Should reject addon config if a required parameter is just the empty string', async () => {
     const { addonService } = getSetup();
@@ -641,6 +662,6 @@ test('Should reject addon config if a required parameter is just the empty strin
         events: [events_1.FEATURE_CREATED],
         description: '',
     };
-    await expect(async () => addonService.createAddon(config, 'me@mail.com')).rejects.toThrow(joi_1.ValidationError);
+    await expect(async () => addonService.createAddon(config, 'me@mail.com', TEST_USER_ID)).rejects.toThrow(joi_1.ValidationError);
 });
 //# sourceMappingURL=addon-service.test.js.map

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

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

package/dist/lib/services/api-token-service.d.ts

@@ -18,13 +18,13 @@ export declare class ApiTokenService {
     getAllActiveTokens(): Promise<IApiToken[]>;
     private initApiTokens;
     getUserForToken(secret: string): IApiUser | undefined;
-    updateExpiry(secret: string, expiresAt: Date, updatedBy: string): Promise<IApiToken>;
-    delete(secret: string, deletedBy: string): Promise<void>;
+    updateExpiry(secret: string, expiresAt: Date, updatedBy: string, updatedById: number): Promise<IApiToken>;
+    delete(secret: string, deletedBy: string, deletedByUserId: number): Promise<void>;
     /**
      * @deprecated This may be removed in a future release, prefer createApiTokenWithProjects
      */
-    createApiToken(newToken: Omit<ILegacyApiTokenCreate, 'secret'>, createdBy?: string): Promise<IApiToken>;
-    createApiTokenWithProjects(newToken: Omit<IApiTokenCreate, 'secret'>, createdBy?: string): Promise<IApiToken>;
+    createApiToken(newToken: Omit<ILegacyApiTokenCreate, 'secret'>, createdBy?: string, createdByUserId?: number): Promise<IApiToken>;
+    createApiTokenWithProjects(newToken: Omit<IApiTokenCreate, 'secret'>, createdBy?: string, createdByUserId?: number): Promise<IApiToken>;
     createMigratedProxyApiToken(newToken: Omit<IApiTokenCreate, 'secret'>): Promise<IApiToken>;
     private insertNewApiToken;
     private findInvalidProject;

package/dist/lib/services/api-token-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-token-service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/api-token-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAgB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAEH,SAAS,EACT,qBAAqB,EACrB,eAAe,EAKlB,MAAM,2BAA2B,CAAC;AAYnC,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAkB3C,qBAAa,eAAe;IACxB,OAAO,CAAC,KAAK,CAAiB;IAE9B,OAAO,CAAC,gBAAgB,CAAoB;IAE5C,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,YAAY,CAAmB;IAEvC,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO,CAAC,eAAe,CAAkC;gBAGrD,EACI,aAAa,EACb,gBAAgB,GACnB,EAAE,IAAI,CAAC,cAAc,EAAE,eAAe,GAAG,kBAAkB,CAAC,EAC7D,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,GAAG,gBAAgB,CAAC,EAC5D,YAAY,EAAE,YAAY;IAexB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IASlC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAI5C,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAQxB,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAIpC,kBAAkB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YAIzC,aAAa;IAepB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAqC/C,YAAY,CACrB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,MAAM,GAClB,OAAO,CAAC,SAAS,CAAC;IAaR,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAarE;;OAEG;IACU,cAAc,CACvB,QAAQ,EAAE,IAAI,CAAC,qBAAqB,EAAE,QAAQ,CAAC,EAC/C,SAAS,GAAE,MAAyB,GACrC,OAAO,CAAC,SAAS,CAAC;IAKR,0BAA0B,CACnC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,EACzC,SAAS,GAAE,MAAyB,GACrC,OAAO,CAAC,SAAS,CAAC;IAYR,2BAA2B,CACpC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,GAC1C,OAAO,CAAC,SAAS,CAAC;YAQP,iBAAiB;IA+B/B,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,iBAAiB;CAQ5B"}
+{"version":3,"file":"api-token-service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/api-token-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAgB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAEH,SAAS,EACT,qBAAqB,EACrB,eAAe,EAKlB,MAAM,2BAA2B,CAAC;AAcnC,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAkB3C,qBAAa,eAAe;IACxB,OAAO,CAAC,KAAK,CAAiB;IAE9B,OAAO,CAAC,gBAAgB,CAAoB;IAE5C,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,YAAY,CAAmB;IAEvC,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO,CAAC,eAAe,CAAkC;gBAGrD,EACI,aAAa,EACb,gBAAgB,GACnB,EAAE,IAAI,CAAC,cAAc,EAAE,eAAe,GAAG,kBAAkB,CAAC,EAC7D,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,GAAG,gBAAgB,CAAC,EAC5D,YAAY,EAAE,YAAY;IAexB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IASlC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAI5C,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAQxB,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAIpC,kBAAkB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YAIzC,aAAa;IAqBpB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAqC/C,YAAY,CACrB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,SAAS,CAAC;IAcR,MAAM,CACf,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC;IAchB;;OAEG;IACU,cAAc,CACvB,QAAQ,EAAE,IAAI,CAAC,qBAAqB,EAAE,QAAQ,CAAC,EAC/C,SAAS,GAAE,MAA6B,EACxC,eAAe,GAAE,MAAuB,GACzC,OAAO,CAAC,SAAS,CAAC;IASR,0BAA0B,CACnC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,EACzC,SAAS,GAAE,MAA6B,EACxC,eAAe,GAAE,MAAuB,GACzC,OAAO,CAAC,SAAS,CAAC;IAgBR,2BAA2B,CACpC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,GAC1C,OAAO,CAAC,SAAS,CAAC;YAYP,iBAAiB;IAiC/B,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,iBAAiB;CAQ5B"}

package/dist/lib/services/api-token-service.js

@@ -72,7 +72,7 @@ class ApiTokenService {
         try {
             const createAll = tokens
                 .map(api_token_1.mapLegacyTokenWithSecret)
-                .map((t) => this.insertNewApiToken(t, 'init-api-tokens'));
+                .map((t) => this.insertNewApiToken(t, 'init-api-tokens', types_1.SYSTEM_USER_ID));
             await Promise.all(createAll);
         }
         catch (e) {
@@ -104,22 +104,24 @@ class ApiTokenService {
         }
         return undefined;
     }
-    async updateExpiry(secret, expiresAt, updatedBy) {
+    async updateExpiry(secret, expiresAt, updatedBy, updatedById) {
         const previous = await this.store.get(secret);
         const token = await this.store.setExpiry(secret, expiresAt);
         await this.eventService.storeEvent(new types_1.ApiTokenUpdatedEvent({
             createdBy: updatedBy,
+            createdByUserId: updatedById,
             previousToken: (0, util_1.omitKeys)(previous, 'secret'),
             apiToken: (0, util_1.omitKeys)(token, 'secret'),
         }));
         return token;
     }
-    async delete(secret, deletedBy) {
+    async delete(secret, deletedBy, deletedByUserId) {
         if (await this.store.exists(secret)) {
             const token = await this.store.get(secret);
             await this.store.delete(secret);
             await this.eventService.storeEvent(new types_1.ApiTokenDeletedEvent({
                 createdBy: deletedBy,
+                createdByUserId: deletedByUserId,
                 apiToken: (0, util_1.omitKeys)(token, 'secret'),
             }));
         }
@@ -127,17 +129,17 @@ class ApiTokenService {
     /**
      * @deprecated This may be removed in a future release, prefer createApiTokenWithProjects
      */
-    async createApiToken(newToken, createdBy = 'unleash-system') {
+    async createApiToken(newToken, createdBy = types_1.SYSTEM_USER.username, createdByUserId = types_1.SYSTEM_USER.id) {
         const token = (0, api_token_1.mapLegacyToken)(newToken);
-        return this.createApiTokenWithProjects(token, createdBy);
+        return this.createApiTokenWithProjects(token, createdBy, createdByUserId);
     }
-    async createApiTokenWithProjects(newToken, createdBy = 'unleash-system') {
+    async createApiTokenWithProjects(newToken, createdBy = types_1.SYSTEM_USER.username, createdByUserId = types_1.SYSTEM_USER.id) {
         (0, api_token_1.validateApiToken)(newToken);
         const environments = await this.environmentStore.getAll();
         (0, api_token_1.validateApiTokenEnvironment)(newToken, environments);
         const secret = this.generateSecretKey(newToken);
         const createNewToken = { ...newToken, secret };
-        return this.insertNewApiToken(createNewToken, createdBy);
+        return this.insertNewApiToken(createNewToken, createdBy, createdByUserId);
     }
     // TODO: Remove this service method after embedded proxy has been released in
     // 4.16.0
@@ -145,14 +147,15 @@ class ApiTokenService {
         (0, api_token_1.validateApiToken)(newToken);
         const secret = this.generateSecretKey(newToken);
         const createNewToken = { ...newToken, secret };
-        return this.insertNewApiToken(createNewToken, 'system-migration');
+        return this.insertNewApiToken(createNewToken, 'system-migration', types_1.SYSTEM_USER_ID);
     }
-    async insertNewApiToken(newApiToken, createdBy) {
+    async insertNewApiToken(newApiToken, createdBy, createdByUserId) {
         try {
             const token = await this.store.insert(newApiToken);
             this.activeTokens.push(token);
             await this.eventService.storeEvent(new types_1.ApiTokenCreatedEvent({
                 createdBy,
+                createdByUserId,
                 apiToken: (0, util_1.omitKeys)(token, 'secret'),
             }));
             return token;

package/dist/lib/services/api-token-service.js.map

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

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

@@ -7,7 +7,7 @@ const api_token_service_1 = require("./api-token-service");
 const test_config_1 = require("../../test/config/test-config");
 const api_token_1 = require("../types/models/api-token");
 const fake_api_token_store_1 = __importDefault(require("../../test/fixtures/fake-api-token-store"));
-const fake_environment_store_1 = __importDefault(require("../../test/fixtures/fake-environment-store"));
+const fake_environment_store_1 = __importDefault(require("../features/project-environments/fake-environment-store"));
 const fake_event_store_1 = __importDefault(require("../../test/fixtures/fake-event-store"));
 const types_1 = require("../types");
 const date_fns_1 = require("date-fns");
@@ -47,7 +47,7 @@ test("Shouldn't return frontend token when secret is undefined", async () => {
         secret: '*:*:some-random-string',
         type: api_token_1.ApiTokenType.FRONTEND,
         tokenName: 'front',
-        expiresAt: null,
+        expiresAt: undefined,
     };
     const config = (0, test_config_1.createTestConfig)({});
     const apiTokenStore = new fake_api_token_store_1.default();
@@ -66,7 +66,6 @@ test("Shouldn't return frontend token when secret is undefined", async () => {
     const apiTokenService = new api_token_service_1.ApiTokenService({ apiTokenStore, environmentStore }, config, eventService);
     await apiTokenService.createApiTokenWithProjects(token);
     await apiTokenService.fetchActiveTokens();
-    expect(apiTokenService.getUserForToken(undefined)).toEqual(undefined);
     expect(apiTokenService.getUserForToken('')).toEqual(undefined);
 });
 test('Api token operations should all have events attached', async () => {
@@ -76,7 +75,7 @@ test('Api token operations should all have events attached', async () => {
         secret: '*:*:some-random-string',
         type: api_token_1.ApiTokenType.FRONTEND,
         tokenName: 'front',
-        expiresAt: null,
+        expiresAt: undefined,
     };
     const config = (0, test_config_1.createTestConfig)({});
     const apiTokenStore = new fake_api_token_store_1.default();
@@ -95,8 +94,8 @@ test('Api token operations should all have events attached', async () => {
     const apiTokenService = new api_token_service_1.ApiTokenService({ apiTokenStore, environmentStore }, config, eventService);
     const saved = await apiTokenService.createApiTokenWithProjects(token);
     const newExpiry = (0, date_fns_1.addDays)(new Date(), 30);
-    await apiTokenService.updateExpiry(saved.secret, newExpiry, 'test');
-    await apiTokenService.delete(saved.secret, 'test');
+    await apiTokenService.updateExpiry(saved.secret, newExpiry, 'test', -9999);
+    await apiTokenService.delete(saved.secret, 'test', -9999);
     const { events } = await eventService.getEvents();
     const createdApiTokenEvents = events.filter((e) => e.type === types_1.API_TOKEN_CREATED);
     expect(createdApiTokenEvents).toHaveLength(1);