unleash-server 4.2.0-beta.6 → 4.2.0
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/README.md +1 -1
- package/dist/lib/addons/datadog.d.ts +3 -17
- package/dist/lib/addons/datadog.js +3 -109
- package/dist/lib/addons/datadog.js.map +1 -1
- package/dist/lib/addons/feature-event-formatter-md.d.ts +25 -0
- package/dist/lib/addons/feature-event-formatter-md.js +117 -0
- package/dist/lib/addons/feature-event-formatter-md.js.map +1 -0
- package/dist/lib/addons/index.d.ts +1 -0
- package/dist/lib/addons/index.js.map +1 -1
- package/dist/lib/addons/slack.d.ts +1 -11
- package/dist/lib/addons/slack.js +5 -110
- package/dist/lib/addons/slack.js.map +1 -1
- package/dist/lib/addons/slack.test.js +2 -0
- package/dist/lib/addons/slack.test.js.map +1 -1
- package/dist/lib/addons/teams.d.ts +3 -17
- package/dist/lib/addons/teams.js +7 -109
- package/dist/lib/addons/teams.js.map +1 -1
- package/dist/lib/db/client-metrics-store-v2.d.ts +0 -1
- package/dist/lib/db/client-metrics-store-v2.js +5 -8
- package/dist/lib/db/client-metrics-store-v2.js.map +1 -1
- package/dist/lib/middleware/demo-authentication.js +5 -11
- package/dist/lib/middleware/demo-authentication.js.map +1 -1
- package/dist/lib/middleware/rbac-middleware.test.js +2 -0
- package/dist/lib/middleware/rbac-middleware.test.js.map +1 -1
- package/dist/lib/routes/admin-api/config.d.ts +5 -2
- package/dist/lib/routes/admin-api/config.js +9 -11
- package/dist/lib/routes/admin-api/config.js.map +1 -1
- package/dist/lib/routes/admin-api/feature.d.ts +2 -3
- package/dist/lib/routes/admin-api/feature.js +33 -34
- package/dist/lib/routes/admin-api/feature.js.map +1 -1
- package/dist/lib/routes/admin-api/project/features.js +1 -1
- package/dist/lib/routes/admin-api/project/features.js.map +1 -1
- package/dist/lib/routes/admin-api/strategy.test.js +25 -38
- package/dist/lib/routes/admin-api/strategy.test.js.map +1 -1
- package/dist/lib/routes/admin-api/user-admin.d.ts +1 -0
- package/dist/lib/routes/admin-api/user-admin.js +6 -0
- package/dist/lib/routes/admin-api/user-admin.js.map +1 -1
- package/dist/lib/routes/health-check.test.js +1 -0
- package/dist/lib/routes/health-check.test.js.map +1 -1
- package/dist/lib/server-impl.d.ts +2 -1
- package/dist/lib/server-impl.js.map +1 -1
- package/dist/lib/services/client-metrics/client-metrics-service-v2.js +0 -1
- package/dist/lib/services/client-metrics/client-metrics-service-v2.js.map +1 -1
- package/dist/lib/services/feature-toggle-service-v2.js +1 -1
- package/dist/lib/services/feature-toggle-service-v2.js.map +1 -1
- package/dist/lib/services/index.js +2 -1
- package/dist/lib/services/index.js.map +1 -1
- package/dist/lib/services/setting-service.d.ts +1 -1
- package/dist/lib/services/setting-service.js.map +1 -1
- package/dist/lib/services/user-service.d.ts +3 -0
- package/dist/lib/services/user-service.js +6 -0
- package/dist/lib/services/user-service.js.map +1 -1
- package/dist/lib/services/user-service.test.js +18 -0
- package/dist/lib/services/user-service.test.js.map +1 -1
- package/dist/lib/types/authentication-required.d.ts +3 -1
- package/dist/lib/types/authentication-required.js +2 -1
- package/dist/lib/types/authentication-required.js.map +1 -1
- package/dist/lib/types/settings/simple-auth-settings.d.ts +4 -0
- package/dist/lib/types/settings/simple-auth-settings.js +5 -0
- package/dist/lib/types/settings/simple-auth-settings.js.map +1 -0
- package/dist/lib/types/stores/settings-store.d.ts +1 -1
- package/dist/migrations/20210928080601-add-development-and-production-environments.js +3 -3
- package/dist/migrations/20211029094324-set-sort-order-env.d.ts +2 -0
- package/dist/migrations/20211029094324-set-sort-order-env.js +11 -0
- package/dist/migrations/20211029094324-set-sort-order-env.js.map +1 -0
- package/dist/test/e2e/api/admin/bootstrap.test.js +1 -1
- package/dist/test/e2e/api/admin/client-metrics.e2e.test.js +8 -8
- package/dist/test/e2e/api/admin/client-metrics.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/config.e2e.test.d.ts +1 -0
- package/dist/test/e2e/api/admin/config.e2e.test.js +36 -0
- package/dist/test/e2e/api/admin/config.e2e.test.js.map +1 -0
- package/dist/test/e2e/api/admin/feature.auth.e2e.test.js +1 -1
- package/dist/test/e2e/api/admin/feature.custom-auth.e2e.test.js +1 -1
- package/dist/test/e2e/api/admin/project/features.e2e.test.js +1 -1
- package/dist/test/e2e/api/admin/project/features.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/user-admin.e2e.test.js +16 -1
- package/dist/test/e2e/api/admin/user-admin.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/user.test.js +1 -1
- package/dist/test/e2e/api/auth/reset-password-controller.e2e.test.js +6 -2
- package/dist/test/e2e/api/auth/reset-password-controller.e2e.test.js.map +1 -1
- package/dist/test/e2e/custom-auth.test.js +1 -1
- package/dist/test/e2e/custom-auth.test.js.map +1 -1
- package/dist/test/e2e/helpers/database-init.js +1 -1
- package/dist/test/e2e/services/reset-token-service.e2e.test.js +4 -0
- package/dist/test/e2e/services/reset-token-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/user-service.e2e.test.js +15 -0
- package/dist/test/e2e/services/user-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js +4 -11
- package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js.map +1 -1
- package/dist/test/e2e/stores/feature-toggle-store.e2e.test.js +1 -0
- package/dist/test/e2e/stores/feature-toggle-store.e2e.test.js.map +1 -1
- package/dist/test/fixtures/fake-setting-store.js +1 -5
- package/dist/test/fixtures/fake-setting-store.js.map +1 -1
- package/package.json +12 -9
|
@@ -15,6 +15,7 @@ const owasp_validation_error_1 = __importDefault(require("../error/owasp-validat
|
|
|
15
15
|
const password_undefined_1 = __importDefault(require("../error/password-undefined"));
|
|
16
16
|
const events_1 = require("../types/events");
|
|
17
17
|
const model_1 = require("../types/model");
|
|
18
|
+
const simple_auth_settings_1 = require("../types/settings/simple-auth-settings");
|
|
18
19
|
const systemUser = new user_1.default({ id: -1, username: 'system' });
|
|
19
20
|
const saltRounds = 10;
|
|
20
21
|
class UserService {
|
|
@@ -26,6 +27,7 @@ class UserService {
|
|
|
26
27
|
this.resetTokenService = services.resetTokenService;
|
|
27
28
|
this.emailService = services.emailService;
|
|
28
29
|
this.sessionService = services.sessionService;
|
|
30
|
+
this.settingService = services.settingService;
|
|
29
31
|
if (authentication && authentication.createAdminUser) {
|
|
30
32
|
process.nextTick(() => this.initAdminUser());
|
|
31
33
|
}
|
|
@@ -132,6 +134,10 @@ class UserService {
|
|
|
132
134
|
return user;
|
|
133
135
|
}
|
|
134
136
|
async loginUser(usernameOrEmail, password) {
|
|
137
|
+
const settings = await this.settingService.get(simple_auth_settings_1.simpleAuthKey);
|
|
138
|
+
if (settings && settings.disabled) {
|
|
139
|
+
throw new Error('Logging in with username/password has been disabled.');
|
|
140
|
+
}
|
|
135
141
|
const idQuery = (0, is_email_1.default)(usernameOrEmail)
|
|
136
142
|
? { email: usernameOrEmail }
|
|
137
143
|
: { username: usernameOrEmail };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-service.js","sourceRoot":"","sources":["../../../src/lib/services/user-service.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,oDAA4B;AAC5B,gGAAiD;AACjD,8CAAsB;AAItB,yDAA4C;AAC5C,gEAAuC;AAGvC,uFAA6D;AAC7D,6EAAoD;AACpD,6FAAmE;AAKnE,qFAAiE;AACjE,4CAA2E;AAG3E,0CAA0C;
|
|
1
|
+
{"version":3,"file":"user-service.js","sourceRoot":"","sources":["../../../src/lib/services/user-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,8 @@ const session_service_1 = __importDefault(require("./session-service"));
|
|
|
15
15
|
const fake_session_store_1 = __importDefault(require("../../test/fixtures/fake-session-store"));
|
|
16
16
|
const user_1 = __importDefault(require("../types/user"));
|
|
17
17
|
const fake_reset_token_store_1 = __importDefault(require("../../test/fixtures/fake-reset-token-store"));
|
|
18
|
+
const setting_service_1 = __importDefault(require("./setting-service"));
|
|
19
|
+
const fake_setting_store_1 = __importDefault(require("../../test/fixtures/fake-setting-store"));
|
|
18
20
|
const config = (0, test_config_1.createTestConfig)();
|
|
19
21
|
const systemUser = new user_1.default({ id: -1, username: 'system' });
|
|
20
22
|
test('Should create new user', async () => {
|
|
@@ -26,11 +28,13 @@ test('Should create new user', async () => {
|
|
|
26
28
|
const sessionStore = new fake_session_store_1.default();
|
|
27
29
|
const sessionService = new session_service_1.default({ sessionStore }, config);
|
|
28
30
|
const emailService = new email_service_1.EmailService(config.email, config.getLogger);
|
|
31
|
+
const settingService = new setting_service_1.default({ settingStore: new fake_setting_store_1.default() }, config);
|
|
29
32
|
const service = new user_service_1.default({ userStore, eventStore }, config, {
|
|
30
33
|
accessService,
|
|
31
34
|
resetTokenService,
|
|
32
35
|
emailService,
|
|
33
36
|
sessionService,
|
|
37
|
+
settingService,
|
|
34
38
|
});
|
|
35
39
|
const user = await service.createUser({
|
|
36
40
|
username: 'test',
|
|
@@ -52,11 +56,13 @@ test('Should create default user', async () => {
|
|
|
52
56
|
const emailService = new email_service_1.EmailService(config.email, config.getLogger);
|
|
53
57
|
const sessionStore = new fake_session_store_1.default();
|
|
54
58
|
const sessionService = new session_service_1.default({ sessionStore }, config);
|
|
59
|
+
const settingService = new setting_service_1.default({ settingStore: new fake_setting_store_1.default() }, config);
|
|
55
60
|
const service = new user_service_1.default({ userStore, eventStore }, config, {
|
|
56
61
|
accessService,
|
|
57
62
|
resetTokenService,
|
|
58
63
|
emailService,
|
|
59
64
|
sessionService,
|
|
65
|
+
settingService,
|
|
60
66
|
});
|
|
61
67
|
await service.initAdminUser();
|
|
62
68
|
const user = await service.loginUser('admin', 'unleash4all');
|
|
@@ -71,11 +77,13 @@ test('Should be a valid password', async () => {
|
|
|
71
77
|
const emailService = new email_service_1.EmailService(config.email, config.getLogger);
|
|
72
78
|
const sessionStore = new fake_session_store_1.default();
|
|
73
79
|
const sessionService = new session_service_1.default({ sessionStore }, config);
|
|
80
|
+
const settingService = new setting_service_1.default({ settingStore: new fake_setting_store_1.default() }, config);
|
|
74
81
|
const service = new user_service_1.default({ userStore, eventStore }, config, {
|
|
75
82
|
accessService,
|
|
76
83
|
resetTokenService,
|
|
77
84
|
emailService,
|
|
78
85
|
sessionService,
|
|
86
|
+
settingService,
|
|
79
87
|
});
|
|
80
88
|
const valid = service.validatePassword('this is a strong password!');
|
|
81
89
|
expect(valid).toBe(true);
|
|
@@ -89,11 +97,13 @@ test('Password must be at least 10 chars', async () => {
|
|
|
89
97
|
const emailService = new email_service_1.EmailService(config.email, config.getLogger);
|
|
90
98
|
const sessionStore = new fake_session_store_1.default();
|
|
91
99
|
const sessionService = new session_service_1.default({ sessionStore }, config);
|
|
100
|
+
const settingService = new setting_service_1.default({ settingStore: new fake_setting_store_1.default() }, config);
|
|
92
101
|
const service = new user_service_1.default({ userStore, eventStore }, config, {
|
|
93
102
|
accessService,
|
|
94
103
|
resetTokenService,
|
|
95
104
|
emailService,
|
|
96
105
|
sessionService,
|
|
106
|
+
settingService,
|
|
97
107
|
});
|
|
98
108
|
expect(() => service.validatePassword('admin')).toThrow('The password must be at least 10 characters long.');
|
|
99
109
|
expect(() => service.validatePassword('qwertyabcde')).toThrowError(owasp_validation_error_1.default);
|
|
@@ -107,11 +117,13 @@ test('The password must contain at least one uppercase letter.', async () => {
|
|
|
107
117
|
const emailService = new email_service_1.EmailService(config.email, config.getLogger);
|
|
108
118
|
const sessionStore = new fake_session_store_1.default();
|
|
109
119
|
const sessionService = new session_service_1.default({ sessionStore }, config);
|
|
120
|
+
const settingService = new setting_service_1.default({ settingStore: new fake_setting_store_1.default() }, config);
|
|
110
121
|
const service = new user_service_1.default({ userStore, eventStore }, config, {
|
|
111
122
|
accessService,
|
|
112
123
|
resetTokenService,
|
|
113
124
|
emailService,
|
|
114
125
|
sessionService,
|
|
126
|
+
settingService,
|
|
115
127
|
});
|
|
116
128
|
expect(() => service.validatePassword('qwertyabcde')).toThrowError('The password must contain at least one uppercase letter.');
|
|
117
129
|
expect(() => service.validatePassword('qwertyabcde')).toThrowError(owasp_validation_error_1.default);
|
|
@@ -125,11 +137,13 @@ test('The password must contain at least one number', async () => {
|
|
|
125
137
|
const emailService = new email_service_1.EmailService(config.email, config.getLogger);
|
|
126
138
|
const sessionStore = new fake_session_store_1.default();
|
|
127
139
|
const sessionService = new session_service_1.default({ sessionStore }, config);
|
|
140
|
+
const settingService = new setting_service_1.default({ settingStore: new fake_setting_store_1.default() }, config);
|
|
128
141
|
const service = new user_service_1.default({ userStore, eventStore }, config, {
|
|
129
142
|
accessService,
|
|
130
143
|
resetTokenService,
|
|
131
144
|
emailService,
|
|
132
145
|
sessionService,
|
|
146
|
+
settingService,
|
|
133
147
|
});
|
|
134
148
|
expect(() => service.validatePassword('qwertyabcdE')).toThrowError('The password must contain at least one number.');
|
|
135
149
|
expect(() => service.validatePassword('qwertyabcdE')).toThrowError(owasp_validation_error_1.default);
|
|
@@ -143,11 +157,13 @@ test('The password must contain at least one special character', async () => {
|
|
|
143
157
|
const emailService = new email_service_1.EmailService(config.email, config.getLogger);
|
|
144
158
|
const sessionStore = new fake_session_store_1.default();
|
|
145
159
|
const sessionService = new session_service_1.default({ sessionStore }, config);
|
|
160
|
+
const settingService = new setting_service_1.default({ settingStore: new fake_setting_store_1.default() }, config);
|
|
146
161
|
const service = new user_service_1.default({ userStore, eventStore }, config, {
|
|
147
162
|
accessService,
|
|
148
163
|
resetTokenService,
|
|
149
164
|
emailService,
|
|
150
165
|
sessionService,
|
|
166
|
+
settingService,
|
|
151
167
|
});
|
|
152
168
|
expect(() => service.validatePassword('qwertyabcdE2')).toThrowError('The password must contain at least one special character.');
|
|
153
169
|
expect(() => service.validatePassword('qwertyabcdE2')).toThrowError(owasp_validation_error_1.default);
|
|
@@ -161,11 +177,13 @@ test('Should be a valid password with special chars', async () => {
|
|
|
161
177
|
const emailService = new email_service_1.EmailService(config.email, config.getLogger);
|
|
162
178
|
const sessionStore = new fake_session_store_1.default();
|
|
163
179
|
const sessionService = new session_service_1.default({ sessionStore }, config);
|
|
180
|
+
const settingService = new setting_service_1.default({ settingStore: new fake_setting_store_1.default() }, config);
|
|
164
181
|
const service = new user_service_1.default({ userStore, eventStore }, config, {
|
|
165
182
|
accessService,
|
|
166
183
|
resetTokenService,
|
|
167
184
|
emailService,
|
|
168
185
|
sessionService,
|
|
186
|
+
settingService,
|
|
169
187
|
});
|
|
170
188
|
const valid = service.validatePassword('this is a strong password!');
|
|
171
189
|
expect(valid).toBe(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-service.test.js","sourceRoot":"","sources":["../../../src/lib/services/user-service.test.ts"],"names":[],"mappings":";;;;;AAAA,kEAAyC;AACzC,0FAAgE;AAChE,4FAAkE;AAClE,kGAAwE;AACxE,gFAAsD;AACtD,mDAA+C;AAC/C,6FAAmE;AAEnE,+DAAiE;AACjE,wEAA+C;AAC/C,gGAAsE;AACtE,yDAAiC;AACjC,wGAA6E;
|
|
1
|
+
{"version":3,"file":"user-service.test.js","sourceRoot":"","sources":["../../../src/lib/services/user-service.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ interface IBaseOptions {
|
|
|
2
2
|
type: string;
|
|
3
3
|
path: string;
|
|
4
4
|
message: string;
|
|
5
|
+
defaultHidden?: boolean;
|
|
5
6
|
}
|
|
6
7
|
interface IOptions extends IBaseOptions {
|
|
7
8
|
options?: IBaseOptions[];
|
|
@@ -10,7 +11,8 @@ declare class AuthenticationRequired {
|
|
|
10
11
|
private type;
|
|
11
12
|
private path;
|
|
12
13
|
private message;
|
|
14
|
+
private defaultHidden;
|
|
13
15
|
private options?;
|
|
14
|
-
constructor({ type, path, message, options }: IOptions);
|
|
16
|
+
constructor({ type, path, message, options, defaultHidden, }: IOptions);
|
|
15
17
|
}
|
|
16
18
|
export default AuthenticationRequired;
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
class AuthenticationRequired {
|
|
4
|
-
constructor({ type, path, message, options }) {
|
|
4
|
+
constructor({ type, path, message, options, defaultHidden = false, }) {
|
|
5
5
|
this.type = type;
|
|
6
6
|
this.path = path;
|
|
7
7
|
this.message = message;
|
|
8
8
|
this.options = options;
|
|
9
|
+
this.defaultHidden = defaultHidden;
|
|
9
10
|
}
|
|
10
11
|
}
|
|
11
12
|
exports.default = AuthenticationRequired;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication-required.js","sourceRoot":"","sources":["../../../src/lib/types/authentication-required.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"authentication-required.js","sourceRoot":"","sources":["../../../src/lib/types/authentication-required.ts"],"names":[],"mappings":";;AAWA,MAAM,sBAAsB;IAWxB,YAAY,EACR,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,OAAO,EACP,aAAa,GAAG,KAAK,GACd;QACP,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;CACJ;AAED,kBAAe,sBAAsB,CAAC;AACtC,MAAM,CAAC,OAAO,GAAG,sBAAsB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"simple-auth-settings.js","sourceRoot":"","sources":["../../../../src/lib/types/settings/simple-auth-settings.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG,qBAAqB,CAAC"}
|
|
@@ -4,6 +4,6 @@ export interface ISettingInsert {
|
|
|
4
4
|
content: any;
|
|
5
5
|
}
|
|
6
6
|
export interface ISettingStore extends Store<any, string> {
|
|
7
|
-
insert(name: string, content:
|
|
7
|
+
insert<T>(name: string, content: T): Promise<void>;
|
|
8
8
|
updateRow(name: string, content: any): Promise<void>;
|
|
9
9
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
exports.up = function (db, cb) {
|
|
3
3
|
db.runSql(`
|
|
4
|
-
INSERT INTO environments(name, type, enabled)
|
|
5
|
-
VALUES ('development', 'development', true),
|
|
6
|
-
('production', 'production', true);
|
|
4
|
+
INSERT INTO environments(name, type, enabled, sort_order)
|
|
5
|
+
VALUES ('development', 'development', true, 100),
|
|
6
|
+
('production', 'production', true, 200);
|
|
7
7
|
`, cb);
|
|
8
8
|
};
|
|
9
9
|
exports.down = function (db, cb) {
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
exports.up = function (db, cb) {
|
|
3
|
+
db.runSql(`
|
|
4
|
+
UPDATE environments set sort_order = 100 where name = 'development' AND sort_order = 9999;
|
|
5
|
+
UPDATE environments set sort_order = 200 where name = 'production' AND sort_order = 9999;
|
|
6
|
+
`, cb);
|
|
7
|
+
};
|
|
8
|
+
exports.down = function (db, cb) {
|
|
9
|
+
cb();
|
|
10
|
+
};
|
|
11
|
+
//# sourceMappingURL=20211029094324-set-sort-order-env.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20211029094324-set-sort-order-env.js","sourceRoot":"","sources":["../../src/migrations/20211029094324-set-sort-order-env.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,CAAC,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IACzB,EAAE,CAAC,MAAM,CACL;;;SAGC,EACD,EAAE,CACL,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,CAAC,IAAI,GAAG,UAAU,EAAE,EAAE,EAAE;IAC3B,EAAE,EAAE,CAAC;AACT,CAAC,CAAC"}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const database_init_1 = __importDefault(require("../../helpers/database-init"));
|
|
7
7
|
const test_helper_1 = require("../../helpers/test-helper");
|
|
8
8
|
const no_logger_1 = __importDefault(require("../../../fixtures/no-logger"));
|
|
9
|
+
const date_fns_1 = require("date-fns");
|
|
9
10
|
let app;
|
|
10
11
|
let db;
|
|
11
12
|
beforeAll(async () => {
|
|
@@ -156,15 +157,14 @@ test('should return toggle summary', async () => {
|
|
|
156
157
|
expect(demo.seenApplications).toStrictEqual(['backend-api', 'web']);
|
|
157
158
|
});
|
|
158
159
|
test('should only include last hour of metrics return toggle summary', async () => {
|
|
159
|
-
const
|
|
160
|
-
const
|
|
161
|
-
dateHoneHourAgo.setHours(-1);
|
|
160
|
+
const now = new Date();
|
|
161
|
+
const dateOneHourAgo = (0, date_fns_1.subHours)(now, 1);
|
|
162
162
|
const metrics = [
|
|
163
163
|
{
|
|
164
164
|
featureName: 'demo',
|
|
165
165
|
appName: 'web',
|
|
166
166
|
environment: 'default',
|
|
167
|
-
timestamp:
|
|
167
|
+
timestamp: now,
|
|
168
168
|
yes: 2,
|
|
169
169
|
no: 2,
|
|
170
170
|
},
|
|
@@ -172,7 +172,7 @@ test('should only include last hour of metrics return toggle summary', async ()
|
|
|
172
172
|
featureName: 'demo',
|
|
173
173
|
appName: 'web',
|
|
174
174
|
environment: 'default',
|
|
175
|
-
timestamp:
|
|
175
|
+
timestamp: now,
|
|
176
176
|
yes: 3,
|
|
177
177
|
no: 2,
|
|
178
178
|
},
|
|
@@ -180,7 +180,7 @@ test('should only include last hour of metrics return toggle summary', async ()
|
|
|
180
180
|
featureName: 'demo',
|
|
181
181
|
appName: 'web',
|
|
182
182
|
environment: 'test',
|
|
183
|
-
timestamp:
|
|
183
|
+
timestamp: now,
|
|
184
184
|
yes: 1,
|
|
185
185
|
no: 3,
|
|
186
186
|
},
|
|
@@ -188,7 +188,7 @@ test('should only include last hour of metrics return toggle summary', async ()
|
|
|
188
188
|
featureName: 'demo',
|
|
189
189
|
appName: 'backend-api',
|
|
190
190
|
environment: 'test',
|
|
191
|
-
timestamp:
|
|
191
|
+
timestamp: now,
|
|
192
192
|
yes: 1,
|
|
193
193
|
no: 3,
|
|
194
194
|
},
|
|
@@ -196,7 +196,7 @@ test('should only include last hour of metrics return toggle summary', async ()
|
|
|
196
196
|
featureName: 'demo',
|
|
197
197
|
appName: 'backend-api',
|
|
198
198
|
environment: 'test',
|
|
199
|
-
timestamp:
|
|
199
|
+
timestamp: dateOneHourAgo,
|
|
200
200
|
yes: 55,
|
|
201
201
|
no: 55,
|
|
202
202
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-metrics.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/admin/client-metrics.e2e.test.ts"],"names":[],"mappings":";;;;;AAAA,gFAA8D;AAC9D,2DAAqE;AACrE,4EAAoD;
|
|
1
|
+
{"version":3,"file":"client-metrics.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/admin/client-metrics.e2e.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const database_init_1 = __importDefault(require("../../helpers/database-init"));
|
|
7
|
+
const test_helper_1 = require("../../helpers/test-helper");
|
|
8
|
+
const no_logger_1 = __importDefault(require("../../../fixtures/no-logger"));
|
|
9
|
+
const simple_auth_settings_1 = require("../../../../lib/types/settings/simple-auth-settings");
|
|
10
|
+
let db;
|
|
11
|
+
let app;
|
|
12
|
+
beforeAll(async () => {
|
|
13
|
+
db = await (0, database_init_1.default)('config_api_serial', no_logger_1.default);
|
|
14
|
+
app = await (0, test_helper_1.setupApp)(db.stores);
|
|
15
|
+
});
|
|
16
|
+
afterAll(async () => {
|
|
17
|
+
await app.destroy();
|
|
18
|
+
await db.destroy();
|
|
19
|
+
});
|
|
20
|
+
test('gets ui config', async () => {
|
|
21
|
+
const { body } = await app.request
|
|
22
|
+
.get('/api/admin/ui-config')
|
|
23
|
+
.expect('Content-Type', /json/)
|
|
24
|
+
.expect(200);
|
|
25
|
+
expect(body.unleashUrl).toBe('http://localhost:4242');
|
|
26
|
+
expect(body.version).toBeDefined();
|
|
27
|
+
});
|
|
28
|
+
test('gets ui config with disablePasswordAuth', async () => {
|
|
29
|
+
await db.stores.settingStore.insert(simple_auth_settings_1.simpleAuthKey, { disabled: true });
|
|
30
|
+
const { body } = await app.request
|
|
31
|
+
.get('/api/admin/ui-config')
|
|
32
|
+
.expect('Content-Type', /json/)
|
|
33
|
+
.expect(200);
|
|
34
|
+
expect(body.disablePasswordAuth).toBe(true);
|
|
35
|
+
});
|
|
36
|
+
//# sourceMappingURL=config.e2e.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/admin/config.e2e.test.ts"],"names":[],"mappings":";;;;;AAAA,gFAA8D;AAC9D,2DAAqD;AACrD,4EAAoD;AACpD,8FAAoF;AAEpF,IAAI,EAAW,CAAC;AAChB,IAAI,GAAG,CAAC;AAER,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,EAAE,GAAG,MAAM,IAAA,uBAAM,EAAC,mBAAmB,EAAE,mBAAS,CAAC,CAAC;IAClD,GAAG,GAAG,MAAM,IAAA,sBAAQ,EAAC,EAAE,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;IAChB,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;IAC9B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,OAAO;SAC7B,GAAG,CAAC,sBAAsB,CAAC;SAC3B,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;SAC9B,MAAM,CAAC,GAAG,CAAC,CAAC;IAEjB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACtD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;AACvC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;IACvD,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,oCAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACvE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,OAAO;SAC7B,GAAG,CAAC,sBAAsB,CAAC;SAC3B,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC;SAC9B,MAAM,CAAC,GAAG,CAAC,CAAC;IAEjB,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChD,CAAC,CAAC,CAAC"}
|
|
@@ -17,7 +17,7 @@ test('creates new feature toggle with createdBy', async () => {
|
|
|
17
17
|
expect.assertions(1);
|
|
18
18
|
const { request, destroy } = await (0, test_helper_1.setupAppWithAuth)(db.stores);
|
|
19
19
|
// Login
|
|
20
|
-
await request.post('/
|
|
20
|
+
await request.post('/auth/demo/login').send({
|
|
21
21
|
email: 'user@mail.com',
|
|
22
22
|
});
|
|
23
23
|
// create toggle
|
|
@@ -24,7 +24,7 @@ test('should require authenticated user', async () => {
|
|
|
24
24
|
app.use('/api/admin/', (req, res) => res
|
|
25
25
|
.status('401')
|
|
26
26
|
.json(new authentication_required_1.default({
|
|
27
|
-
path: '/
|
|
27
|
+
path: '/auth/demo/login',
|
|
28
28
|
type: 'custom',
|
|
29
29
|
message: 'You have to identify yourself.',
|
|
30
30
|
}))
|
|
@@ -862,7 +862,7 @@ test('Deleting a strategy should include name of feature strategy was deleted fr
|
|
|
862
862
|
type: events_1.FEATURE_STRATEGY_REMOVE,
|
|
863
863
|
});
|
|
864
864
|
expect(events).toHaveLength(1);
|
|
865
|
-
expect(events[0].data.
|
|
865
|
+
expect(events[0].data.name).toBe(featureName);
|
|
866
866
|
expect(events[0].environment).toBe(environment);
|
|
867
867
|
expect(events[0].data.id).toBe(strategyId);
|
|
868
868
|
});
|