unleash-server 4.17.0-beta.1 → 4.17.0-beta.3
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.js +4 -2
- package/dist/lib/db/group-store.js.map +1 -1
- package/dist/lib/db/index.js +2 -0
- package/dist/lib/db/index.js.map +1 -1
- package/dist/lib/db/project-store.d.ts +2 -2
- package/dist/lib/db/project-store.js +8 -1
- package/dist/lib/db/project-store.js.map +1 -1
- package/dist/lib/db/suggest-change-store.d.ts +27 -0
- package/dist/lib/db/suggest-change-store.js +130 -0
- package/dist/lib/db/suggest-change-store.js.map +1 -0
- package/dist/lib/openapi/index.d.ts +24 -0
- package/dist/lib/openapi/spec/group-schema.d.ts +4 -0
- package/dist/lib/openapi/spec/group-user-model-schema.d.ts +4 -0
- package/dist/lib/openapi/spec/group-user-model-schema.js +4 -0
- package/dist/lib/openapi/spec/group-user-model-schema.js.map +1 -1
- package/dist/lib/openapi/spec/groups-schema.d.ts +8 -0
- package/dist/lib/openapi/spec/users-groups-base-schema.d.ts +8 -0
- package/dist/lib/proxy/create-context.d.ts +1 -0
- package/dist/lib/proxy/create-context.js +7 -1
- package/dist/lib/proxy/create-context.js.map +1 -1
- package/dist/lib/proxy/create-context.test.js +31 -1
- package/dist/lib/proxy/create-context.test.js.map +1 -1
- package/dist/lib/routes/proxy-api/index.js +1 -3
- package/dist/lib/routes/proxy-api/index.js.map +1 -1
- package/dist/lib/services/feature-toggle-service.js.map +1 -1
- package/dist/lib/services/group-service.d.ts +1 -1
- package/dist/lib/services/group-service.js +8 -5
- package/dist/lib/services/group-service.js.map +1 -1
- package/dist/lib/services/state-service.d.ts +3 -2
- package/dist/lib/services/state-service.js +19 -13
- package/dist/lib/services/state-service.js.map +1 -1
- package/dist/lib/types/events.d.ts +1 -0
- package/dist/lib/types/events.js +2 -1
- package/dist/lib/types/events.js.map +1 -1
- package/dist/lib/types/experimental.d.ts +4 -0
- package/dist/lib/types/experimental.js +2 -0
- package/dist/lib/types/experimental.js.map +1 -1
- package/dist/lib/types/group.d.ts +2 -0
- package/dist/lib/types/group.js.map +1 -1
- package/dist/lib/types/model.d.ts +46 -1
- package/dist/lib/types/model.js +24 -1
- package/dist/lib/types/model.js.map +1 -1
- package/dist/lib/types/permissions.d.ts +1 -0
- package/dist/lib/types/permissions.js +2 -1
- package/dist/lib/types/permissions.js.map +1 -1
- package/dist/lib/types/stores/project-store.d.ts +2 -2
- package/dist/lib/types/stores/suggest-change-store.d.ts +13 -0
- package/dist/lib/types/stores/suggest-change-store.js +3 -0
- package/dist/lib/types/stores/suggest-change-store.js.map +1 -0
- package/dist/lib/types/stores.d.ts +2 -0
- package/dist/migrations/20221810114644-add-suggest-changes-table.d.ts +2 -0
- package/dist/migrations/20221810114644-add-suggest-changes-table.js +30 -0
- package/dist/migrations/20221810114644-add-suggest-changes-table.js.map +1 -0
- package/dist/server-dev.js +2 -0
- package/dist/server-dev.js.map +1 -1
- package/dist/test/config/test-config.js +2 -0
- package/dist/test/config/test-config.js.map +1 -1
- package/dist/test/e2e/api/admin/state.e2e.test.js +19 -4
- package/dist/test/e2e/api/admin/state.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/proxy/proxy.e2e.test.js +38 -0
- package/dist/test/e2e/api/proxy/proxy.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/group-service.e2e.test.js +24 -0
- package/dist/test/e2e/services/group-service.e2e.test.js.map +1 -1
- package/dist/test/fixtures/fake-feature-environment-store.js +1 -1
- package/dist/test/fixtures/fake-feature-environment-store.js.map +1 -1
- package/dist/test/fixtures/fake-project-store.d.ts +2 -2
- package/dist/test/fixtures/fake-project-store.js +5 -1
- package/dist/test/fixtures/fake-project-store.js.map +1 -1
- package/dist/test/fixtures/fake-suggest-change-store.d.ts +19 -0
- package/dist/test/fixtures/fake-suggest-change-store.js +56 -0
- package/dist/test/fixtures/fake-suggest-change-store.js.map +1 -0
- package/dist/test/fixtures/store.js +2 -0
- package/dist/test/fixtures/store.js.map +1 -1
- package/frontend/README.md +4 -4
- package/frontend/build/index.html +1 -1
- package/frontend/build/static/{FeatureMetricsChart.27fc2adc.js → FeatureMetricsChart.ae440f9a.js} +1 -1
- package/frontend/build/static/{Playground.c294d43c.js → Playground.76ff38fa.js} +10 -10
- package/frontend/build/static/index.24e359b4.js +431 -0
- package/frontend/package.json +10 -9
- package/package.json +11 -10
- package/docs/api/oas/openapi.yaml +0 -1671
- package/frontend/build/static/index.5f0c4988.js +0 -422
|
@@ -42,6 +42,7 @@ const rowToGroupUser = (row) => {
|
|
|
42
42
|
userId: row.user_id,
|
|
43
43
|
groupId: row.group_id,
|
|
44
44
|
joinedAt: row.created_at,
|
|
45
|
+
createdBy: row.created_by,
|
|
45
46
|
};
|
|
46
47
|
};
|
|
47
48
|
const groupToRow = (group) => ({
|
|
@@ -97,7 +98,7 @@ class GroupStore {
|
|
|
97
98
|
}
|
|
98
99
|
async getAllUsersByGroups(groupIds) {
|
|
99
100
|
const rows = await this.db
|
|
100
|
-
.select('gu.group_id', 'u.id as user_id', 'gu.created_at')
|
|
101
|
+
.select('gu.group_id', 'u.id as user_id', 'gu.created_at', 'gu.created_by')
|
|
101
102
|
.from(`${T.GROUP_USER} AS gu`)
|
|
102
103
|
.join(`${T.USERS} AS u`, 'u.id', 'gu.user_id')
|
|
103
104
|
.whereIn('gu.group_id', groupIds);
|
|
@@ -181,7 +182,8 @@ class GroupStore {
|
|
|
181
182
|
.select('id')
|
|
182
183
|
.whereRaw('mappings_sso \\?| :groups', {
|
|
183
184
|
groups: externalGroups,
|
|
184
|
-
})
|
|
185
|
+
})
|
|
186
|
+
.orWhereRaw('jsonb_array_length(mappings_sso) = 0'))
|
|
185
187
|
.where('gu.user_id', userId);
|
|
186
188
|
return rows.map(rowToGroupUser);
|
|
187
189
|
}
|
|
@@ -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;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;
|
|
1
|
+
{"version":3,"file":"group-store.js","sourceRoot":"","sources":["../../../src/lib/db/group-store.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/db/index.js
CHANGED
|
@@ -34,6 +34,7 @@ const segment_store_1 = __importDefault(require("./segment-store"));
|
|
|
34
34
|
const group_store_1 = __importDefault(require("./group-store"));
|
|
35
35
|
const pat_store_1 = __importDefault(require("./pat-store"));
|
|
36
36
|
const public_signup_token_store_1 = require("./public-signup-token-store");
|
|
37
|
+
const suggest_change_store_1 = require("./suggest-change-store");
|
|
37
38
|
const createStores = (config, db) => {
|
|
38
39
|
const { getLogger, eventBus } = config;
|
|
39
40
|
const eventStore = new event_store_1.default(db, getLogger);
|
|
@@ -68,6 +69,7 @@ const createStores = (config, db) => {
|
|
|
68
69
|
groupStore: new group_store_1.default(db),
|
|
69
70
|
publicSignupTokenStore: new public_signup_token_store_1.PublicSignupTokenStore(db, eventBus, getLogger),
|
|
70
71
|
patStore: new pat_store_1.default(db, getLogger),
|
|
72
|
+
suggestChangeStore: new suggest_change_store_1.SuggestChangeStore(db, eventBus, getLogger),
|
|
71
73
|
};
|
|
72
74
|
};
|
|
73
75
|
exports.createStores = createStores;
|
package/dist/lib/db/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/db/index.ts"],"names":[],"mappings":";;;;;;AAIA,gEAAuC;AACvC,kFAAwD;AACxD,8EAAoD;AACpD,sEAA6C;AAC7C,oFAA0D;AAC1D,4FAAkE;AAClE,gFAAsD;AACtD,oEAA2C;AAC3C,8DAAqC;AACrC,oEAA2C;AAC3C,4DAAmC;AACnC,sEAA4C;AAC5C,gEAAuC;AACvC,uDAAkD;AAClD,oEAA2C;AAC3C,iDAA6C;AAC7C,2DAAsD;AACtD,gFAAsD;AACtD,sFAA4D;AAC5D,gGAAqE;AACrE,4EAAmD;AACnD,4EAAkD;AAClD,2EAAsE;AACtE,uEAAiE;AACjE,4EAAkD;AAClD,8DAAqC;AACrC,oEAA2C;AAC3C,gEAAuC;AACvC,4DAAmC;AACnC,2EAAqE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/db/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Knex } from 'knex';
|
|
3
3
|
import { LogProvider } from '../logger';
|
|
4
|
-
import { IProject, IProjectWithCount } from '../types/model';
|
|
4
|
+
import { IEnvironment, IProject, IProjectWithCount } from '../types/model';
|
|
5
5
|
import { IProjectHealthUpdate, IProjectInsert, IProjectQuery, IProjectStore } from '../types/stores/project-store';
|
|
6
6
|
import EventEmitter from 'events';
|
|
7
7
|
export interface IEnvironmentProjectLink {
|
|
@@ -28,7 +28,7 @@ declare class ProjectStore implements IProjectStore {
|
|
|
28
28
|
updateHealth(healthUpdate: IProjectHealthUpdate): Promise<void>;
|
|
29
29
|
create(project: IProjectInsert): Promise<IProject>;
|
|
30
30
|
update(data: any): Promise<void>;
|
|
31
|
-
importProjects(projects: IProjectInsert[]): Promise<IProject[]>;
|
|
31
|
+
importProjects(projects: IProjectInsert[], environments?: IEnvironment[]): Promise<IProject[]>;
|
|
32
32
|
addDefaultEnvironment(projects: any[]): Promise<void>;
|
|
33
33
|
deleteAll(): Promise<void>;
|
|
34
34
|
delete(id: string): Promise<void>;
|
|
@@ -114,7 +114,7 @@ class ProjectStore {
|
|
|
114
114
|
this.logger.error('Could not update project, error: ', err);
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
|
-
async importProjects(projects) {
|
|
117
|
+
async importProjects(projects, environments) {
|
|
118
118
|
const rows = await this.db(TABLE)
|
|
119
119
|
.insert(projects.map(this.fieldToRow))
|
|
120
120
|
.returning(COLUMNS)
|
|
@@ -122,6 +122,13 @@ class ProjectStore {
|
|
|
122
122
|
.ignore();
|
|
123
123
|
if (rows.length > 0) {
|
|
124
124
|
await this.addDefaultEnvironment(rows);
|
|
125
|
+
environments
|
|
126
|
+
?.filter((env) => env.name !== constants_1.DEFAULT_ENV)
|
|
127
|
+
.forEach((env) => {
|
|
128
|
+
projects.forEach((project) => {
|
|
129
|
+
this.addEnvironmentToProject(project.id, env.name);
|
|
130
|
+
});
|
|
131
|
+
});
|
|
125
132
|
return rows.map(this.mapRow);
|
|
126
133
|
}
|
|
127
134
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-store.js","sourceRoot":"","sources":["../../../src/lib/db/project-store.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"project-store.js","sourceRoot":"","sources":["../../../src/lib/db/project-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { ISuggestChangeStore } from '../types/stores/suggest-change-store';
|
|
3
|
+
import { LogProvider } from '../logger';
|
|
4
|
+
import EventEmitter from 'events';
|
|
5
|
+
import { Knex } from 'knex';
|
|
6
|
+
import { PartialSome } from '../types/partial';
|
|
7
|
+
import { ISuggestChange, ISuggestChangeset } from '../types/model';
|
|
8
|
+
import User from '../types/user';
|
|
9
|
+
export declare class SuggestChangeStore implements ISuggestChangeStore {
|
|
10
|
+
private logger;
|
|
11
|
+
private eventBus;
|
|
12
|
+
private db;
|
|
13
|
+
constructor(db: Knex, eventBus: EventEmitter, getLogger: LogProvider);
|
|
14
|
+
private buildSuggestChangeSetChangesQuery;
|
|
15
|
+
getAll: () => Promise<ISuggestChangeset[]>;
|
|
16
|
+
getForProject: (project: string) => Promise<ISuggestChangeset[]>;
|
|
17
|
+
getDraftForUser: (user: User, project: string, environment: string) => Promise<ISuggestChangeset>;
|
|
18
|
+
getForEnvironment: (environment: string) => Promise<ISuggestChangeset[]>;
|
|
19
|
+
get: (id: number) => Promise<ISuggestChangeset>;
|
|
20
|
+
create: (suggestChangeSet: PartialSome<ISuggestChangeset, 'id' | 'createdBy' | 'createdAt'>, user: User) => Promise<ISuggestChangeset>;
|
|
21
|
+
addChangeToSet: (change: PartialSome<ISuggestChange, 'id' | 'createdBy' | 'createdAt'>, changeSetID: number, user: User) => Promise<void>;
|
|
22
|
+
delete: (id: number) => Promise<void>;
|
|
23
|
+
deleteAll: () => Promise<void>;
|
|
24
|
+
exists: (id: number) => Promise<boolean>;
|
|
25
|
+
mapRows: (rows?: any[]) => ISuggestChangeset[];
|
|
26
|
+
destroy(): void;
|
|
27
|
+
}
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SuggestChangeStore = void 0;
|
|
4
|
+
const T = {
|
|
5
|
+
SUGGEST_CHANGE: 'suggest_change',
|
|
6
|
+
SUGGEST_CHANGE_SET: 'suggest_change_set',
|
|
7
|
+
};
|
|
8
|
+
const suggestChangeRowReducer = (acc, suggestChangeRow) => {
|
|
9
|
+
const { changeId, changeAction, changePayload, changeFeature, changeCreatedByUsername, changeCreatedByAvatar, changeCreatedAt, changeCreatedBy, ...suggestChangeSet } = suggestChangeRow;
|
|
10
|
+
if (!acc[suggestChangeRow.id]) {
|
|
11
|
+
acc[suggestChangeRow.id] = {
|
|
12
|
+
id: suggestChangeSet.id,
|
|
13
|
+
environment: suggestChangeSet.environment,
|
|
14
|
+
state: suggestChangeSet.state,
|
|
15
|
+
project: suggestChangeSet.project,
|
|
16
|
+
createdBy: {
|
|
17
|
+
id: suggestChangeSet.created_by,
|
|
18
|
+
username: suggestChangeSet.changeSetUsername,
|
|
19
|
+
imageUrl: suggestChangeSet.changeSetAvatar,
|
|
20
|
+
},
|
|
21
|
+
createdAt: suggestChangeSet.created_at,
|
|
22
|
+
changes: [],
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
const currentSuggestChangeSet = acc[suggestChangeSet.id];
|
|
26
|
+
if (changeId) {
|
|
27
|
+
currentSuggestChangeSet.changes.push({
|
|
28
|
+
id: changeId,
|
|
29
|
+
feature: changeFeature,
|
|
30
|
+
action: changeAction,
|
|
31
|
+
payload: changePayload,
|
|
32
|
+
createdAt: changeCreatedAt,
|
|
33
|
+
createdBy: {
|
|
34
|
+
id: changeCreatedBy,
|
|
35
|
+
username: changeCreatedByUsername,
|
|
36
|
+
imageUrl: changeCreatedByAvatar,
|
|
37
|
+
},
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
return acc;
|
|
41
|
+
};
|
|
42
|
+
class SuggestChangeStore {
|
|
43
|
+
constructor(db, eventBus, getLogger) {
|
|
44
|
+
this.buildSuggestChangeSetChangesQuery = () => {
|
|
45
|
+
return this.db(`${T.SUGGEST_CHANGE_SET} as changeSet`)
|
|
46
|
+
.leftJoin(`users as changeSetUser`, 'changeSet.created_by', 'changeSetUser.id')
|
|
47
|
+
.leftJoin(`projects`, 'projects.id', 'changeSet.project')
|
|
48
|
+
.leftJoin(`${T.SUGGEST_CHANGE} as change`, 'changeSet.id', 'change.suggest_change_set_id')
|
|
49
|
+
.leftJoin(`users as changeUser`, 'change.created_by', 'changeUser.id')
|
|
50
|
+
.select('changeSet.environment', 'projects.name as project', 'changeSet.created_at', 'changeSet.created_by', 'changeSetUser.username as changeSetUsername', 'changeSetUser.image_url as changeSetAvatar', 'change.id as changeId', 'change.feature as changeFeature', 'change.action as changeAction', 'change.payload as changePayload', 'change.created_at as changeCreatedAt', 'change.created_by as changeCreatedBy', 'changeUser.username as changeCreatedByUsername', 'changeUser.image_url as changeCreatedByAvatar');
|
|
51
|
+
};
|
|
52
|
+
this.getAll = async () => {
|
|
53
|
+
const rows = await this.buildSuggestChangeSetChangesQuery();
|
|
54
|
+
return this.mapRows(rows);
|
|
55
|
+
};
|
|
56
|
+
this.getForProject = async (project) => {
|
|
57
|
+
const rows = await this.buildSuggestChangeSetChangesQuery().where({
|
|
58
|
+
project,
|
|
59
|
+
});
|
|
60
|
+
return this.mapRows(rows);
|
|
61
|
+
};
|
|
62
|
+
this.getDraftForUser = async (user, project, environment) => {
|
|
63
|
+
const rows = await this.buildSuggestChangeSetChangesQuery().where({
|
|
64
|
+
'changeSet.created_by': user.id,
|
|
65
|
+
state: 'Draft',
|
|
66
|
+
project: project,
|
|
67
|
+
environment: environment,
|
|
68
|
+
});
|
|
69
|
+
const change = this.mapRows(rows)[0];
|
|
70
|
+
return change;
|
|
71
|
+
};
|
|
72
|
+
this.getForEnvironment = async (environment) => {
|
|
73
|
+
const rows = await this.buildSuggestChangeSetChangesQuery().where({
|
|
74
|
+
environment,
|
|
75
|
+
});
|
|
76
|
+
return this.mapRows(rows);
|
|
77
|
+
};
|
|
78
|
+
this.get = async (id) => {
|
|
79
|
+
const rows = await this.buildSuggestChangeSetChangesQuery().where({
|
|
80
|
+
'changeSet.id': id,
|
|
81
|
+
});
|
|
82
|
+
return this.mapRows(rows)[0];
|
|
83
|
+
};
|
|
84
|
+
this.create = async (suggestChangeSet, user) => {
|
|
85
|
+
const [{ id }] = await this.db(T.SUGGEST_CHANGE_SET)
|
|
86
|
+
.insert({
|
|
87
|
+
environment: suggestChangeSet.environment,
|
|
88
|
+
state: suggestChangeSet.state,
|
|
89
|
+
project: suggestChangeSet.project,
|
|
90
|
+
created_by: user.id,
|
|
91
|
+
})
|
|
92
|
+
.returning('id');
|
|
93
|
+
suggestChangeSet.changes.forEach((change) => {
|
|
94
|
+
this.addChangeToSet(change, id, user);
|
|
95
|
+
});
|
|
96
|
+
return this.get(id);
|
|
97
|
+
};
|
|
98
|
+
this.addChangeToSet = async (change, changeSetID, user) => {
|
|
99
|
+
await this.db(T.SUGGEST_CHANGE)
|
|
100
|
+
.insert({
|
|
101
|
+
action: change.action,
|
|
102
|
+
feature: change.feature,
|
|
103
|
+
payload: change.payload,
|
|
104
|
+
suggest_change_set_id: changeSetID,
|
|
105
|
+
created_by: user.id,
|
|
106
|
+
})
|
|
107
|
+
.returning('id');
|
|
108
|
+
};
|
|
109
|
+
this.delete = (id) => {
|
|
110
|
+
return this.db(T.SUGGEST_CHANGE_SET).where({ id }).del();
|
|
111
|
+
};
|
|
112
|
+
this.deleteAll = () => {
|
|
113
|
+
return this.db(T.SUGGEST_CHANGE_SET).del();
|
|
114
|
+
};
|
|
115
|
+
this.exists = async (id) => {
|
|
116
|
+
const result = await this.db.raw(`SELECT EXISTS(SELECT 1 FROM ${T.SUGGEST_CHANGE_SET} WHERE id = ?) AS present`, [id]);
|
|
117
|
+
return result.rows[0].present;
|
|
118
|
+
};
|
|
119
|
+
this.mapRows = (rows) => {
|
|
120
|
+
const suggestChangeSets = rows.reduce(suggestChangeRowReducer, {});
|
|
121
|
+
return Object.values(suggestChangeSets);
|
|
122
|
+
};
|
|
123
|
+
this.db = db;
|
|
124
|
+
this.eventBus = eventBus;
|
|
125
|
+
this.logger = getLogger('lib/db/suggest-change-store.ts');
|
|
126
|
+
}
|
|
127
|
+
destroy() { }
|
|
128
|
+
}
|
|
129
|
+
exports.SuggestChangeStore = SuggestChangeStore;
|
|
130
|
+
//# sourceMappingURL=suggest-change-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"suggest-change-store.js","sourceRoot":"","sources":["../../../src/lib/db/suggest-change-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -3880,6 +3880,10 @@ export declare const schemas: {
|
|
|
3880
3880
|
readonly type: "string";
|
|
3881
3881
|
readonly format: "date-time";
|
|
3882
3882
|
};
|
|
3883
|
+
readonly createdBy: {
|
|
3884
|
+
readonly type: "string";
|
|
3885
|
+
readonly nullable: true;
|
|
3886
|
+
};
|
|
3883
3887
|
readonly user: {
|
|
3884
3888
|
readonly $ref: "#/components/schemas/userSchema";
|
|
3885
3889
|
};
|
|
@@ -4057,6 +4061,10 @@ export declare const schemas: {
|
|
|
4057
4061
|
readonly type: "string";
|
|
4058
4062
|
readonly format: "date-time";
|
|
4059
4063
|
};
|
|
4064
|
+
readonly createdBy: {
|
|
4065
|
+
readonly type: "string";
|
|
4066
|
+
readonly nullable: true;
|
|
4067
|
+
};
|
|
4060
4068
|
readonly user: {
|
|
4061
4069
|
readonly $ref: "#/components/schemas/userSchema";
|
|
4062
4070
|
};
|
|
@@ -4175,6 +4183,10 @@ export declare const schemas: {
|
|
|
4175
4183
|
readonly type: "string";
|
|
4176
4184
|
readonly format: "date-time";
|
|
4177
4185
|
};
|
|
4186
|
+
readonly createdBy: {
|
|
4187
|
+
readonly type: "string";
|
|
4188
|
+
readonly nullable: true;
|
|
4189
|
+
};
|
|
4178
4190
|
readonly user: {
|
|
4179
4191
|
readonly $ref: "#/components/schemas/userSchema";
|
|
4180
4192
|
};
|
|
@@ -4293,6 +4305,10 @@ export declare const schemas: {
|
|
|
4293
4305
|
readonly type: "string";
|
|
4294
4306
|
readonly format: "date-time";
|
|
4295
4307
|
};
|
|
4308
|
+
readonly createdBy: {
|
|
4309
|
+
readonly type: "string";
|
|
4310
|
+
readonly nullable: true;
|
|
4311
|
+
};
|
|
4296
4312
|
readonly user: {
|
|
4297
4313
|
readonly $ref: "#/components/schemas/userSchema";
|
|
4298
4314
|
};
|
|
@@ -10921,6 +10937,10 @@ export declare const schemas: {
|
|
|
10921
10937
|
readonly type: "string";
|
|
10922
10938
|
readonly format: "date-time";
|
|
10923
10939
|
};
|
|
10940
|
+
readonly createdBy: {
|
|
10941
|
+
readonly type: "string";
|
|
10942
|
+
readonly nullable: true;
|
|
10943
|
+
};
|
|
10924
10944
|
readonly user: {
|
|
10925
10945
|
readonly $ref: "#/components/schemas/userSchema";
|
|
10926
10946
|
};
|
|
@@ -11039,6 +11059,10 @@ export declare const schemas: {
|
|
|
11039
11059
|
readonly type: "string";
|
|
11040
11060
|
readonly format: "date-time";
|
|
11041
11061
|
};
|
|
11062
|
+
readonly createdBy: {
|
|
11063
|
+
readonly type: "string";
|
|
11064
|
+
readonly nullable: true;
|
|
11065
|
+
};
|
|
11042
11066
|
readonly user: {
|
|
11043
11067
|
readonly $ref: "#/components/schemas/userSchema";
|
|
11044
11068
|
};
|
|
@@ -54,6 +54,10 @@ export declare const groupSchema: {
|
|
|
54
54
|
readonly type: "string";
|
|
55
55
|
readonly format: "date-time";
|
|
56
56
|
};
|
|
57
|
+
readonly createdBy: {
|
|
58
|
+
readonly type: "string";
|
|
59
|
+
readonly nullable: true;
|
|
60
|
+
};
|
|
57
61
|
readonly user: {
|
|
58
62
|
readonly $ref: "#/components/schemas/userSchema";
|
|
59
63
|
};
|
|
@@ -9,6 +9,10 @@ export declare const groupUserModelSchema: {
|
|
|
9
9
|
readonly type: "string";
|
|
10
10
|
readonly format: "date-time";
|
|
11
11
|
};
|
|
12
|
+
readonly createdBy: {
|
|
13
|
+
readonly type: "string";
|
|
14
|
+
readonly nullable: true;
|
|
15
|
+
};
|
|
12
16
|
readonly user: {
|
|
13
17
|
readonly $ref: "#/components/schemas/userSchema";
|
|
14
18
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-user-model-schema.js","sourceRoot":"","sources":["../../../../src/lib/openapi/spec/group-user-model-schema.ts"],"names":[],"mappings":";;;AACA,+CAA2C;AAE9B,QAAA,oBAAoB,GAAG;IAChC,GAAG,EAAE,2CAA2C;IAChD,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,QAAQ,EAAE,CAAC,MAAM,CAAC;IAClB,UAAU,EAAE;QACR,QAAQ,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,WAAW;SACtB;QACD,IAAI,EAAE;YACF,IAAI,EAAE,iCAAiC;SAC1C;KACJ;IACD,UAAU,EAAE;QACR,OAAO,EAAE;YACL,UAAU,EAAV,wBAAU;SACb;KACJ;CACK,CAAC"}
|
|
1
|
+
{"version":3,"file":"group-user-model-schema.js","sourceRoot":"","sources":["../../../../src/lib/openapi/spec/group-user-model-schema.ts"],"names":[],"mappings":";;;AACA,+CAA2C;AAE9B,QAAA,oBAAoB,GAAG;IAChC,GAAG,EAAE,2CAA2C;IAChD,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,KAAK;IAC3B,QAAQ,EAAE,CAAC,MAAM,CAAC;IAClB,UAAU,EAAE;QACR,QAAQ,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,WAAW;SACtB;QACD,SAAS,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;SACjB;QACD,IAAI,EAAE;YACF,IAAI,EAAE,iCAAiC;SAC1C;KACJ;IACD,UAAU,EAAE;QACR,OAAO,EAAE;YACL,UAAU,EAAV,wBAAU;SACb;KACJ;CACK,CAAC"}
|
|
@@ -68,6 +68,10 @@ export declare const groupsSchema: {
|
|
|
68
68
|
readonly type: "string";
|
|
69
69
|
readonly format: "date-time";
|
|
70
70
|
};
|
|
71
|
+
readonly createdBy: {
|
|
72
|
+
readonly type: "string";
|
|
73
|
+
readonly nullable: true;
|
|
74
|
+
};
|
|
71
75
|
readonly user: {
|
|
72
76
|
readonly $ref: "#/components/schemas/userSchema";
|
|
73
77
|
};
|
|
@@ -186,6 +190,10 @@ export declare const groupsSchema: {
|
|
|
186
190
|
readonly type: "string";
|
|
187
191
|
readonly format: "date-time";
|
|
188
192
|
};
|
|
193
|
+
readonly createdBy: {
|
|
194
|
+
readonly type: "string";
|
|
195
|
+
readonly nullable: true;
|
|
196
|
+
};
|
|
189
197
|
readonly user: {
|
|
190
198
|
readonly $ref: "#/components/schemas/userSchema";
|
|
191
199
|
};
|
|
@@ -74,6 +74,10 @@ export declare const usersGroupsBaseSchema: {
|
|
|
74
74
|
readonly type: "string";
|
|
75
75
|
readonly format: "date-time";
|
|
76
76
|
};
|
|
77
|
+
readonly createdBy: {
|
|
78
|
+
readonly type: "string";
|
|
79
|
+
readonly nullable: true;
|
|
80
|
+
};
|
|
77
81
|
readonly user: {
|
|
78
82
|
readonly $ref: "#/components/schemas/userSchema";
|
|
79
83
|
};
|
|
@@ -192,6 +196,10 @@ export declare const usersGroupsBaseSchema: {
|
|
|
192
196
|
readonly type: "string";
|
|
193
197
|
readonly format: "date-time";
|
|
194
198
|
};
|
|
199
|
+
readonly createdBy: {
|
|
200
|
+
readonly type: "string";
|
|
201
|
+
readonly nullable: true;
|
|
202
|
+
};
|
|
195
203
|
readonly user: {
|
|
196
204
|
readonly $ref: "#/components/schemas/userSchema";
|
|
197
205
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// Copy of https://github.com/Unleash/unleash-proxy/blob/main/src/create-context.ts.
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.createContext = void 0;
|
|
4
|
+
exports.enrichContextWithIp = exports.createContext = void 0;
|
|
5
5
|
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
6
6
|
function createContext(value) {
|
|
7
7
|
const { appName, environment, userId, sessionId, remoteAddress, properties, ...rest } = value;
|
|
@@ -21,4 +21,10 @@ function createContext(value) {
|
|
|
21
21
|
return cleanContext;
|
|
22
22
|
}
|
|
23
23
|
exports.createContext = createContext;
|
|
24
|
+
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
25
|
+
const enrichContextWithIp = (query, ip) => {
|
|
26
|
+
query.remoteAddress = query.remoteAddress || ip;
|
|
27
|
+
return createContext(query);
|
|
28
|
+
};
|
|
29
|
+
exports.enrichContextWithIp = enrichContextWithIp;
|
|
24
30
|
//# sourceMappingURL=create-context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-context.js","sourceRoot":"","sources":["../../../src/lib/proxy/create-context.ts"],"names":[],"mappings":";AAAA,oFAAoF;;;AAKpF,6EAA6E;AAC7E,SAAgB,aAAa,CAAC,KAAU;IACpC,MAAM,EACF,OAAO,EACP,WAAW,EACX,MAAM,EACN,SAAS,EACT,aAAa,EACb,UAAU,EACV,GAAG,IAAI,EACV,GAAG,KAAK,CAAC;IAEV,6CAA6C;IAC7C,MAAM,OAAO,GAAY;QACrB,OAAO;QACP,WAAW;QACX,MAAM;QACN,SAAS;QACT,aAAa;QACb,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC;KAClD,CAAC;IAEF,4CAA4C;IAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SACpC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SACzB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAEvD,OAAO,YAAY,CAAC;AACxB,CAAC;AA3BD,sCA2BC"}
|
|
1
|
+
{"version":3,"file":"create-context.js","sourceRoot":"","sources":["../../../src/lib/proxy/create-context.ts"],"names":[],"mappings":";AAAA,oFAAoF;;;AAKpF,6EAA6E;AAC7E,SAAgB,aAAa,CAAC,KAAU;IACpC,MAAM,EACF,OAAO,EACP,WAAW,EACX,MAAM,EACN,SAAS,EACT,aAAa,EACb,UAAU,EACV,GAAG,IAAI,EACV,GAAG,KAAK,CAAC;IAEV,6CAA6C;IAC7C,MAAM,OAAO,GAAY;QACrB,OAAO;QACP,WAAW;QACX,MAAM;QACN,SAAS;QACT,aAAa;QACb,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC;KAClD,CAAC;IAEF,4CAA4C;IAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SACpC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SACzB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAEvD,OAAO,YAAY,CAAC;AACxB,CAAC;AA3BD,sCA2BC;AAED,6EAA6E;AACtE,MAAM,mBAAmB,GAAG,CAAC,KAAU,EAAE,EAAU,EAAW,EAAE;IACnE,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC;IAChD,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC,CAAC;AAHW,QAAA,mBAAmB,uBAG9B"}
|
|
@@ -48,11 +48,41 @@ test('will not blow up if properties is an array', () => {
|
|
|
48
48
|
region: 'eu',
|
|
49
49
|
properties: ['some'],
|
|
50
50
|
});
|
|
51
|
-
// console.log(context);
|
|
52
51
|
expect(context.userId).toBe('123');
|
|
53
52
|
expect(context).not.toHaveProperty('tenantId');
|
|
54
53
|
expect(context).not.toHaveProperty('region');
|
|
55
54
|
});
|
|
55
|
+
test('will respect environment set in context', () => {
|
|
56
|
+
const context = (0, create_context_1.createContext)({
|
|
57
|
+
userId: '123',
|
|
58
|
+
tenantId: 'some-tenant',
|
|
59
|
+
environment: 'development',
|
|
60
|
+
region: 'eu',
|
|
61
|
+
properties: ['some'],
|
|
62
|
+
});
|
|
63
|
+
expect(context.environment).toBe('development');
|
|
64
|
+
});
|
|
65
|
+
test('will not set environment to be development if not set in context', () => {
|
|
66
|
+
const context = (0, create_context_1.createContext)({
|
|
67
|
+
userId: '123',
|
|
68
|
+
tenantId: 'some-tenant',
|
|
69
|
+
region: 'eu',
|
|
70
|
+
properties: ['some'],
|
|
71
|
+
});
|
|
72
|
+
expect(context.environment).toBe(undefined);
|
|
73
|
+
});
|
|
74
|
+
test('will enrich context with ip', () => {
|
|
75
|
+
const query = {};
|
|
76
|
+
const ip = '192.168.10.0';
|
|
77
|
+
const result = (0, create_context_1.enrichContextWithIp)(query, ip);
|
|
78
|
+
expect(result.remoteAddress).toBe(ip);
|
|
79
|
+
});
|
|
80
|
+
test('will not change environment when enriching', () => {
|
|
81
|
+
const query = { environment: 'production' };
|
|
82
|
+
const ip = '192.168.10.0';
|
|
83
|
+
const result = (0, create_context_1.enrichContextWithIp)(query, ip);
|
|
84
|
+
expect(result.environment).toBe('production');
|
|
85
|
+
});
|
|
56
86
|
test.skip('will not blow up if userId is an array', () => {
|
|
57
87
|
const context = (0, create_context_1.createContext)({
|
|
58
88
|
userId: ['123'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-context.test.js","sourceRoot":"","sources":["../../../src/lib/proxy/create-context.test.ts"],"names":[],"mappings":";AAAA,8FAA8F;;AAE9F,
|
|
1
|
+
{"version":3,"file":"create-context.test.js","sourceRoot":"","sources":["../../../src/lib/proxy/create-context.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,9 +107,7 @@ class ProxyController extends controller_1.default {
|
|
|
107
107
|
}
|
|
108
108
|
static createContext(req) {
|
|
109
109
|
const { query } = req;
|
|
110
|
-
|
|
111
|
-
query.environment = req.user.environment;
|
|
112
|
-
return (0, create_context_1.createContext)(query);
|
|
110
|
+
return (0, create_context_1.enrichContextWithIp)(query, req.ip);
|
|
113
111
|
}
|
|
114
112
|
}
|
|
115
113
|
exports.default = ProxyController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/routes/proxy-api/index.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAGvC,yDAA+C;AAE/C,oFAGkD;AAElD,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/routes/proxy-api/index.ts"],"names":[],"mappings":"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"}
|