unleash-server 4.2.0-beta.8 → 4.2.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/addons/addon.d.ts +2 -1
- package/dist/lib/addons/addon.js.map +1 -1
- package/dist/lib/addons/datadog.d.ts +4 -17
- package/dist/lib/addons/datadog.js +3 -109
- package/dist/lib/addons/datadog.js.map +1 -1
- package/dist/lib/addons/datadog.test.js +3 -0
- package/dist/lib/addons/datadog.test.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 +116 -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 +3 -12
- package/dist/lib/addons/slack.js +5 -110
- package/dist/lib/addons/slack.js.map +1 -1
- package/dist/lib/addons/slack.test.js +8 -0
- package/dist/lib/addons/slack.test.js.map +1 -1
- package/dist/lib/addons/teams.d.ts +4 -17
- package/dist/lib/addons/teams.js +7 -109
- package/dist/lib/addons/teams.js.map +1 -1
- package/dist/lib/addons/teams.test.js +3 -0
- package/dist/lib/addons/teams.test.js.map +1 -1
- package/dist/lib/addons/webhook.d.ts +8 -2
- package/dist/lib/addons/webhook.js +0 -1
- package/dist/lib/addons/webhook.js.map +1 -1
- package/dist/lib/addons/webhook.test.js +2 -0
- package/dist/lib/addons/webhook.test.js.map +1 -1
- package/dist/lib/create-config.js +6 -5
- package/dist/lib/create-config.js.map +1 -1
- package/dist/lib/db/client-instance-store.js +2 -2
- package/dist/lib/db/client-instance-store.js.map +1 -1
- package/dist/lib/db/client-metrics-db.js +2 -2
- package/dist/lib/db/client-metrics-db.js.map +1 -1
- package/dist/lib/db/client-metrics-store-v2.js +5 -1
- package/dist/lib/db/client-metrics-store-v2.js.map +1 -1
- package/dist/lib/db/client-metrics-store.js +2 -2
- package/dist/lib/db/client-metrics-store.js.map +1 -1
- package/dist/lib/db/event-store.d.ts +10 -6
- package/dist/lib/db/event-store.js +21 -1
- package/dist/lib/db/event-store.js.map +1 -1
- package/dist/lib/db/session-store.js +2 -1
- package/dist/lib/db/session-store.js.map +1 -1
- package/dist/lib/error/minimum-one-environment-error.d.ts +5 -0
- package/dist/lib/error/minimum-one-environment-error.js +24 -0
- package/dist/lib/error/minimum-one-environment-error.js.map +1 -0
- package/dist/lib/metrics.js +20 -12
- package/dist/lib/metrics.js.map +1 -1
- package/dist/lib/metrics.test.js +1 -0
- package/dist/lib/metrics.test.js.map +1 -1
- package/dist/lib/middleware/rbac-middleware.js +2 -17
- package/dist/lib/middleware/rbac-middleware.js.map +1 -1
- package/dist/lib/middleware/rbac-middleware.test.js +2 -21
- package/dist/lib/middleware/rbac-middleware.test.js.map +1 -1
- package/dist/lib/middleware/secure-headers.js +2 -1
- package/dist/lib/middleware/secure-headers.js.map +1 -1
- package/dist/lib/middleware/session-db.js +2 -3
- package/dist/lib/middleware/session-db.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/event.d.ts +8 -4
- package/dist/lib/routes/admin-api/event.js +8 -10
- package/dist/lib/routes/admin-api/event.js.map +1 -1
- package/dist/lib/routes/admin-api/feature.d.ts +2 -3
- package/dist/lib/routes/admin-api/feature.js +37 -34
- package/dist/lib/routes/admin-api/feature.js.map +1 -1
- package/dist/lib/routes/admin-api/project/features.js +11 -8
- package/dist/lib/routes/admin-api/project/features.js.map +1 -1
- package/dist/lib/routes/admin-api/state.js +2 -3
- package/dist/lib/routes/admin-api/state.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/client-api/feature.test.js +3 -2
- package/dist/lib/routes/client-api/feature.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/routes/util.js +2 -0
- package/dist/lib/routes/util.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/addon-service-test-simple-addon.d.ts +1 -1
- package/dist/lib/services/addon-service-test-simple-addon.js.map +1 -1
- package/dist/lib/services/addon-service.js +2 -2
- package/dist/lib/services/addon-service.js.map +1 -1
- package/dist/lib/services/api-token-service.js +2 -2
- package/dist/lib/services/api-token-service.js.map +1 -1
- package/dist/lib/services/client-metrics/client-metrics-service-v2.js +3 -5
- package/dist/lib/services/client-metrics/client-metrics-service-v2.js.map +1 -1
- package/dist/lib/services/client-metrics/client-metrics.test.js +74 -41
- package/dist/lib/services/client-metrics/client-metrics.test.js.map +1 -1
- package/dist/lib/services/client-metrics/index.d.ts +6 -5
- package/dist/lib/services/client-metrics/index.js +13 -10
- package/dist/lib/services/client-metrics/index.js.map +1 -1
- package/dist/lib/services/client-metrics/list.d.ts +19 -16
- package/dist/lib/services/client-metrics/list.js +6 -4
- package/dist/lib/services/client-metrics/list.js.map +1 -1
- package/dist/lib/services/client-metrics/list.test.js +9 -5
- package/dist/lib/services/client-metrics/list.test.js.map +1 -1
- package/dist/lib/services/client-metrics/ttl-list.d.ts +20 -13
- package/dist/lib/services/client-metrics/ttl-list.js +26 -15
- package/dist/lib/services/client-metrics/ttl-list.js.map +1 -1
- package/dist/lib/services/client-metrics/ttl-list.test.js +33 -9
- package/dist/lib/services/client-metrics/ttl-list.test.js.map +1 -1
- package/dist/lib/services/environment-service.d.ts +2 -1
- package/dist/lib/services/environment-service.js +10 -3
- package/dist/lib/services/environment-service.js.map +1 -1
- package/dist/lib/services/event-service.d.ts +1 -1
- package/dist/lib/services/event-service.js +1 -1
- package/dist/lib/services/event-service.js.map +1 -1
- package/dist/lib/services/feature-tag-service.js +7 -11
- package/dist/lib/services/feature-tag-service.js.map +1 -1
- package/dist/lib/services/{feature-toggle-service-v2.d.ts → feature-toggle-service.d.ts} +29 -19
- package/dist/lib/services/{feature-toggle-service-v2.js → feature-toggle-service.js} +177 -145
- package/dist/lib/services/feature-toggle-service.js.map +1 -0
- package/dist/lib/services/index.js +5 -3
- package/dist/lib/services/index.js.map +1 -1
- package/dist/lib/services/project-health-service.d.ts +2 -2
- package/dist/lib/services/project-health-service.js +3 -3
- package/dist/lib/services/project-health-service.js.map +1 -1
- package/dist/lib/services/project-service.d.ts +2 -2
- package/dist/lib/services/project-service.js +5 -3
- package/dist/lib/services/project-service.js.map +1 -1
- package/dist/lib/services/reset-token-service.js +2 -2
- package/dist/lib/services/reset-token-service.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/state-util.js +1 -1
- package/dist/lib/services/state-util.js.map +1 -1
- package/dist/lib/services/user-service.d.ts +6 -2
- package/dist/lib/services/user-service.js +43 -21
- 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/services/version-service.js +2 -2
- package/dist/lib/services/version-service.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/events.d.ts +165 -2
- package/dist/lib/types/events.js +124 -4
- package/dist/lib/types/events.js.map +1 -1
- package/dist/lib/types/model.d.ts +0 -12
- package/dist/lib/types/model.js.map +1 -1
- package/dist/lib/types/services.d.ts +3 -2
- 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/event-store.d.ts +4 -3
- package/dist/lib/types/stores/settings-store.d.ts +1 -1
- package/dist/lib/util/constants.d.ts +0 -2
- package/dist/lib/util/constants.js +1 -3
- package/dist/lib/util/constants.js.map +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/migrations/20211105104316-add-feature-name-column-to-events.d.ts +2 -0
- package/dist/migrations/20211105104316-add-feature-name-column-to-events.js +16 -0
- package/dist/migrations/20211105104316-add-feature-name-column-to-events.js.map +1 -0
- package/dist/migrations/20211105105509-add-predata-column-to-events.d.ts +2 -0
- package/dist/migrations/20211105105509-add-predata-column-to-events.js +8 -0
- package/dist/migrations/20211105105509-add-predata-column-to-events.js.map +1 -0
- package/dist/migrator.js +9 -2
- package/dist/migrator.js.map +1 -1
- package/dist/test/e2e/api/admin/client-metrics.e2e.test.js +16 -12
- package/dist/test/e2e/api/admin/client-metrics.e2e.test.js.map +1 -1
- package/dist/{lib/event-differ.test.d.ts → test/e2e/api/admin/config.e2e.test.d.ts} +0 -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-archive.e2e.test.js +1 -2
- package/dist/test/e2e/api/admin/feature-archive.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/feature.e2e.test.js +19 -2
- package/dist/test/e2e/api/admin/feature.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/metrics.e2e.test.js +5 -3
- package/dist/test/e2e/api/admin/metrics.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/environments.e2e.test.js +10 -0
- package/dist/test/e2e/api/admin/project/environments.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/features.e2e.test.js +120 -8
- package/dist/test/e2e/api/admin/project/features.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/state.e2e.test.js +17 -13
- package/dist/test/e2e/api/admin/state.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/user-admin.e2e.test.js +18 -17
- package/dist/test/e2e/api/admin/user-admin.e2e.test.js.map +1 -1
- 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/api/client/feature.env.disabled.e2e.test.js +8 -4
- package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/feature.token.access.e2e.test.js +4 -4
- package/dist/test/e2e/api/client/feature.token.access.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/register.e2e.test.js +1 -1
- package/dist/test/e2e/api/client/register.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/addon-service.e2e.test.js +1 -1
- package/dist/test/e2e/services/addon-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/api-token-service.e2e.test.js +5 -3
- package/dist/test/e2e/services/api-token-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/client-metrics-service.e2e.test.js +5 -2
- package/dist/test/e2e/services/client-metrics-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/environment-service.test.js +1 -1
- package/dist/test/e2e/services/environment-service.test.js.map +1 -1
- package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js +14 -11
- package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/project-health-service.e2e.test.js +2 -2
- package/dist/test/e2e/services/project-health-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/project-service.e2e.test.js +2 -2
- package/dist/test/e2e/services/project-service.e2e.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/session-service.e2e.test.js +5 -4
- package/dist/test/e2e/services/session-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/user-service.e2e.test.js +18 -2
- 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 -6
- package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js.map +1 -1
- package/dist/test/e2e/stores/event-store.e2e.test.js +1 -1
- package/dist/test/e2e/stores/event-store.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-event-store.d.ts +2 -1
- package/dist/test/fixtures/fake-event-store.js +3 -0
- package/dist/test/fixtures/fake-event-store.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/docs/api/oas/openapi.yaml +35 -55
- package/package.json +11 -12
- package/dist/lib/event-differ.d.ts +0 -1
- package/dist/lib/event-differ.js +0 -117
- package/dist/lib/event-differ.js.map +0 -1
- package/dist/lib/event-differ.test.js +0 -142
- package/dist/lib/event-differ.test.js.map +0 -1
- package/dist/lib/services/feature-toggle-service-v2.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-health-service.js","sourceRoot":"","sources":["../../../src/lib/services/project-health-service.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"project-health-service.js","sourceRoot":"","sources":["../../../src/lib/services/project-health-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { IUnleashConfig } from '../types/option';
|
|
|
5
5
|
import { IProject, IProjectOverview, IProjectWithCount, IUserWithRole, FeatureToggle } from '../types/model';
|
|
6
6
|
import { IProjectQuery } from '../types/stores/project-store';
|
|
7
7
|
import { IRole } from '../types/stores/access-store';
|
|
8
|
-
import
|
|
8
|
+
import FeatureToggleService from './feature-toggle-service';
|
|
9
9
|
export interface UsersWithRoles {
|
|
10
10
|
users: IUserWithRole[];
|
|
11
11
|
roles: IRole[];
|
|
@@ -21,7 +21,7 @@ export default class ProjectService {
|
|
|
21
21
|
private logger;
|
|
22
22
|
private featureToggleService;
|
|
23
23
|
private environmentsEnabled;
|
|
24
|
-
constructor({ projectStore, eventStore, featureToggleStore, featureTypeStore, environmentStore, featureEnvironmentStore, }: Pick<IUnleashStores, 'projectStore' | 'eventStore' | 'featureToggleStore' | 'featureTypeStore' | 'environmentStore' | 'featureEnvironmentStore'>, config: IUnleashConfig, accessService: AccessService, featureToggleService:
|
|
24
|
+
constructor({ projectStore, eventStore, featureToggleStore, featureTypeStore, environmentStore, featureEnvironmentStore, }: Pick<IUnleashStores, 'projectStore' | 'eventStore' | 'featureToggleStore' | 'featureTypeStore' | 'environmentStore' | 'featureEnvironmentStore'>, config: IUnleashConfig, accessService: AccessService, featureToggleService: FeatureToggleService);
|
|
25
25
|
getProjects(query?: IProjectQuery): Promise<IProjectWithCount[]>;
|
|
26
26
|
getProject(id: string): Promise<IProject>;
|
|
27
27
|
createProject(newProject: IProject, user: User): Promise<IProject>;
|
|
@@ -76,14 +76,15 @@ class ProjectService {
|
|
|
76
76
|
return data;
|
|
77
77
|
}
|
|
78
78
|
async updateProject(updatedProject, user) {
|
|
79
|
-
await this.store.get(updatedProject.id);
|
|
79
|
+
const preData = await this.store.get(updatedProject.id);
|
|
80
80
|
const project = await project_schema_1.projectSchema.validateAsync(updatedProject);
|
|
81
81
|
await this.store.update(project);
|
|
82
82
|
await this.eventStore.store({
|
|
83
83
|
type: events_1.PROJECT_UPDATED,
|
|
84
|
+
project: project.id,
|
|
84
85
|
createdBy: getCreatedBy(user),
|
|
85
86
|
data: project,
|
|
86
|
-
|
|
87
|
+
preData,
|
|
87
88
|
});
|
|
88
89
|
}
|
|
89
90
|
async checkProjectsCompatibility(feature, newProjectId) {
|
|
@@ -130,7 +131,6 @@ class ProjectService {
|
|
|
130
131
|
type: events_1.PROJECT_DELETED,
|
|
131
132
|
createdBy: getCreatedBy(user),
|
|
132
133
|
project: id,
|
|
133
|
-
data: { id },
|
|
134
134
|
});
|
|
135
135
|
await this.accessService.removeDefaultProjectRoles(user, id);
|
|
136
136
|
}
|
|
@@ -153,6 +153,7 @@ class ProjectService {
|
|
|
153
153
|
users,
|
|
154
154
|
};
|
|
155
155
|
}
|
|
156
|
+
// TODO: should be an event too
|
|
156
157
|
async addUser(projectId, roleId, userId) {
|
|
157
158
|
const [roles, users] = await this.accessService.getProjectRoleUsers(projectId);
|
|
158
159
|
const role = roles.find((r) => r.id === roleId);
|
|
@@ -165,6 +166,7 @@ class ProjectService {
|
|
|
165
166
|
}
|
|
166
167
|
await this.accessService.addUserToRole(userId, role.id);
|
|
167
168
|
}
|
|
169
|
+
// TODO: should be an event too
|
|
168
170
|
async removeUser(projectId, roleId, userId) {
|
|
169
171
|
const roles = await this.accessService.getRolesForProject(projectId);
|
|
170
172
|
const role = roles.find((r) => r.id === roleId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-service.js","sourceRoot":"","sources":["../../../src/lib/services/project-service.ts"],"names":[],"mappings":";;;;;AAEA,mFAAyD;AACzD,+FAAqE;AACrE,yCAA0C;AAC1C,qDAAiD;AACjD,6EAAoD;AACpD,4CAIyB;AAGzB,0CAOwB;AASxB,sDAAsE;AACtE,+EAAqD;AACrD,qGAA2E;AAE3E,MAAM,YAAY,GAAG,CAAC,IAAU,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC;AAEjE,MAAM,eAAe,GAAG,SAAS,CAAC;AAOlC,MAAqB,cAAc;IAqB/B,YACI,EACI,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,uBAAuB,GAS1B,EACD,MAAsB,EACtB,aAA4B,EAC5B,
|
|
1
|
+
{"version":3,"file":"project-service.js","sourceRoot":"","sources":["../../../src/lib/services/project-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const bcrypt_1 = __importDefault(require("bcrypt"));
|
|
|
8
8
|
const url_1 = require("url");
|
|
9
9
|
const used_token_error_1 = __importDefault(require("../error/used-token-error"));
|
|
10
10
|
const invalid_token_error_1 = __importDefault(require("../error/invalid-token-error"));
|
|
11
|
-
const
|
|
11
|
+
const date_fns_1 = require("date-fns");
|
|
12
12
|
class ResetTokenService {
|
|
13
13
|
constructor({ resetTokenStore }, { getLogger, server }) {
|
|
14
14
|
this.store = resetTokenStore;
|
|
@@ -67,7 +67,7 @@ class ResetTokenService {
|
|
|
67
67
|
const path = '/new-user';
|
|
68
68
|
return this.createResetUrl(forUser, creator, path);
|
|
69
69
|
}
|
|
70
|
-
async createToken(tokenUser, creator, expiryDelta =
|
|
70
|
+
async createToken(tokenUser, creator, expiryDelta = (0, date_fns_1.hoursToMilliseconds)(24)) {
|
|
71
71
|
const token = await this.generateToken();
|
|
72
72
|
const expiry = new Date(Date.now() + expiryDelta);
|
|
73
73
|
await this.store.expireExistingTokensForUser(tokenUser);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset-token-service.js","sourceRoot":"","sources":["../../../src/lib/services/reset-token-service.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,oDAA4B;AAC5B,6BAA0B;AAE1B,iFAAuD;AACvD,uFAA6D;
|
|
1
|
+
{"version":3,"file":"reset-token-service.js","sourceRoot":"","sources":["../../../src/lib/services/reset-token-service.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"}
|
|
@@ -25,7 +25,7 @@ const mime = __importStar(require("mime"));
|
|
|
25
25
|
const YAML = __importStar(require("js-yaml"));
|
|
26
26
|
const readFile = (file) => new Promise((resolve, reject) => fs.readFile(file, (err, v) => err ? reject(err) : resolve(v.toString('utf-8'))));
|
|
27
27
|
exports.readFile = readFile;
|
|
28
|
-
const parseFile = (file, data) => (mime.
|
|
28
|
+
const parseFile = (file, data) => (mime.getType(file) === 'text/yaml' ? YAML.load(data) : JSON.parse(data));
|
|
29
29
|
exports.parseFile = parseFile;
|
|
30
30
|
const filterExisting = (keepExisting, existingArray = []) => (item) => {
|
|
31
31
|
if (keepExisting) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-util.js","sourceRoot":"","sources":["../../../src/lib/services/state-util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,8CAAgC;AAEzB,MAAM,QAAQ,GAAsC,CAAC,IAAI,EAAE,EAAE,CAChE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC5B,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CACzB,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CACnD,CACJ,CAAC;AALO,QAAA,QAAQ,YAKf;AAEC,MAAM,SAAS,GAAwC,CAC1D,IAAY,EACZ,IAAY,EACd,EAAE,CAAC,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"state-util.js","sourceRoot":"","sources":["../../../src/lib/services/state-util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,8CAAgC;AAEzB,MAAM,QAAQ,GAAsC,CAAC,IAAI,EAAE,EAAE,CAChE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAC5B,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CACzB,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CACnD,CACJ,CAAC;AALO,QAAA,QAAQ,YAKf;AAEC,MAAM,SAAS,GAAwC,CAC1D,IAAY,EACZ,IAAY,EACd,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;AAHlE,QAAA,SAAS,aAGyD;AAExE,MAAM,cAAc,GAIvB,CAAC,YAAY,EAAE,aAAa,GAAG,EAAE,EAAE,EAAE,CACrC,CAAC,IAAI,EAAE,EAAE;IACL,IAAI,YAAY,EAAE;QACd,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,OAAO,CAAC,KAAK,CAAC;KACjB;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAXO,QAAA,cAAc,kBAWrB;AAEC,MAAM,WAAW,GACpB,CAAC,aAAa,GAAG,EAAE,EAAE,EAAE,CACvB,CAAC,IAAI,EAAE,EAAE;IACL,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,IAAI,MAAM,EAAE;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;KAC1D;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AARO,QAAA,WAAW,eAQlB"}
|
|
@@ -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>;
|
|
@@ -62,8 +65,10 @@ declare class UserService {
|
|
|
62
65
|
search(query: IUserSearch): Promise<IUser[]>;
|
|
63
66
|
getByEmail(email: string): Promise<IUser>;
|
|
64
67
|
createUser({ username, email, name, password, rootRole }: ICreateUser, updatedBy?: User): Promise<IUser>;
|
|
65
|
-
private
|
|
68
|
+
private getCreatedBy;
|
|
69
|
+
private mapUserToData;
|
|
66
70
|
updateUser({ id, name, email, rootRole }: IUpdateUser, updatedBy?: User): Promise<IUser>;
|
|
71
|
+
deleteUser(userId: number, updatedBy?: User): Promise<void>;
|
|
67
72
|
loginUser(usernameOrEmail: string, password: string): Promise<IUser>;
|
|
68
73
|
/**
|
|
69
74
|
* Used to login users without specifying password. Used when integrating
|
|
@@ -76,7 +81,6 @@ declare class UserService {
|
|
|
76
81
|
loginUserWithoutPassword(email: string, autoCreateUser?: boolean): Promise<IUser>;
|
|
77
82
|
loginUserSSO({ email, name, rootRole, autoCreate, }: ILoginUserRequest): Promise<IUser>;
|
|
78
83
|
changePassword(userId: number, password: string): Promise<void>;
|
|
79
|
-
deleteUser(userId: number, updatedBy?: User): Promise<void>;
|
|
80
84
|
getUserForToken(token: string): Promise<ITokenUser>;
|
|
81
85
|
/**
|
|
82
86
|
* If the password is a strong password will update password and delete all sessions for the user we're changing the password for
|
|
@@ -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
|
}
|
|
@@ -105,33 +107,61 @@ class UserService {
|
|
|
105
107
|
const passwordHash = await bcrypt_1.default.hash(password, saltRounds);
|
|
106
108
|
await this.store.setPasswordHash(user.id, passwordHash);
|
|
107
109
|
}
|
|
108
|
-
await this.updateChangeLog(events_1.USER_CREATED, user, updatedBy);
|
|
109
|
-
return user;
|
|
110
|
-
}
|
|
111
|
-
async updateChangeLog(type, user, updatedBy = systemUser) {
|
|
112
110
|
await this.eventStore.store({
|
|
113
|
-
type,
|
|
114
|
-
createdBy:
|
|
115
|
-
data:
|
|
116
|
-
id: user.id,
|
|
117
|
-
name: user.name,
|
|
118
|
-
username: user.username,
|
|
119
|
-
email: user.email,
|
|
120
|
-
},
|
|
111
|
+
type: events_1.USER_CREATED,
|
|
112
|
+
createdBy: this.getCreatedBy(updatedBy),
|
|
113
|
+
data: this.mapUserToData(user),
|
|
121
114
|
});
|
|
115
|
+
return user;
|
|
116
|
+
}
|
|
117
|
+
getCreatedBy(updatedBy = systemUser) {
|
|
118
|
+
return updatedBy.username || updatedBy.email;
|
|
119
|
+
}
|
|
120
|
+
mapUserToData(user) {
|
|
121
|
+
if (!user) {
|
|
122
|
+
return undefined;
|
|
123
|
+
}
|
|
124
|
+
return {
|
|
125
|
+
id: user.id,
|
|
126
|
+
name: user.name,
|
|
127
|
+
username: user.username,
|
|
128
|
+
email: user.email,
|
|
129
|
+
};
|
|
122
130
|
}
|
|
123
131
|
async updateUser({ id, name, email, rootRole }, updatedBy) {
|
|
124
132
|
if (email) {
|
|
125
133
|
joi_1.default.assert(email, joi_1.default.string().email(), 'Email');
|
|
126
134
|
}
|
|
135
|
+
const preUser = await this.store.get(id);
|
|
127
136
|
if (rootRole) {
|
|
128
137
|
await this.accessService.setUserRootRole(id, rootRole);
|
|
129
138
|
}
|
|
130
139
|
const user = await this.store.update(id, { name, email });
|
|
131
|
-
await this.
|
|
140
|
+
await this.eventStore.store({
|
|
141
|
+
type: events_1.USER_UPDATED,
|
|
142
|
+
createdBy: this.getCreatedBy(updatedBy),
|
|
143
|
+
data: this.mapUserToData(user),
|
|
144
|
+
preData: this.mapUserToData(preUser),
|
|
145
|
+
});
|
|
132
146
|
return user;
|
|
133
147
|
}
|
|
148
|
+
async deleteUser(userId, updatedBy) {
|
|
149
|
+
const user = await this.store.get(userId);
|
|
150
|
+
const roles = await this.accessService.getRolesForUser(userId);
|
|
151
|
+
await Promise.all(roles.map((role) => this.accessService.removeUserFromRole(userId, role.id)));
|
|
152
|
+
await this.sessionService.deleteSessionsForUser(userId);
|
|
153
|
+
await this.store.delete(userId);
|
|
154
|
+
await this.eventStore.store({
|
|
155
|
+
type: events_1.USER_DELETED,
|
|
156
|
+
createdBy: this.getCreatedBy(updatedBy),
|
|
157
|
+
preData: this.mapUserToData(user),
|
|
158
|
+
});
|
|
159
|
+
}
|
|
134
160
|
async loginUser(usernameOrEmail, password) {
|
|
161
|
+
const settings = await this.settingService.get(simple_auth_settings_1.simpleAuthKey);
|
|
162
|
+
if (settings && settings.disabled) {
|
|
163
|
+
throw new Error('Logging in with username/password has been disabled.');
|
|
164
|
+
}
|
|
135
165
|
const idQuery = (0, is_email_1.default)(usernameOrEmail)
|
|
136
166
|
? { email: usernameOrEmail }
|
|
137
167
|
: { username: usernameOrEmail };
|
|
@@ -185,14 +215,6 @@ class UserService {
|
|
|
185
215
|
const passwordHash = await bcrypt_1.default.hash(password, saltRounds);
|
|
186
216
|
return this.store.setPasswordHash(userId, passwordHash);
|
|
187
217
|
}
|
|
188
|
-
async deleteUser(userId, updatedBy) {
|
|
189
|
-
const user = await this.store.get(userId);
|
|
190
|
-
const roles = await this.accessService.getRolesForUser(userId);
|
|
191
|
-
await Promise.all(roles.map((role) => this.accessService.removeUserFromRole(userId, role.id)));
|
|
192
|
-
await this.sessionService.deleteSessionsForUser(userId);
|
|
193
|
-
await this.store.delete(userId);
|
|
194
|
-
await this.updateChangeLog(events_1.USER_DELETED, user, updatedBy);
|
|
195
|
-
}
|
|
196
218
|
async getUserForToken(token) {
|
|
197
219
|
const { createdBy, userId } = await this.resetTokenService.isValid(token);
|
|
198
220
|
const user = await this.getUser(userId);
|
|
@@ -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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"}
|
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
7
7
|
const version_1 = __importDefault(require("../util/version"));
|
|
8
|
-
const
|
|
8
|
+
const date_fns_1 = require("date-fns");
|
|
9
9
|
class VersionService {
|
|
10
10
|
constructor({ settingStore }, { getLogger, versionCheck, enterpriseVersion, }) {
|
|
11
11
|
this.logger = getLogger('lib/services/version-service.js');
|
|
@@ -22,7 +22,7 @@ class VersionService {
|
|
|
22
22
|
async setup() {
|
|
23
23
|
await this.setInstanceId();
|
|
24
24
|
await this.checkLatestVersion();
|
|
25
|
-
this.timer = setInterval(async () => this.checkLatestVersion(),
|
|
25
|
+
this.timer = setInterval(async () => this.checkLatestVersion(), (0, date_fns_1.hoursToMilliseconds)(48));
|
|
26
26
|
this.timer.unref();
|
|
27
27
|
}
|
|
28
28
|
async setInstanceId() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-service.js","sourceRoot":"","sources":["../../../src/lib/services/version-service.ts"],"names":[],"mappings":";;;;;AAAA,4DAA+B;AAG/B,8DAAsC;
|
|
1
|
+
{"version":3,"file":"version-service.js","sourceRoot":"","sources":["../../../src/lib/services/version-service.ts"],"names":[],"mappings":";;;;;AAAA,4DAA+B;AAG/B,8DAAsC;AAGtC,uCAA+C;AAc/C,MAAqB,cAAc;IAmB/B,YACI,EAAE,YAAY,EAAwC,EACtD,EACI,SAAS,EACT,YAAY,EACZ,iBAAiB,GAIpB;QAED,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,iCAAiC,CAAC,CAAC;QAC3D,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG;YACX,GAAG,EAAE,iBAAO;YACZ,UAAU,EAAE,iBAAiB,IAAI,EAAE;SACtC,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC;QACnC,IAAI,CAAC,eAAe,GAAG,YAAY,CAAC,GAAG,CAAC;QACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC3B,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,WAAW,CACpB,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,EACrC,IAAA,8BAAmB,EAAC,EAAE,CAAC,CAC1B,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,aAAa;QACf,IAAI;YACA,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC3D,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;SACxB;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;SACnD;IACL,CAAC;IAED,KAAK,CAAC,kBAAkB;QACpB,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,IAAI;gBACA,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAK,EAAC,IAAI,CAAC,eAAe,EAAE;oBAC1C,MAAM,EAAE,MAAM;oBACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;wBACjB,QAAQ,EAAE,IAAI,CAAC,OAAO;wBACtB,UAAU,EAAE,IAAI,CAAC,UAAU;qBAC9B,CAAC;oBACF,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;iBAClD,CAAC,CAAC;gBACH,IAAI,GAAG,CAAC,EAAE,EAAE;oBACR,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;oBAC9B,IAAI,CAAC,MAAM,GAAG;wBACV,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG;wBACtB,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU;qBACvC,CAAC;oBACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;iBAC/B;qBAAM;oBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,2CAA2C,GAAG,CAAC,MAAM,EAAE,CAC1D,CAAC;iBACL;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;aAC3D;SACJ;IACL,CAAC;IAED,cAAc;QACV,OAAO;YACH,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC;IACN,CAAC;IAED,OAAO;QACH,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;CACJ;AAvGD,iCAuGC;AAED,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC"}
|
|
@@ -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"}
|