unleash-server 4.2.0-beta.9 → 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/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 -32
- package/dist/lib/routes/admin-api/feature.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/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/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/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/auth/reset-password-controller.e2e.test.js +4 -0
- 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/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/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 +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-impl.js","sourceRoot":"","sources":["../../src/lib/server-impl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,0DAAuD;AACvD,+BAAiC;AACjC,6DAAqC;AACrC,0CAAwC;AACxC,gDAA2B;AAC3B,uCAAiD;AACjD,6BAAoC;AACpC,yCAA4C;AAC5C,mDAA+C;AAC/C,6CAA4C;AAC5C,iFAAgE;AAChE,0CAAwC;AACxC,yEAAgD;AAGhD,2CAA4E;
|
|
1
|
+
{"version":3,"file":"server-impl.js","sourceRoot":"","sources":["../../src/lib/server-impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ class ClientMetricsServiceV2 {
|
|
|
9
9
|
this.logger = getLogger('/services/client-metrics/index.ts');
|
|
10
10
|
this.bulkInterval = bulkInterval;
|
|
11
11
|
this.timer = setInterval(() => {
|
|
12
|
-
console.log('Clear metrics');
|
|
13
12
|
this.clientMetricsStoreV2.clearMetrics(48);
|
|
14
13
|
}, ONE_DAY);
|
|
15
14
|
this.timer.unref();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-metrics-service-v2.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/client-metrics-service-v2.ts"],"names":[],"mappings":";;AASA,mEAA8D;AAE9D,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AACnC,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEpC,MAAqB,sBAAsB;IASvC,YACI,EAAE,oBAAoB,EAAgD,EACtE,EAAE,SAAS,EAAqC,EAChD,YAAY,GAAG,YAAY;QAE3B,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QAEjD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,mCAAmC,CAAC,CAAC;QAE7D,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;YAC1B,
|
|
1
|
+
{"version":3,"file":"client-metrics-service-v2.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/client-metrics-service-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,15 +45,16 @@ const createServices = (stores, config) => {
|
|
|
45
45
|
const tagTypeService = new tag_type_service_1.default(stores, config);
|
|
46
46
|
const addonService = new addon_service_1.default(stores, config, tagTypeService);
|
|
47
47
|
const sessionService = new session_service_1.default(stores, config);
|
|
48
|
+
const settingService = new setting_service_1.default(stores, config);
|
|
48
49
|
const userService = new user_service_1.default(stores, config, {
|
|
49
50
|
accessService,
|
|
50
51
|
resetTokenService,
|
|
51
52
|
emailService,
|
|
52
53
|
sessionService,
|
|
54
|
+
settingService,
|
|
53
55
|
});
|
|
54
56
|
const versionService = new version_service_1.default(stores, config);
|
|
55
57
|
const healthService = new health_service_1.default(stores, config);
|
|
56
|
-
const settingService = new setting_service_1.default(stores, config);
|
|
57
58
|
const userFeedbackService = new user_feedback_service_1.default(stores, config);
|
|
58
59
|
const featureToggleServiceV2 = new feature_toggle_service_v2_1.default(stores, config);
|
|
59
60
|
const environmentService = new environment_service_1.default(stores, config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":";;;;;;AAGA,kFAAwD;AACxD,oEAA2C;AAC3C,sEAA6C;AAE7C,wEAA+C;AAC/C,oEAA2C;AAC3C,sEAAoD;AACpD,2GAAgF;AAChF,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,4FAAiE;AACjE,gFAAuD;AACvD,gFAAsD;AACtD,sFAA4D;AAErD,MAAM,cAAc,GAAG,CAC1B,MAAsB,EACtB,MAAsB,EACN,EAAE;IAClB,MAAM,aAAa,GAAG,IAAI,8BAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxD,MAAM,eAAe,GAAG,IAAI,mCAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5D,MAAM,oBAAoB,GAAG,IAAI,wBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtE,MAAM,sBAAsB,GAAG,IAAI,mCAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1E,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,WAAW,GAAG,IAAI,sBAAW,CAAC,MAAM,EAAE,MAAM,EAAE;QAChD,aAAa;QACb,iBAAiB;QACjB,YAAY;QACZ,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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export default class SettingService {
|
|
|
4
4
|
private logger;
|
|
5
5
|
private settingStore;
|
|
6
6
|
constructor({ settingStore }: Pick<IUnleashStores, 'settingStore'>, { getLogger }: Pick<IUnleashConfig, 'getLogger'>);
|
|
7
|
-
get(id: string): Promise<
|
|
7
|
+
get<T>(id: string): Promise<T>;
|
|
8
8
|
insert(id: string, value: object): Promise<void>;
|
|
9
9
|
delete(id: string): Promise<void>;
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting-service.js","sourceRoot":"","sources":["../../../src/lib/services/setting-service.ts"],"names":[],"mappings":";;AAKA,MAAqB,cAAc;IAK/B,YACI,EAAE,YAAY,EAAwC,EACtD,EAAE,SAAS,EAAqC;QAEhD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,6BAA6B,CAAC,CAAC;QACvD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"setting-service.js","sourceRoot":"","sources":["../../../src/lib/services/setting-service.ts"],"names":[],"mappings":";;AAKA,MAAqB,cAAc;IAK/B,YACI,EAAE,YAAY,EAAwC,EACtD,EAAE,SAAS,EAAqC;QAEhD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,6BAA6B,CAAC,CAAC;QACvD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,GAAG,CAAI,EAAU;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAa;QAClC,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;CACJ;AAxBD,iCAwBC;AAED,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC"}
|
|
@@ -9,6 +9,7 @@ import SessionService from './session-service';
|
|
|
9
9
|
import { IUnleashStores } from '../types/stores';
|
|
10
10
|
import { IUserSearch } from '../types/stores/user-store';
|
|
11
11
|
import { RoleName } from '../types/model';
|
|
12
|
+
import SettingService from './setting-service';
|
|
12
13
|
export interface ICreateUser {
|
|
13
14
|
name?: string;
|
|
14
15
|
email?: string;
|
|
@@ -49,11 +50,13 @@ declare class UserService {
|
|
|
49
50
|
private resetTokenService;
|
|
50
51
|
private sessionService;
|
|
51
52
|
private emailService;
|
|
53
|
+
private settingService;
|
|
52
54
|
constructor(stores: Pick<IUnleashStores, 'userStore' | 'eventStore'>, { getLogger, authentication, }: Pick<IUnleashConfig, 'getLogger' | 'authentication'>, services: {
|
|
53
55
|
accessService: AccessService;
|
|
54
56
|
resetTokenService: ResetTokenService;
|
|
55
57
|
emailService: EmailService;
|
|
56
58
|
sessionService: SessionService;
|
|
59
|
+
settingService: SettingService;
|
|
57
60
|
});
|
|
58
61
|
validatePassword(password: string): boolean;
|
|
59
62
|
initAdminUser(): Promise<void>;
|
|
@@ -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":";;;;;AAAA,oDAA4B;AAC5B,oDAA4B;AAC5B,gGAAiD;AACjD,8CAAsB;AAItB,yDAA4C;AAC5C,gEAAuC;AAGvC,uFAA6D;AAC7D,6EAAoD;AACpD,6FAAmE;AAKnE,qFAAiE;AACjE,4CAA2E;AAG3E,0CAA0C;AAG1C,iFAAuE;AAEvE,MAAM,UAAU,GAAG,IAAI,cAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;AAsC5D,MAAM,UAAU,GAAG,EAAE,CAAC;AAEtB,MAAM,WAAW;IAiBb,YACI,MAAwD,EACxD,EACI,SAAS,EACT,cAAc,GACqC,EACvD,QAMC;QAED,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,yBAAyB,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;QACpD,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;QAC1C,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QAC9C,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;QAC9C,IAAI,cAAc,IAAI,cAAc,CAAC,eAAe,EAAE;YAClD,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SAChD;IACL,CAAC;IAED,gBAAgB,CAAC,QAAgB;QAC7B,IAAI,QAAQ,EAAE;YACV,MAAM,MAAM,GAAG,sCAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAChB,MAAM,IAAI,gCAAoB,CAAC,MAAM,CAAC,CAAC;aAC1C;;gBAAM,OAAO,IAAI,CAAC;SACtB;aAAM;YACH,MAAM,IAAI,4BAAsB,EAAE,CAAC;SACtC;IACL,CAAC;IAED,KAAK,CAAC,aAAa;QACf,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAE3C,IAAI,SAAS,KAAK,CAAC,EAAE;YACjB,4BAA4B;YAC5B,IAAI;gBACA,MAAM,GAAG,GAAG,aAAa,CAAC;gBAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,gDAAgD,GAAG,GAAG,CACzD,CAAC;gBACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;oBACjC,QAAQ,EAAE,OAAO;iBACpB,CAAC,CAAC;gBACH,MAAM,YAAY,GAAG,MAAM,gBAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;gBACxD,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;gBAExD,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACpC,IAAI,CAAC,EAAE,EACP,gBAAQ,CAAC,KAAK,CACjB,CAAC;aACL;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;aAC9D;SACJ;IACL,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACxC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CACpD,gBAAQ,CAAC,MAAM,CAClB,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAC;QACpE,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACtC,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3D,OAAO,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU;QACpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CACpD,gBAAQ,CAAC,MAAM,CAClB,CAAC;QACF,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtC,OAAO,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAkB;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAa;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,UAAU,CACZ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAe,EAC1D,SAAgB;QAEhB,gBAAM,CAAC,EAAE,CAAC,QAAQ,IAAI,KAAK,EAAE,oCAAoC,CAAC,CAAC;QAEnE,IAAI,KAAK,EAAE;YACP,aAAG,CAAC,MAAM,CAAC,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;SACpD;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7D,IAAI,MAAM,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YACjC,QAAQ;YACR,KAAK;YACL,IAAI;SACP,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAE5D,IAAI,QAAQ,EAAE;YACV,MAAM,YAAY,GAAG,MAAM,gBAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC7D,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;SAC3D;QAED,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAY,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAE1D,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,eAAe,CACzB,IAAY,EACZ,IAAW,EACX,YAAkB,UAAU;QAE5B,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YACxB,IAAI;YACJ,SAAS,EAAE,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,KAAK;YAChD,IAAI,EAAE;gBACF,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB;SACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,UAAU,CACZ,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAe,EAC1C,SAAgB;QAEhB,IAAI,KAAK,EAAE;YACP,aAAG,CAAC,MAAM,CAAC,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;SACpD;QAED,IAAI,QAAQ,EAAE;YACV,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;SAC1D;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAE1D,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAY,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAE1D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,eAAuB,EAAE,QAAgB;QACrD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAC1C,oCAAa,CAChB,CAAC;QAEF,IAAI,QAAQ,IAAI,QAAQ,CAAC,QAAQ,EAAE;YAC/B,MAAM,IAAI,KAAK,CACX,sDAAsD,CACzD,CAAC;SACL;QAED,MAAM,OAAO,GAAG,IAAA,kBAAO,EAAC,eAAe,CAAC;YACpC,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE;YAC5B,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE/D,MAAM,KAAK,GAAG,MAAM,gBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC3D,IAAI,KAAK,EAAE;YACP,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACzC,OAAO,IAAI,CAAC;SACf;QACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAClD,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,wBAAwB,CAC1B,KAAa,EACb,iBAA0B,KAAK;QAE/B,OAAO,IAAI,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EACf,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,UAAU,GAAG,KAAK,GACF;QAChB,IAAI,IAAW,CAAC;QAEhB,IAAI;YACA,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9C,uCAAuC;YACvC,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;gBAC5B,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;aAC5D;SACJ;QAAC,OAAO,CAAC,EAAE;YACR,0DAA0D;YAC1D,IAAI,UAAU,EAAE;gBACZ,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC;oBACzB,KAAK;oBACL,IAAI;oBACJ,QAAQ,EAAE,QAAQ,IAAI,gBAAQ,CAAC,MAAM;iBACxC,CAAC,CAAC;aACN;iBAAM;gBACH,MAAM,CAAC,CAAC;aACX;SACJ;QACD,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,QAAgB;QACjD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,YAAY,GAAG,MAAM,gBAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC7D,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,SAAgB;QAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC/D,MAAM,OAAO,CAAC,GAAG,CACb,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACf,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CACzD,CACJ,CAAC;QACF,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAExD,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEhC,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAY,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,KAAa;QAC/B,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAC9D,KAAK,CACR,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7D,OAAO;YACH,KAAK;YACL,SAAS;YACT,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE;gBACF,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;gBAClC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;gBACpB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;aACvB;SACJ,CAAC;IACN,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,QAAgB;QAC/C,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC;YACxD,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,KAAK;SACR,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACT,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC7C,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC5D;aAAM;YACH,MAAM,IAAI,6BAAiB,EAAE,CAAC;SACjC;IACL,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC1B,aAAqB,EACrB,OAAa,UAAU;QAEvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,IAAI,wBAAa,CAAC,kBAAkB,aAAa,EAAE,CAAC,CAAC;SAC9D;QACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CACjE,QAAQ,CAAC,EAAE,EACX,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAC9B,CAAC;QAEF,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CACjC,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,KAAK,EACd,SAAS,CAAC,QAAQ,EAAE,CACvB,CAAC;QACF,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC;AAC7B,kBAAe,WAAW,CAAC"}
|
|
@@ -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"}
|
|
@@ -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"}
|
|
@@ -15,6 +15,8 @@ const email_service_1 = require("../../../../lib/services/email-service");
|
|
|
15
15
|
const session_store_1 = __importDefault(require("../../../../lib/db/session-store"));
|
|
16
16
|
const session_service_1 = __importDefault(require("../../../../lib/services/session-service"));
|
|
17
17
|
const model_1 = require("../../../../lib/types/model");
|
|
18
|
+
const setting_service_1 = __importDefault(require("../../../../lib/services/setting-service"));
|
|
19
|
+
const fake_setting_store_1 = __importDefault(require("../../../fixtures/fake-setting-store"));
|
|
18
20
|
let app;
|
|
19
21
|
let stores;
|
|
20
22
|
let db;
|
|
@@ -47,11 +49,13 @@ beforeAll(async () => {
|
|
|
47
49
|
const emailService = new email_service_1.EmailService(config.email, config.getLogger);
|
|
48
50
|
const sessionStore = new session_store_1.default(db, new events_1.default(), config.getLogger);
|
|
49
51
|
const sessionService = new session_service_1.default({ sessionStore }, config);
|
|
52
|
+
const settingService = new setting_service_1.default({ settingStore: new fake_setting_store_1.default() }, config);
|
|
50
53
|
userService = new user_service_1.default(stores, config, {
|
|
51
54
|
accessService,
|
|
52
55
|
resetTokenService,
|
|
53
56
|
emailService,
|
|
54
57
|
sessionService,
|
|
58
|
+
settingService,
|
|
55
59
|
});
|
|
56
60
|
resetTokenService = new reset_token_service_1.default(stores, config);
|
|
57
61
|
const adminRole = await accessService.getRootRole(model_1.RoleName.ADMIN);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset-password-controller.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/auth/reset-password-controller.e2e.test.ts"],"names":[],"mappings":";;;;;AACA,oDAAkC;AAClC,6DAA+D;AAE/D,yFAAgE;AAChE,4EAAwE;AACxE,uGAA6E;AAE7E,2DAAuE;AACvE,gFAAiD;AACjD,4EAAoD;AACpD,0EAAsE;AACtE,qFAA4D;AAC5D,+FAAsE;AACtE,uDAAuD;
|
|
1
|
+
{"version":3,"file":"reset-password-controller.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/auth/reset-password-controller.e2e.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ beforeAll(async () => {
|
|
|
12
12
|
stores = db.stores;
|
|
13
13
|
});
|
|
14
14
|
test('Using custom auth type without defining custom middleware causes default DENY ALL policy to take effect', async () => {
|
|
15
|
-
|
|
15
|
+
jest.spyOn(global.console, 'error').mockImplementation(() => jest.fn());
|
|
16
16
|
const { request, destroy } = await (0, test_helper_1.setupAppWithCustomAuth)(stores, undefined);
|
|
17
17
|
await request
|
|
18
18
|
.get('/api/admin/features')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-auth.test.js","sourceRoot":"","sources":["../../../src/test/e2e/custom-auth.test.ts"],"names":[],"mappings":";;;;;AAAA,4EAA6C;AAC7C,uDAA+D;AAE/D,IAAI,EAAE,CAAC;AACP,IAAI,MAAM,CAAC;AAEX,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,EAAE,GAAG,MAAM,IAAA,uBAAM,EAAC,oBAAoB,CAAC,CAAC;IACxC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yGAAyG,EAAE,KAAK,IAAI,EAAE;IACvH,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"custom-auth.test.js","sourceRoot":"","sources":["../../../src/test/e2e/custom-auth.test.ts"],"names":[],"mappings":";;;;;AAAA,4EAA6C;AAC7C,uDAA+D;AAE/D,IAAI,EAAE,CAAC;AACP,IAAI,MAAM,CAAC;AAEX,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,EAAE,GAAG,MAAM,IAAA,uBAAM,EAAC,oBAAoB,CAAC,CAAC;IACxC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yGAAyG,EAAE,KAAK,IAAI,EAAE;IACvH,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACxE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,oCAAsB,EACrD,MAAM,EACN,SAAS,CACZ,CAAC;IACF,MAAM,OAAO;SACR,GAAG,CAAC,qBAAqB,CAAC;SAC1B,MAAM,CAAC,GAAG,CAAC;SACX,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QACZ,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CACvB,4IAA4I,CAC/I,CAAC;IACN,CAAC,CAAC,CAAC;IACP,MAAM,OAAO,EAAE,CAAC;AACpB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6EAA6E,EAAE,KAAK,IAAI,EAAE;IAC3F,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,oCAAsB,EAAC,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC5E,MAAM,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrD,MAAM,OAAO,EAAE,CAAC;AACpB,CAAC,CAAC,CAAC"}
|
|
@@ -12,6 +12,8 @@ const email_service_1 = require("../../../lib/services/email-service");
|
|
|
12
12
|
const test_config_1 = require("../../config/test-config");
|
|
13
13
|
const session_service_1 = __importDefault(require("../../../lib/services/session-service"));
|
|
14
14
|
const invalid_token_error_1 = __importDefault(require("../../../lib/error/invalid-token-error"));
|
|
15
|
+
const setting_service_1 = __importDefault(require("../../../lib/services/setting-service"));
|
|
16
|
+
const fake_setting_store_1 = __importDefault(require("../../fixtures/fake-setting-store"));
|
|
15
17
|
const config = (0, test_config_1.createTestConfig)();
|
|
16
18
|
let stores;
|
|
17
19
|
let db;
|
|
@@ -29,11 +31,13 @@ beforeAll(async () => {
|
|
|
29
31
|
resetTokenService = new reset_token_service_1.default(stores, config);
|
|
30
32
|
sessionService = new session_service_1.default(stores, config);
|
|
31
33
|
const emailService = new email_service_1.EmailService(undefined, config.getLogger);
|
|
34
|
+
const settingService = new setting_service_1.default({ settingStore: new fake_setting_store_1.default() }, config);
|
|
32
35
|
userService = new user_service_1.default(stores, config, {
|
|
33
36
|
accessService,
|
|
34
37
|
resetTokenService,
|
|
35
38
|
emailService,
|
|
36
39
|
sessionService,
|
|
40
|
+
settingService,
|
|
37
41
|
});
|
|
38
42
|
adminUser = await userService.createUser({
|
|
39
43
|
username: 'admin@test.com',
|