unleash-server 4.17.0-beta.0 → 4.17.0-beta.1
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.
- package/dist/lib/db/group-store.d.ts +6 -2
- package/dist/lib/db/group-store.js +54 -12
- package/dist/lib/db/group-store.js.map +1 -1
- package/dist/lib/db/pat-store.d.ts +1 -0
- package/dist/lib/db/pat-store.js +5 -0
- package/dist/lib/db/pat-store.js.map +1 -1
- package/dist/lib/openapi/index.d.ts +18 -0
- package/dist/lib/openapi/spec/group-schema.d.ts +6 -0
- package/dist/lib/openapi/spec/group-schema.js +6 -0
- package/dist/lib/openapi/spec/group-schema.js.map +1 -1
- package/dist/lib/openapi/spec/groups-schema.d.ts +6 -0
- package/dist/lib/openapi/spec/users-groups-base-schema.d.ts +6 -0
- package/dist/lib/routes/client-api/metrics.test.js +4 -0
- package/dist/lib/routes/client-api/metrics.test.js.map +1 -1
- package/dist/lib/services/client-metrics/last-seen-service.d.ts +13 -0
- package/dist/lib/services/client-metrics/last-seen-service.js +33 -0
- package/dist/lib/services/client-metrics/last-seen-service.js.map +1 -0
- package/dist/lib/services/client-metrics/metrics-service-v2.d.ts +3 -1
- package/dist/lib/services/client-metrics/metrics-service-v2.js +11 -9
- package/dist/lib/services/client-metrics/metrics-service-v2.js.map +1 -1
- package/dist/lib/services/group-service.d.ts +2 -0
- package/dist/lib/services/group-service.js +10 -1
- package/dist/lib/services/group-service.js.map +1 -1
- package/dist/lib/services/index.js +4 -1
- package/dist/lib/services/index.js.map +1 -1
- package/dist/lib/services/pat-service.d.ts +1 -0
- package/dist/lib/services/pat-service.js +14 -3
- package/dist/lib/services/pat-service.js.map +1 -1
- package/dist/lib/types/experimental.d.ts +2 -0
- package/dist/lib/types/experimental.js +1 -0
- package/dist/lib/types/experimental.js.map +1 -1
- package/dist/lib/types/group.d.ts +3 -1
- package/dist/lib/types/group.js +2 -1
- package/dist/lib/types/group.js.map +1 -1
- package/dist/lib/types/services.d.ts +2 -0
- package/dist/lib/types/stores/group-store.d.ts +8 -3
- package/dist/lib/types/stores/pat-store.d.ts +1 -0
- package/dist/migrations/20221011155007-add-user-groups-mappings.d.ts +2 -0
- package/dist/migrations/20221011155007-add-user-groups-mappings.js +14 -0
- package/dist/migrations/20221011155007-add-user-groups-mappings.js.map +1 -0
- package/dist/server-dev.js +1 -0
- package/dist/server-dev.js.map +1 -1
- package/dist/test/config/test-config.js +1 -0
- package/dist/test/config/test-config.js.map +1 -1
- package/dist/test/e2e/api/admin/user/pat.e2e.test.js +58 -1
- package/dist/test/e2e/api/admin/user/pat.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/metricsV2.e2e.test.js +39 -0
- package/dist/test/e2e/api/client/metricsV2.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/access-service.e2e.test.js +4 -4
- package/dist/test/e2e/services/access-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/group-service.e2e.test.d.ts +1 -0
- package/dist/test/e2e/services/group-service.e2e.test.js +66 -0
- package/dist/test/e2e/services/group-service.e2e.test.js.map +1 -0
- package/dist/test/e2e/services/last-seen-service.e2e.test.d.ts +1 -0
- package/dist/test/e2e/services/last-seen-service.e2e.test.js +114 -0
- package/dist/test/e2e/services/last-seen-service.e2e.test.js.map +1 -0
- package/dist/test/fixtures/fake-group-store.d.ts +7 -3
- package/dist/test/fixtures/fake-group-store.js +14 -2
- package/dist/test/fixtures/fake-group-store.js.map +1 -1
- package/dist/test/fixtures/fake-pat-store.d.ts +1 -0
- package/dist/test/fixtures/fake-pat-store.js +3 -0
- package/dist/test/fixtures/fake-pat-store.js.map +1 -1
- package/frontend/build/index.html +1 -1
- package/frontend/build/static/{FeatureMetricsChart.972e9167.js → FeatureMetricsChart.27fc2adc.js} +1 -1
- package/frontend/build/static/Playground.c294d43c.js +10 -0
- package/frontend/build/static/index.5f0c4988.js +422 -0
- package/frontend/package.json +8 -4
- package/package.json +6 -6
- package/frontend/build/static/Playground.2c4a2c38.js +0 -17
- package/frontend/build/static/index.db1525f8.js +0 -422
|
@@ -18,7 +18,11 @@ export default class GroupStore implements IGroupStore {
|
|
|
18
18
|
existsWithName(name: string): Promise<boolean>;
|
|
19
19
|
get(id: number): Promise<Group>;
|
|
20
20
|
create(group: IStoreGroup): Promise<Group>;
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
addUsersToGroup(groupId: number, users: IGroupUserModel[], userName: string, transaction?: Transaction): Promise<void>;
|
|
22
|
+
deleteUsersFromGroup(deletableUsers: IGroupUser[], transaction?: Transaction): Promise<void>;
|
|
23
23
|
updateGroupUsers(groupId: number, newUsers: IGroupUserModel[], existingUsers: IGroupUserModel[], deletableUsers: IGroupUser[], userName: string): Promise<void>;
|
|
24
|
+
getNewGroupsForExternalUser(userId: number, externalGroups: string[]): Promise<IGroup[]>;
|
|
25
|
+
addUserToGroups(userId: number, groupIds: number[], createdBy?: string): Promise<void>;
|
|
26
|
+
getOldGroupsForExternalUser(userId: number, externalGroups: string[]): Promise<IGroupUser[]>;
|
|
27
|
+
getGroupsForUser(userId: number): Promise<Group[]>;
|
|
24
28
|
}
|
|
@@ -13,7 +13,14 @@ const T = {
|
|
|
13
13
|
PROJECTS: 'projects',
|
|
14
14
|
ROLES: 'roles',
|
|
15
15
|
};
|
|
16
|
-
const GROUP_COLUMNS = [
|
|
16
|
+
const GROUP_COLUMNS = [
|
|
17
|
+
'id',
|
|
18
|
+
'name',
|
|
19
|
+
'description',
|
|
20
|
+
'mappings_sso',
|
|
21
|
+
'created_at',
|
|
22
|
+
'created_by',
|
|
23
|
+
];
|
|
17
24
|
const rowToGroup = (row) => {
|
|
18
25
|
if (!row) {
|
|
19
26
|
throw new notfound_error_1.default('No group found');
|
|
@@ -22,6 +29,7 @@ const rowToGroup = (row) => {
|
|
|
22
29
|
id: row.id,
|
|
23
30
|
name: row.name,
|
|
24
31
|
description: row.description,
|
|
32
|
+
mappingsSSO: row.mappings_sso,
|
|
25
33
|
createdAt: row.created_at,
|
|
26
34
|
createdBy: row.created_by,
|
|
27
35
|
});
|
|
@@ -36,9 +44,10 @@ const rowToGroupUser = (row) => {
|
|
|
36
44
|
joinedAt: row.created_at,
|
|
37
45
|
};
|
|
38
46
|
};
|
|
39
|
-
const groupToRow = (
|
|
40
|
-
name:
|
|
41
|
-
description:
|
|
47
|
+
const groupToRow = (group) => ({
|
|
48
|
+
name: group.name,
|
|
49
|
+
description: group.description,
|
|
50
|
+
mappings_sso: JSON.stringify(group.mappingsSSO),
|
|
42
51
|
});
|
|
43
52
|
class GroupStore {
|
|
44
53
|
constructor(db) {
|
|
@@ -54,10 +63,7 @@ class GroupStore {
|
|
|
54
63
|
async update(group) {
|
|
55
64
|
const rows = await this.db(T.GROUPS)
|
|
56
65
|
.where({ id: group.id })
|
|
57
|
-
.update(
|
|
58
|
-
name: group.name,
|
|
59
|
-
description: group.description,
|
|
60
|
-
})
|
|
66
|
+
.update(groupToRow(group))
|
|
61
67
|
.returning(GROUP_COLUMNS);
|
|
62
68
|
return rowToGroup(rows[0]);
|
|
63
69
|
}
|
|
@@ -128,7 +134,7 @@ class GroupStore {
|
|
|
128
134
|
.returning('*');
|
|
129
135
|
return rowToGroup(row[0]);
|
|
130
136
|
}
|
|
131
|
-
async
|
|
137
|
+
async addUsersToGroup(groupId, users, userName, transaction) {
|
|
132
138
|
const rows = users.map((user) => {
|
|
133
139
|
return {
|
|
134
140
|
group_id: groupId,
|
|
@@ -138,17 +144,53 @@ class GroupStore {
|
|
|
138
144
|
});
|
|
139
145
|
return (transaction || this.db).batchInsert(T.GROUP_USER, rows);
|
|
140
146
|
}
|
|
141
|
-
async
|
|
147
|
+
async deleteUsersFromGroup(deletableUsers, transaction) {
|
|
142
148
|
return (transaction || this.db)(T.GROUP_USER)
|
|
143
149
|
.whereIn(['group_id', 'user_id'], deletableUsers.map((user) => [user.groupId, user.userId]))
|
|
144
150
|
.delete();
|
|
145
151
|
}
|
|
146
152
|
async updateGroupUsers(groupId, newUsers, existingUsers, deletableUsers, userName) {
|
|
147
153
|
await this.db.transaction(async (tx) => {
|
|
148
|
-
await this.
|
|
149
|
-
await this.
|
|
154
|
+
await this.addUsersToGroup(groupId, newUsers, userName, tx);
|
|
155
|
+
await this.deleteUsersFromGroup(deletableUsers, tx);
|
|
150
156
|
});
|
|
151
157
|
}
|
|
158
|
+
async getNewGroupsForExternalUser(userId, externalGroups) {
|
|
159
|
+
const rows = await this.db(`${T.GROUPS} as g`)
|
|
160
|
+
.leftJoin(`${T.GROUP_USER} as gs`, function () {
|
|
161
|
+
this.on('g.id', 'gs.group_id').andOnVal('gs.user_id', '=', userId);
|
|
162
|
+
})
|
|
163
|
+
.where('gs.user_id', null)
|
|
164
|
+
.whereRaw('mappings_sso \\?| :groups', { groups: externalGroups });
|
|
165
|
+
return rows.map(rowToGroup);
|
|
166
|
+
}
|
|
167
|
+
async addUserToGroups(userId, groupIds, createdBy) {
|
|
168
|
+
const rows = groupIds.map((groupId) => {
|
|
169
|
+
return {
|
|
170
|
+
group_id: groupId,
|
|
171
|
+
user_id: userId,
|
|
172
|
+
created_by: createdBy,
|
|
173
|
+
};
|
|
174
|
+
});
|
|
175
|
+
return this.db.batchInsert(T.GROUP_USER, rows);
|
|
176
|
+
}
|
|
177
|
+
async getOldGroupsForExternalUser(userId, externalGroups) {
|
|
178
|
+
const rows = await this.db(`${T.GROUP_USER} as gu`)
|
|
179
|
+
.leftJoin(`${T.GROUPS} as g`, 'g.id', 'gu.group_id')
|
|
180
|
+
.whereNotIn('g.id', this.db(T.GROUPS)
|
|
181
|
+
.select('id')
|
|
182
|
+
.whereRaw('mappings_sso \\?| :groups', {
|
|
183
|
+
groups: externalGroups,
|
|
184
|
+
}))
|
|
185
|
+
.where('gu.user_id', userId);
|
|
186
|
+
return rows.map(rowToGroupUser);
|
|
187
|
+
}
|
|
188
|
+
async getGroupsForUser(userId) {
|
|
189
|
+
const rows = await this.db(T.GROUPS)
|
|
190
|
+
.leftJoin(T.GROUP_USER, 'groups.id', 'group_user.group_id')
|
|
191
|
+
.where('user_id', userId);
|
|
192
|
+
return rows.map(rowToGroup);
|
|
193
|
+
}
|
|
152
194
|
}
|
|
153
195
|
exports.default = GroupStore;
|
|
154
196
|
//# sourceMappingURL=group-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-store.js","sourceRoot":"","sources":["../../../src/lib/db/group-store.ts"],"names":[],"mappings":";;;;;AAEA,6EAAoD;AACpD,2DAOwB;AAGxB,MAAM,CAAC,GAAG;IACN,MAAM,EAAE,QAAQ;IAChB,UAAU,EAAE,YAAY;IACxB,UAAU,EAAE,YAAY;IACxB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;CACjB,CAAC;AAEF,MAAM,aAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"group-store.js","sourceRoot":"","sources":["../../../src/lib/db/group-store.ts"],"names":[],"mappings":";;;;;AAEA,6EAAoD;AACpD,2DAOwB;AAGxB,MAAM,CAAC,GAAG;IACN,MAAM,EAAE,QAAQ;IAChB,UAAU,EAAE,YAAY;IACxB,UAAU,EAAE,YAAY;IACxB,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;CACjB,CAAC;AAEF,MAAM,aAAa,GAAG;IAClB,IAAI;IACJ,MAAM;IACN,aAAa;IACb,cAAc;IACd,YAAY;IACZ,YAAY;CACf,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,EAAE;IACvB,IAAI,CAAC,GAAG,EAAE;QACN,MAAM,IAAI,wBAAa,CAAC,gBAAgB,CAAC,CAAC;KAC7C;IACD,OAAO,IAAI,eAAK,CAAC;QACb,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,WAAW,EAAE,GAAG,CAAC,YAAY;QAC7B,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,SAAS,EAAE,GAAG,CAAC,UAAU;KAC5B,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,EAAE;IAC3B,IAAI,CAAC,GAAG,EAAE;QACN,MAAM,IAAI,wBAAa,CAAC,qBAAqB,CAAC,CAAC;KAClD;IACD,OAAO;QACH,MAAM,EAAE,GAAG,CAAC,OAAO;QACnB,OAAO,EAAE,GAAG,CAAC,QAAQ;QACrB,QAAQ,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,KAAkB,EAAE,EAAE,CAAC,CAAC;IACxC,IAAI,EAAE,KAAK,CAAC,IAAI;IAChB,WAAW,EAAE,KAAK,CAAC,WAAW;IAC9B,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC;CAClD,CAAC,CAAC;AAEH,MAAqB,UAAU;IAG3B,YAAY,EAAQ;QAChB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAa;QAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE;aACvB,MAAM,CAAC,aAAa,CAAC;aACrB,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;aACd,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACxB,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAkB;QAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;aAC/B,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;aACvB,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;aACzB,SAAS,CAAC,aAAa,CAAC,CAAC;QAE9B,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,SAAiB;QACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,QAAQ,CAAC;aAC9D,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,QAAQ,CAAC;aAC7B,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC;aAClD,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAEjC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAClB,OAAO;gBACH,OAAO,EAAE,CAAC,CAAC,QAAQ;gBACnB,MAAM,EAAE,CAAC,CAAC,OAAO;gBACjB,SAAS,EAAE,CAAC,CAAC,UAAU;gBACvB,IAAI,EAAE,CAAC,CAAC,IAAI;aACf,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAkB;QACrC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC;aAC7B,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;aAClB,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC;aAC7B,QAAQ,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAClB,OAAO;gBACH,OAAO,EAAE,CAAC,CAAC,QAAQ;gBACnB,OAAO,EAAE,CAAC,CAAC,OAAO;aACrB,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,QAAkB;QACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,aAAa,EAAE,iBAAiB,EAAE,eAAe,CAAC;aACzD,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,QAAQ,CAAC;aAC7B,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC;aAC7C,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QACtC,OAAO,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAClE,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,SAAS;QACX,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC;IAClC,CAAC;IAED,OAAO,KAAU,CAAC;IAElB,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B,+BAA+B,CAAC,CAAC,MAAM,2BAA2B,EAClE,CAAC,EAAE,CAAC,CACP,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAY;QAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B,+BAA+B,CAAC,CAAC,MAAM,6BAA6B,EACpE,CAAC,IAAI,CAAC,CACT,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAU;QAChB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAC1D,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAkB;QAC3B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;aAC9B,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;aACzB,SAAS,CAAC,GAAG,CAAC,CAAC;QACpB,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,OAAe,EACf,KAAwB,EACxB,QAAgB,EAChB,WAAyB;QAEzB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5B,OAAO;gBACH,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;gBACrB,UAAU,EAAE,QAAQ;aACvB,CAAC;QACN,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,oBAAoB,CACtB,cAA4B,EAC5B,WAAyB;QAEzB,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;aACxC,OAAO,CACJ,CAAC,UAAU,EAAE,SAAS,CAAC,EACvB,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAC5D;aACA,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,OAAe,EACf,QAA2B,EAC3B,aAAgC,EAChC,cAA4B,EAC5B,QAAgB;QAEhB,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YACnC,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC5D,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC7B,MAAc,EACd,cAAwB;QAExB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,OAAO,CAAC;aACzC,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,QAAQ,EAAE;YAC/B,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,QAAQ,CACnC,YAAY,EACZ,GAAG,EACH,MAAM,CACT,CAAC;QACN,CAAC,CAAC;aACD,KAAK,CAAC,YAAY,EAAE,IAAI,CAAC;aACzB,QAAQ,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,MAAc,EACd,QAAkB,EAClB,SAAkB;QAElB,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YAClC,OAAO;gBACH,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,MAAM;gBACf,UAAU,EAAE,SAAS;aACxB,CAAC;QACN,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC7B,MAAc,EACd,cAAwB;QAExB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,QAAQ,CAAC;aAC9C,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC;aACnD,UAAU,CACP,MAAM,EACN,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;aACZ,MAAM,CAAC,IAAI,CAAC;aACZ,QAAQ,CAAC,2BAA2B,EAAE;YACnC,MAAM,EAAE,cAAc;SACzB,CAAC,CACT;aACA,KAAK,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACjC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;aAC/B,QAAQ,CAAC,CAAC,CAAC,UAAU,EAAE,WAAW,EAAE,qBAAqB,CAAC;aAC1D,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;CACJ;AA9MD,6BA8MC"}
|
|
@@ -12,6 +12,7 @@ export default class PatStore implements IPatStore {
|
|
|
12
12
|
deleteAll(): Promise<void>;
|
|
13
13
|
destroy(): void;
|
|
14
14
|
exists(id: number): Promise<boolean>;
|
|
15
|
+
existsWithDescriptionByUser(description: string, userId: number): Promise<boolean>;
|
|
15
16
|
get(id: number): Promise<Pat>;
|
|
16
17
|
getAll(): Promise<Pat[]>;
|
|
17
18
|
getAllByUser(userId: number): Promise<Pat[]>;
|
package/dist/lib/db/pat-store.js
CHANGED
|
@@ -58,6 +58,11 @@ class PatStore {
|
|
|
58
58
|
const { present } = result.rows[0];
|
|
59
59
|
return present;
|
|
60
60
|
}
|
|
61
|
+
async existsWithDescriptionByUser(description, userId) {
|
|
62
|
+
const result = await this.db.raw(`SELECT EXISTS(SELECT 1 FROM ${TABLE} WHERE description = ? AND user_id = ?) AS present`, [description, userId]);
|
|
63
|
+
const { present } = result.rows[0];
|
|
64
|
+
return present;
|
|
65
|
+
}
|
|
61
66
|
async get(id) {
|
|
62
67
|
const row = await this.db(TABLE).where({ id }).first();
|
|
63
68
|
return fromRow(row);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pat-store.js","sourceRoot":"","sources":["../../../src/lib/db/pat-store.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pat-store.js","sourceRoot":"","sources":["../../../src/lib/db/pat-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -3840,6 +3840,12 @@ export declare const schemas: {
|
|
|
3840
3840
|
readonly description: {
|
|
3841
3841
|
readonly type: "string";
|
|
3842
3842
|
};
|
|
3843
|
+
readonly mappingsSSO: {
|
|
3844
|
+
readonly type: "array";
|
|
3845
|
+
readonly items: {
|
|
3846
|
+
readonly type: "string";
|
|
3847
|
+
};
|
|
3848
|
+
};
|
|
3843
3849
|
readonly createdBy: {
|
|
3844
3850
|
readonly type: "string";
|
|
3845
3851
|
readonly nullable: true;
|
|
@@ -4011,6 +4017,12 @@ export declare const schemas: {
|
|
|
4011
4017
|
readonly description: {
|
|
4012
4018
|
readonly type: "string";
|
|
4013
4019
|
};
|
|
4020
|
+
readonly mappingsSSO: {
|
|
4021
|
+
readonly type: "array";
|
|
4022
|
+
readonly items: {
|
|
4023
|
+
readonly type: "string";
|
|
4024
|
+
};
|
|
4025
|
+
};
|
|
4014
4026
|
readonly createdBy: {
|
|
4015
4027
|
readonly type: "string";
|
|
4016
4028
|
readonly nullable: true;
|
|
@@ -10869,6 +10881,12 @@ export declare const schemas: {
|
|
|
10869
10881
|
readonly description: {
|
|
10870
10882
|
readonly type: "string";
|
|
10871
10883
|
};
|
|
10884
|
+
readonly mappingsSSO: {
|
|
10885
|
+
readonly type: "array";
|
|
10886
|
+
readonly items: {
|
|
10887
|
+
readonly type: "string";
|
|
10888
|
+
};
|
|
10889
|
+
};
|
|
10872
10890
|
readonly createdBy: {
|
|
10873
10891
|
readonly type: "string";
|
|
10874
10892
|
readonly nullable: true;
|
|
@@ -14,6 +14,12 @@ export declare const groupSchema: {
|
|
|
14
14
|
readonly description: {
|
|
15
15
|
readonly type: "string";
|
|
16
16
|
};
|
|
17
|
+
readonly mappingsSSO: {
|
|
18
|
+
readonly type: "array";
|
|
19
|
+
readonly items: {
|
|
20
|
+
readonly type: "string";
|
|
21
|
+
};
|
|
22
|
+
};
|
|
17
23
|
readonly createdBy: {
|
|
18
24
|
readonly type: "string";
|
|
19
25
|
readonly nullable: true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-schema.js","sourceRoot":"","sources":["../../../../src/lib/openapi/spec/group-schema.ts"],"names":[],"mappings":";;;AACA,uEAAiE;AACjE,+CAA2C;AAE9B,QAAA,WAAW,GAAG;IACvB,GAAG,EAAE,kCAAkC;IACvC,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,IAAI;IAC1B,QAAQ,EAAE,CAAC,MAAM,CAAC;IAClB,UAAU,EAAE;QACR,EAAE,EAAE;YACA,IAAI,EAAE,QAAQ;SACjB;QACD,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,QAAQ;SACjB;QACD,SAAS,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;SACjB;QACD,SAAS,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,WAAW;YACnB,QAAQ,EAAE,IAAI;SACjB;QACD,KAAK,EAAE;YACH,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,2CAA2C;aACpD;SACJ;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;aACjB;SACJ;KACJ;IACD,UAAU,EAAE;QACR,OAAO,EAAE;YACL,oBAAoB,EAApB,8CAAoB;YACpB,UAAU,EAAV,wBAAU;SACb;KACJ;CACK,CAAC"}
|
|
1
|
+
{"version":3,"file":"group-schema.js","sourceRoot":"","sources":["../../../../src/lib/openapi/spec/group-schema.ts"],"names":[],"mappings":";;;AACA,uEAAiE;AACjE,+CAA2C;AAE9B,QAAA,WAAW,GAAG;IACvB,GAAG,EAAE,kCAAkC;IACvC,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,IAAI;IAC1B,QAAQ,EAAE,CAAC,MAAM,CAAC;IAClB,UAAU,EAAE;QACR,EAAE,EAAE;YACA,IAAI,EAAE,QAAQ;SACjB;QACD,IAAI,EAAE;YACF,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACT,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;aACjB;SACJ;QACD,SAAS,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;SACjB;QACD,SAAS,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,WAAW;YACnB,QAAQ,EAAE,IAAI;SACjB;QACD,KAAK,EAAE;YACH,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,2CAA2C;aACpD;SACJ;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;aACjB;SACJ;KACJ;IACD,UAAU,EAAE;QACR,OAAO,EAAE;YACL,oBAAoB,EAApB,8CAAoB;YACpB,UAAU,EAAV,wBAAU;SACb;KACJ;CACK,CAAC"}
|
|
@@ -28,6 +28,12 @@ export declare const groupsSchema: {
|
|
|
28
28
|
readonly description: {
|
|
29
29
|
readonly type: "string";
|
|
30
30
|
};
|
|
31
|
+
readonly mappingsSSO: {
|
|
32
|
+
readonly type: "array";
|
|
33
|
+
readonly items: {
|
|
34
|
+
readonly type: "string";
|
|
35
|
+
};
|
|
36
|
+
};
|
|
31
37
|
readonly createdBy: {
|
|
32
38
|
readonly type: "string";
|
|
33
39
|
readonly nullable: true;
|
|
@@ -34,6 +34,12 @@ export declare const usersGroupsBaseSchema: {
|
|
|
34
34
|
readonly description: {
|
|
35
35
|
readonly type: "string";
|
|
36
36
|
};
|
|
37
|
+
readonly mappingsSSO: {
|
|
38
|
+
readonly type: "array";
|
|
39
|
+
readonly items: {
|
|
40
|
+
readonly type: "string";
|
|
41
|
+
};
|
|
42
|
+
};
|
|
37
43
|
readonly createdBy: {
|
|
38
44
|
readonly type: "string";
|
|
39
45
|
readonly nullable: true;
|
|
@@ -17,6 +17,7 @@ async function getSetup(opts) {
|
|
|
17
17
|
return {
|
|
18
18
|
request: (0, supertest_1.default)(app),
|
|
19
19
|
stores,
|
|
20
|
+
services,
|
|
20
21
|
destroy: () => {
|
|
21
22
|
services.versionService.destroy();
|
|
22
23
|
services.clientInstanceService.destroy();
|
|
@@ -26,12 +27,14 @@ async function getSetup(opts) {
|
|
|
26
27
|
}
|
|
27
28
|
let request;
|
|
28
29
|
let stores;
|
|
30
|
+
let services;
|
|
29
31
|
let destroy;
|
|
30
32
|
beforeEach(async () => {
|
|
31
33
|
const setup = await getSetup();
|
|
32
34
|
request = setup.request;
|
|
33
35
|
stores = setup.stores;
|
|
34
36
|
destroy = setup.destroy;
|
|
37
|
+
services = setup.services;
|
|
35
38
|
});
|
|
36
39
|
afterEach(() => {
|
|
37
40
|
destroy();
|
|
@@ -189,6 +192,7 @@ test('should set lastSeen on toggle', async () => {
|
|
|
189
192
|
},
|
|
190
193
|
})
|
|
191
194
|
.expect(202);
|
|
195
|
+
await services.lastSeenService.store();
|
|
192
196
|
const toggle = await stores.featureToggleStore.get('toggleLastSeen');
|
|
193
197
|
expect(toggle.lastSeenAt).toBeTruthy();
|
|
194
198
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,yEAAwD;AACxD,oDAA+B;AAC/B,kEAAoE;AACpE,iEAA2E;AAC3E,6CAAgD;AAGhD,KAAK,UAAU,QAAQ,CAAC,IAAsB;IAC1C,MAAM,MAAM,GAAG,IAAA,eAAY,GAAE,CAAC;IAE9B,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC,IAAI,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,MAAM,IAAA,aAAM,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEnD,OAAO;QACH,OAAO,EAAE,IAAA,mBAAS,EAAC,GAAG,CAAC;QACvB,MAAM;QACN,OAAO,EAAE,GAAG,EAAE;YACV,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;YAClC,QAAQ,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;YACzC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QACvC,CAAC;KACJ,CAAC;AACN,CAAC;AAED,IAAI,OAAO,CAAC;AACZ,IAAI,MAAsB,CAAC;AAC3B,IAAI,OAAO,CAAC;AAEZ,UAAU,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,KAAK,GAAG,MAAM,QAAQ,EAAE,CAAC;IAC/B,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IACxB,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IACtB,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { IUnleashConfig } from '../../server-impl';
|
|
2
|
+
import { IUnleashStores } from '../../types';
|
|
3
|
+
import { IClientMetricsEnv } from '../../types/stores/client-metrics-store-v2';
|
|
4
|
+
export declare class LastSeenService {
|
|
5
|
+
private timers;
|
|
6
|
+
private lastSeenToggles;
|
|
7
|
+
private logger;
|
|
8
|
+
private featureToggleStore;
|
|
9
|
+
constructor({ featureToggleStore }: Pick<IUnleashStores, 'featureToggleStore'>, config: IUnleashConfig, lastSeenInterval?: number);
|
|
10
|
+
store(): Promise<number>;
|
|
11
|
+
updateLastSeen(clientMetrics: IClientMetricsEnv[]): void;
|
|
12
|
+
destroy(): void;
|
|
13
|
+
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LastSeenService = void 0;
|
|
4
|
+
const date_fns_1 = require("date-fns");
|
|
5
|
+
class LastSeenService {
|
|
6
|
+
constructor({ featureToggleStore }, config, lastSeenInterval = (0, date_fns_1.secondsToMilliseconds)(30)) {
|
|
7
|
+
this.timers = [];
|
|
8
|
+
this.lastSeenToggles = new Set();
|
|
9
|
+
this.featureToggleStore = featureToggleStore;
|
|
10
|
+
this.logger = config.getLogger('/services/client-metrics/last-seen-service.ts');
|
|
11
|
+
this.timers.push(setInterval(() => this.store(), lastSeenInterval).unref());
|
|
12
|
+
}
|
|
13
|
+
async store() {
|
|
14
|
+
const count = this.lastSeenToggles.size;
|
|
15
|
+
if (count > 0) {
|
|
16
|
+
const lastSeenToggles = [...this.lastSeenToggles];
|
|
17
|
+
this.lastSeenToggles = new Set();
|
|
18
|
+
this.logger.debug(`Updating last seen for ${lastSeenToggles.length} toggles`);
|
|
19
|
+
await this.featureToggleStore.setLastSeen(lastSeenToggles);
|
|
20
|
+
}
|
|
21
|
+
return count;
|
|
22
|
+
}
|
|
23
|
+
updateLastSeen(clientMetrics) {
|
|
24
|
+
clientMetrics
|
|
25
|
+
.filter((clientMetric) => clientMetric.yes > 0 || clientMetric.no > 0)
|
|
26
|
+
.forEach((clientMetric) => this.lastSeenToggles.add(clientMetric.featureName));
|
|
27
|
+
}
|
|
28
|
+
destroy() {
|
|
29
|
+
this.timers.forEach(clearInterval);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
exports.LastSeenService = LastSeenService;
|
|
33
|
+
//# sourceMappingURL=last-seen-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"last-seen-service.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/last-seen-service.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AAOjD,MAAa,eAAe;IASxB,YACI,EAAE,kBAAkB,EAA8C,EAClE,MAAsB,EACtB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,EAAE,CAAC;QAXxC,WAAM,GAAqB,EAAE,CAAC;QAE9B,oBAAe,GAAgB,IAAI,GAAG,EAAE,CAAC;QAW7C,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAC1B,+CAA+C,CAClD,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,gBAAgB,CAAC,CAAC,KAAK,EAAE,CAC5D,CAAC;IACN,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;QACxC,IAAI,KAAK,GAAG,CAAC,EAAE;YACX,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;YAClD,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,0BAA0B,eAAe,CAAC,MAAM,UAAU,CAC7D,CAAC;YACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;SAC9D;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,cAAc,CAAC,aAAkC;QAC7C,aAAa;aACR,MAAM,CACH,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,IAAI,YAAY,CAAC,EAAE,GAAG,CAAC,CAChE;aACA,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,CACtB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CACrD,CAAC;IACV,CAAC;IAED,OAAO;QACH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC;CACJ;AAlDD,0CAkDC"}
|
|
@@ -5,14 +5,16 @@ import { ToggleMetricsSummary } from '../../types/models/metrics';
|
|
|
5
5
|
import { IClientMetricsEnv } from '../../types/stores/client-metrics-store-v2';
|
|
6
6
|
import ApiUser from '../../types/api-user';
|
|
7
7
|
import User from '../../types/user';
|
|
8
|
+
import { LastSeenService } from './last-seen-service';
|
|
8
9
|
export default class ClientMetricsServiceV2 {
|
|
9
10
|
private config;
|
|
10
11
|
private timers;
|
|
11
12
|
private unsavedMetrics;
|
|
12
13
|
private clientMetricsStoreV2;
|
|
13
14
|
private featureToggleStore;
|
|
15
|
+
private lastSeenService;
|
|
14
16
|
private logger;
|
|
15
|
-
constructor({ featureToggleStore, clientMetricsStoreV2, }: Pick<IUnleashStores, 'featureToggleStore' | 'clientMetricsStoreV2'>, config: IUnleashConfig, bulkInterval?: number);
|
|
17
|
+
constructor({ featureToggleStore, clientMetricsStoreV2, }: Pick<IUnleashStores, 'featureToggleStore' | 'clientMetricsStoreV2'>, config: IUnleashConfig, lastSeenService: LastSeenService, bulkInterval?: number);
|
|
16
18
|
registerClientMetrics(data: IClientApp, clientIp: string): Promise<void>;
|
|
17
19
|
bulkAdd(): Promise<void>;
|
|
18
20
|
getFeatureToggleMetricsSummary(featureName: string): Promise<ToggleMetricsSummary>;
|
|
@@ -10,11 +10,12 @@ const api_user_1 = __importDefault(require("../../types/api-user"));
|
|
|
10
10
|
const api_token_1 = require("../../types/models/api-token");
|
|
11
11
|
const collapseHourlyMetrics_1 = require("../../util/collapseHourlyMetrics");
|
|
12
12
|
class ClientMetricsServiceV2 {
|
|
13
|
-
constructor({ featureToggleStore, clientMetricsStoreV2, }, config, bulkInterval = (0, date_fns_1.secondsToMilliseconds)(5)) {
|
|
13
|
+
constructor({ featureToggleStore, clientMetricsStoreV2, }, config, lastSeenService, bulkInterval = (0, date_fns_1.secondsToMilliseconds)(5)) {
|
|
14
14
|
this.timers = [];
|
|
15
15
|
this.unsavedMetrics = [];
|
|
16
16
|
this.featureToggleStore = featureToggleStore;
|
|
17
17
|
this.clientMetricsStoreV2 = clientMetricsStoreV2;
|
|
18
|
+
this.lastSeenService = lastSeenService;
|
|
18
19
|
this.config = config;
|
|
19
20
|
this.logger = config.getLogger('/services/client-metrics/client-metrics-service-v2.ts');
|
|
20
21
|
this.timers.push(setInterval(() => {
|
|
@@ -26,28 +27,28 @@ class ClientMetricsServiceV2 {
|
|
|
26
27
|
}
|
|
27
28
|
async registerClientMetrics(data, clientIp) {
|
|
28
29
|
const value = await schema_1.clientMetricsSchema.validateAsync(data);
|
|
29
|
-
const toggleNames = Object.keys(value.bucket.toggles)
|
|
30
|
-
|
|
31
|
-
await this.featureToggleStore.setLastSeen(toggleNames);
|
|
32
|
-
}
|
|
30
|
+
const toggleNames = Object.keys(value.bucket.toggles).filter((name) => !(value.bucket.toggles[name].yes === 0 &&
|
|
31
|
+
value.bucket.toggles[name].no === 0));
|
|
33
32
|
this.logger.debug(`got metrics from ${clientIp}`);
|
|
34
|
-
const clientMetrics = toggleNames
|
|
35
|
-
.map((name) => ({
|
|
33
|
+
const clientMetrics = toggleNames.map((name) => ({
|
|
36
34
|
featureName: name,
|
|
37
35
|
appName: value.appName,
|
|
38
36
|
environment: value.environment,
|
|
39
37
|
timestamp: value.bucket.start,
|
|
40
38
|
yes: value.bucket.toggles[name].yes,
|
|
41
39
|
no: value.bucket.toggles[name].no,
|
|
42
|
-
}))
|
|
43
|
-
.filter((item) => !(item.yes === 0 && item.no === 0));
|
|
40
|
+
}));
|
|
44
41
|
if (this.config.flagResolver.isEnabled('batchMetrics')) {
|
|
45
42
|
this.unsavedMetrics = (0, collapseHourlyMetrics_1.collapseHourlyMetrics)([
|
|
46
43
|
...this.unsavedMetrics,
|
|
47
44
|
...clientMetrics,
|
|
48
45
|
]);
|
|
46
|
+
this.lastSeenService.updateLastSeen(clientMetrics);
|
|
49
47
|
}
|
|
50
48
|
else {
|
|
49
|
+
if (toggleNames.length > 0) {
|
|
50
|
+
await this.featureToggleStore.setLastSeen(toggleNames);
|
|
51
|
+
}
|
|
51
52
|
await this.clientMetricsStoreV2.batchInsertMetrics(clientMetrics);
|
|
52
53
|
}
|
|
53
54
|
this.config.eventBus.emit(events_1.CLIENT_METRICS, value);
|
|
@@ -102,6 +103,7 @@ class ClientMetricsServiceV2 {
|
|
|
102
103
|
}
|
|
103
104
|
destroy() {
|
|
104
105
|
this.timers.forEach(clearInterval);
|
|
106
|
+
this.lastSeenService.destroy();
|
|
105
107
|
}
|
|
106
108
|
}
|
|
107
109
|
exports.default = ClientMetricsServiceV2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics-service-v2.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/metrics-service-v2.ts"],"names":[],"mappings":";;;;;AASA,qCAA+C;AAC/C,uCAAsE;AAEtE,+CAAoD;AACpD,oEAA2C;AAC3C,4DAAmD;AAEnD,4EAAyE;
|
|
1
|
+
{"version":3,"file":"metrics-service-v2.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/metrics-service-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,4 +16,6 @@ export declare class GroupService {
|
|
|
16
16
|
validateGroup({ name }: IGroupModel, existingGroup?: IGroup): Promise<void>;
|
|
17
17
|
getRolesForProject(projectId: string): Promise<IGroupRole[]>;
|
|
18
18
|
private mapGroupWithUsers;
|
|
19
|
+
syncExternalGroups(userId: number, externalGroups: string[]): Promise<void>;
|
|
20
|
+
getGroupsForUser(userId: number): Promise<IGroup[]>;
|
|
19
21
|
}
|
|
@@ -41,7 +41,7 @@ class GroupService {
|
|
|
41
41
|
async createGroup(group, userName) {
|
|
42
42
|
await this.validateGroup(group);
|
|
43
43
|
const newGroup = await this.groupStore.create(group);
|
|
44
|
-
await this.groupStore.
|
|
44
|
+
await this.groupStore.addUsersToGroup(newGroup.id, group.users, userName);
|
|
45
45
|
await this.eventStore.store({
|
|
46
46
|
type: events_1.GROUP_CREATED,
|
|
47
47
|
createdBy: userName,
|
|
@@ -115,6 +115,15 @@ class GroupService {
|
|
|
115
115
|
});
|
|
116
116
|
return { ...group, users: finalUsers };
|
|
117
117
|
}
|
|
118
|
+
async syncExternalGroups(userId, externalGroups) {
|
|
119
|
+
let newGroups = await this.groupStore.getNewGroupsForExternalUser(userId, externalGroups);
|
|
120
|
+
await this.groupStore.addUserToGroups(userId, newGroups.map((g) => g.id));
|
|
121
|
+
let oldGroups = await this.groupStore.getOldGroupsForExternalUser(userId, externalGroups);
|
|
122
|
+
await this.groupStore.deleteUsersFromGroup(oldGroups);
|
|
123
|
+
}
|
|
124
|
+
async getGroupsForUser(userId) {
|
|
125
|
+
return this.groupStore.getGroupsForUser(userId);
|
|
126
|
+
}
|
|
118
127
|
}
|
|
119
128
|
exports.GroupService = GroupService;
|
|
120
129
|
//# sourceMappingURL=group-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-service.js","sourceRoot":"","sources":["../../../src/lib/services/group-service.ts"],"names":[],"mappings":";;;;;;AAWA,6EAAmD;AACnD,4CAA+D;AAE/D,mFAAyD;AAIzD,MAAa,YAAY;IASrB,YACI,MAAuE,EACvE,EAAE,SAAS,EAAqC;QAEhD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,0BAA0B,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QAC9C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAC3D,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC1B,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAC3C,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CACrC,CAAC;QACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CACxD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC1B,CAAC;QAEF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACxB,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CACtC,KAAK,EACL,aAAa,EACb,KAAK,CACR,CAAC;YACF,OAAO,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;IACP,CAAC;IAED,oBAAoB,CAChB,aAA8B,EAC9B,KAAkB;QAElB,OAAO;YACH,GAAG,KAAK;YACR,QAAQ,EAAE,aAAa;iBAClB,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC,EAAE,CAAC;iBACjD,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;SACzC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAU;QACrB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAC3C,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAClC,CAAC;QACF,OAAO,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAkB,EAAE,QAAgB;QAClD,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEhC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAErD,MAAM,IAAI,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"group-service.js","sourceRoot":"","sources":["../../../src/lib/services/group-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,12 +39,14 @@ const proxy_service_1 = require("./proxy-service");
|
|
|
39
39
|
const edge_service_1 = __importDefault(require("./edge-service"));
|
|
40
40
|
const pat_service_1 = __importDefault(require("./pat-service"));
|
|
41
41
|
const public_signup_token_service_1 = require("./public-signup-token-service");
|
|
42
|
+
const last_seen_service_1 = require("./client-metrics/last-seen-service");
|
|
42
43
|
const createServices = (stores, config) => {
|
|
43
44
|
const groupService = new group_service_1.GroupService(stores, config);
|
|
44
45
|
const accessService = new access_service_1.AccessService(stores, config, groupService);
|
|
45
46
|
const apiTokenService = new api_token_service_1.ApiTokenService(stores, config);
|
|
46
47
|
const clientInstanceService = new instance_service_1.default(stores, config);
|
|
47
|
-
const
|
|
48
|
+
const lastSeenService = new last_seen_service_1.LastSeenService(stores, config);
|
|
49
|
+
const clientMetricsServiceV2 = new metrics_service_v2_1.default(stores, config, lastSeenService);
|
|
48
50
|
const contextService = new context_service_1.default(stores, config);
|
|
49
51
|
const emailService = new email_service_1.EmailService(config.email, config.getLogger);
|
|
50
52
|
const eventService = new event_service_1.default(stores, config);
|
|
@@ -125,6 +127,7 @@ const createServices = (stores, config) => {
|
|
|
125
127
|
edgeService,
|
|
126
128
|
patService,
|
|
127
129
|
publicSignupTokenService,
|
|
130
|
+
lastSeenService,
|
|
128
131
|
};
|
|
129
132
|
};
|
|
130
133
|
exports.createServices = createServices;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":";;;;;;AACA,kFAAwD;AACxD,oEAA2C;AAC3C,sEAA6C;AAE7C,wEAA+C;AAC/C,oEAA2C;AAC3C,yFAAsE;AACtE,6FAAyE;AACzE,0EAAgD;AAChD,gEAAuC;AACvC,0EAAiD;AACjD,oEAA2C;AAC3C,wEAA+C;AAC/C,wEAA+C;AAC/C,mDAA+C;AAC/C,qDAAiD;AACjD,2DAAsD;AACtD,kEAAyC;AACzC,gFAAsD;AACtD,wEAA+C;AAC/C,wEAA+C;AAC/C,oFAA0D;AAC1D,sFAA4D;AAC5D,gFAAuD;AACvD,gFAAsD;AACtD,sFAA4D;AAC5D,gFAAsD;AACtD,uDAAmD;AACnD,uDAAmD;AACnD,+DAA0D;AAC1D,6DAAyD;AACzD,mDAA+C;AAC/C,mDAA+C;AAC/C,kEAAyC;AACzC,gEAAuC;AACvC,+EAAyE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":";;;;;;AACA,kFAAwD;AACxD,oEAA2C;AAC3C,sEAA6C;AAE7C,wEAA+C;AAC/C,oEAA2C;AAC3C,yFAAsE;AACtE,6FAAyE;AACzE,0EAAgD;AAChD,gEAAuC;AACvC,0EAAiD;AACjD,oEAA2C;AAC3C,wEAA+C;AAC/C,wEAA+C;AAC/C,mDAA+C;AAC/C,qDAAiD;AACjD,2DAAsD;AACtD,kEAAyC;AACzC,gFAAsD;AACtD,wEAA+C;AAC/C,wEAA+C;AAC/C,oFAA0D;AAC1D,sFAA4D;AAC5D,gFAAuD;AACvD,gFAAsD;AACtD,sFAA4D;AAC5D,gFAAsD;AACtD,uDAAmD;AACnD,uDAAmD;AACnD,+DAA0D;AAC1D,6DAAyD;AACzD,mDAA+C;AAC/C,mDAA+C;AAC/C,kEAAyC;AACzC,gEAAuC;AACvC,+EAAyE;AACzE,0EAAqE;AAC9D,MAAM,cAAc,GAAG,CAC1B,MAAsB,EACtB,MAAsB,EACN,EAAE;IAClB,MAAM,YAAY,GAAG,IAAI,4BAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,IAAI,8BAAa,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IACtE,MAAM,eAAe,GAAG,IAAI,mCAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5D,MAAM,qBAAqB,GAAG,IAAI,0BAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxE,MAAM,eAAe,GAAG,IAAI,mCAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5D,MAAM,sBAAsB,GAAG,IAAI,4BAAsB,CACrD,MAAM,EACN,MAAM,EACN,eAAe,CAClB,CAAC;IACF,MAAM,cAAc,GAAG,IAAI,yBAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,IAAI,4BAAY,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IACtE,MAAM,YAAY,GAAG,IAAI,uBAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtD,MAAM,kBAAkB,GAAG,IAAI,8BAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClE,MAAM,iBAAiB,GAAG,IAAI,6BAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,IAAI,uBAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtD,MAAM,eAAe,GAAG,IAAI,0BAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAI,qBAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,MAAM,cAAc,GAAG,IAAI,0BAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,IAAI,uBAAY,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;IACtE,MAAM,cAAc,GAAG,IAAI,yBAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,cAAc,GAAG,IAAI,yBAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,MAAM,EAAE,MAAM,EAAE;QAChD,aAAa;QACb,iBAAiB;QACjB,YAAY;QACZ,cAAc;QACd,cAAc;KACjB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,IAAI,yBAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,aAAa,GAAG,IAAI,wBAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxD,MAAM,mBAAmB,GAAG,IAAI,+BAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,cAAc,GAAG,IAAI,gCAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,sBAAsB,GAAG,IAAI,gCAAoB,CACnD,MAAM,EACN,MAAM,EACN,cAAc,EACd,aAAa,CAChB,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAI,6BAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClE,MAAM,iBAAiB,GAAG,IAAI,6BAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,oBAAoB,GAAG,IAAI,gCAAoB,CACjD,MAAM,EACN,MAAM,EACN,sBAAsB,CACzB,CAAC;IACF,MAAM,cAAc,GAAG,IAAI,yBAAc,CACrC,MAAM,EACN,MAAM,EACN,aAAa,EACb,sBAAsB,EACtB,YAAY,CACf,CAAC;IACF,MAAM,iBAAiB,GAAG,IAAI,6BAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,IAAI,gCAAc,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,iBAAiB,GAAG,IAAI,uCAAiB,CAAC,MAAM,CAAC,CAAC;IACxD,MAAM,iBAAiB,GAAG,IAAI,sCAAiB,CAAC,MAAM,EAAE;QACpD,sBAAsB;QACtB,cAAc;KACjB,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,IAAI,4BAAY,CAAC,MAAM,EAAE,MAAM,EAAE;QAClD,sBAAsB;QACtB,sBAAsB;QACtB,cAAc;KACjB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,sBAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEpD,MAAM,UAAU,GAAG,IAAI,qBAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAElD,MAAM,wBAAwB,GAAG,IAAI,sDAAwB,CACzD,MAAM,EACN,MAAM,EACN,WAAW,CACd,CAAC;IAEF,OAAO;QACH,aAAa;QACb,YAAY;QACZ,oBAAoB,EAAE,sBAAsB;QAC5C,sBAAsB;QACtB,kBAAkB;QAClB,aAAa;QACb,cAAc;QACd,YAAY;QACZ,eAAe;QACf,cAAc;QACd,UAAU;QACV,qBAAqB;QACrB,sBAAsB;QACtB,cAAc;QACd,cAAc;QACd,eAAe;QACf,YAAY;QACZ,WAAW;QACX,iBAAiB;QACjB,YAAY;QACZ,kBAAkB;QAClB,cAAc;QACd,cAAc;QACd,mBAAmB;QACnB,iBAAiB;QACjB,oBAAoB;QACpB,iBAAiB;QACjB,cAAc;QACd,cAAc;QACd,iBAAiB;QACjB,iBAAiB;QACjB,YAAY;QACZ,YAAY;QACZ,WAAW;QACX,UAAU;QACV,wBAAwB;QACxB,eAAe;KAClB,CAAC;AACN,CAAC,CAAC;AAvHW,QAAA,cAAc,kBAuHzB;AAEF,MAAM,CAAC,OAAO,GAAG;IACb,cAAc,EAAd,sBAAc;CACjB,CAAC"}
|