@lenne.tech/nest-server 8.6.5 → 8.6.6
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/core/common/decorators/restricted.decorator.js +4 -4
- package/dist/core/common/decorators/restricted.decorator.js.map +1 -1
- package/dist/core/common/helpers/file.helper.js +4 -7
- package/dist/core/common/helpers/file.helper.js.map +1 -1
- package/dist/core/common/helpers/filter.helper.d.ts +7 -0
- package/dist/core/common/helpers/filter.helper.js +38 -1
- package/dist/core/common/helpers/filter.helper.js.map +1 -1
- package/dist/core/common/helpers/input.helper.d.ts +6 -0
- package/dist/core/common/helpers/input.helper.js +28 -6
- package/dist/core/common/helpers/input.helper.js.map +1 -1
- package/dist/core/common/helpers/service.helper.js +3 -5
- package/dist/core/common/helpers/service.helper.js.map +1 -1
- package/dist/core/common/models/core-model.model.js +4 -1
- package/dist/core/common/models/core-model.model.js.map +1 -1
- package/dist/core/common/services/crud.service.js +9 -4
- package/dist/core/common/services/crud.service.js.map +1 -1
- package/dist/core/common/services/module.service.js +1 -1
- package/dist/core/common/services/module.service.js.map +1 -1
- package/dist/core/modules/auth/guards/roles.guard.js +2 -1
- package/dist/core/modules/auth/guards/roles.guard.js.map +1 -1
- package/dist/core/modules/user/core-user.service.js +9 -13
- package/dist/core/modules/user/core-user.service.js.map +1 -1
- package/dist/server/modules/user/user.model.d.ts +1 -1
- package/dist/server/modules/user/user.resolver.js +2 -1
- package/dist/server/modules/user/user.resolver.js.map +1 -1
- package/dist/test/test.helper.js +11 -25
- package/dist/test/test.helper.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +14 -14
- package/src/core/common/decorators/restricted.decorator.ts +1 -2
- package/src/core/common/helpers/file.helper.ts +9 -11
- package/src/core/common/helpers/filter.helper.ts +66 -1
- package/src/core/common/helpers/input.helper.ts +61 -2
- package/src/core/common/helpers/service.helper.ts +2 -6
- package/src/core/common/models/core-model.model.ts +4 -1
- package/src/core/common/services/crud.service.ts +7 -4
- package/src/core/common/services/module.service.ts +0 -1
- package/src/core/modules/auth/guards/roles.guard.ts +1 -1
- package/src/core/modules/user/core-user.service.ts +13 -22
- package/src/server/modules/user/user.resolver.ts +1 -1
- package/src/test/test.helper.ts +27 -34
|
@@ -35,7 +35,7 @@ const checkRestricted = (data, user, options = {}, processedObjects = []) => {
|
|
|
35
35
|
return result;
|
|
36
36
|
}
|
|
37
37
|
const validateRestricted = (restricted) => {
|
|
38
|
-
var _a, _b;
|
|
38
|
+
var _a, _b, _c;
|
|
39
39
|
let valid = true;
|
|
40
40
|
if (restricted === null || restricted === void 0 ? void 0 : restricted.length) {
|
|
41
41
|
valid = false;
|
|
@@ -56,9 +56,9 @@ const checkRestricted = (data, user, options = {}, processedObjects = []) => {
|
|
|
56
56
|
}
|
|
57
57
|
});
|
|
58
58
|
if (roles.length) {
|
|
59
|
-
if ((user === null || user === void 0 ? void 0 : user.hasRole(roles)) ||
|
|
59
|
+
if (((_a = user === null || user === void 0 ? void 0 : user.hasRole) === null || _a === void 0 ? void 0 : _a.call(user, roles)) ||
|
|
60
60
|
((user === null || user === void 0 ? void 0 : user.id) && roles.includes(role_enum_1.RoleEnum.S_USER)) ||
|
|
61
|
-
(roles.includes(role_enum_1.RoleEnum.S_CREATOR) && (0, db_helper_1.getIncludedIds)((
|
|
61
|
+
(roles.includes(role_enum_1.RoleEnum.S_CREATOR) && (0, db_helper_1.getIncludedIds)((_b = config.dbObject) === null || _b === void 0 ? void 0 : _b.createdBy, user))) {
|
|
62
62
|
valid = true;
|
|
63
63
|
}
|
|
64
64
|
}
|
|
@@ -77,7 +77,7 @@ const checkRestricted = (data, user, options = {}, processedObjects = []) => {
|
|
|
77
77
|
properties = [group.memberOf];
|
|
78
78
|
}
|
|
79
79
|
for (const property of properties) {
|
|
80
|
-
const items = (
|
|
80
|
+
const items = (_c = config.dbObject) === null || _c === void 0 ? void 0 : _c[property];
|
|
81
81
|
if (items) {
|
|
82
82
|
if (Array.isArray(items)) {
|
|
83
83
|
members.concat(items);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restricted.decorator.js","sourceRoot":"","sources":["../../../../src/core/common/decorators/restricted.decorator.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,2CAAuD;AAEvD,kDAA8C;AAC9C,oDAAsD;AAMtD,MAAM,iBAAiB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AA2BxC,MAAM,UAAU,GAAG,CAAC,GAAG,aAA6B,EAAsC,EAAE;IACjG,OAAO,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;AAC5D,CAAC,CAAC;AAFW,QAAA,UAAU,cAErB;AAKK,MAAM,aAAa,GAAG,CAAC,MAAe,EAAE,WAAoB,EAAkB,EAAE;IACrF,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;KACvD;IACD,OAAO,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;AACrE,CAAC,CAAC;AALW,QAAA,aAAa,iBAKxB;AAMK,MAAM,eAAe,GAAG,CAC7B,IAAS,EACT,IAAwD,EACxD,UAMI,EAAE,EACN,mBAA0B,EAAE,EAC5B,EAAE;;IACF,MAAM,MAAM,mBACV,eAAe,EAAE,IAAI,EACrB,8BAA8B,EAAE,IAAI,EACpC,UAAU,EAAE,IAAI,IACb,OAAO,CACX,CAAC;IAGF,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QACrC,OAAO,IAAI,CAAC;KACb;IAGD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACnC,OAAO,IAAI,CAAC;KACb;IACD,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAG5B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAEvB,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,uBAAe,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,8BAA8B,EAAE;YAC/D,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;SACtD;QACD,OAAO,MAAM,CAAC;KACf;IAGD,MAAM,kBAAkB,GAAG,CAAC,UAAU,EAAE,EAAE;;QACxC,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,EAAE;YACtB,KAAK,GAAG,KAAK,CAAC;YAGd,MAAM,KAAK,GAAa,EAAE,CAAC;YAC3B,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;;gBAC1B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;oBAC5B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAClB;qBAAM,IACL,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,0CAAE,MAAM;oBACnB,CAAC,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,KAAK,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,EACzF;oBACA,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;wBAC7B,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;qBAC3B;yBAAM;wBACL,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBACxB;iBACF;YACH,CAAC,CAAC,CAAC;YAGH,IAAI,KAAK,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"restricted.decorator.js","sourceRoot":"","sources":["../../../../src/core/common/decorators/restricted.decorator.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,17 +37,14 @@ function multerFileFilter(fileTypeRegex = /jpeg|jpg|png/) {
|
|
|
37
37
|
}
|
|
38
38
|
exports.multerFileFilter = multerFileFilter;
|
|
39
39
|
function multerOptionsForImageUpload(options) {
|
|
40
|
-
|
|
41
|
-
fileSize: 1024 * 1024,
|
|
42
|
-
fileTypeRegex: /jpeg|jpg|png/,
|
|
43
|
-
}, options);
|
|
40
|
+
const config = Object.assign({ fileSize: 1024 * 1024, fileTypeRegex: /jpeg|jpg|png/ }, options);
|
|
44
41
|
return {
|
|
45
|
-
fileFilter:
|
|
42
|
+
fileFilter: config.fileTypeRegex ? multerFileFilter(config.fileTypeRegex) : undefined,
|
|
46
43
|
limits: {
|
|
47
|
-
fileSize:
|
|
44
|
+
fileSize: config.fileSize ? config.fileSize : undefined,
|
|
48
45
|
},
|
|
49
46
|
storage: (0, multer_1.diskStorage)({
|
|
50
|
-
destination:
|
|
47
|
+
destination: config.destination ? config.destination : undefined,
|
|
51
48
|
filename: multerRandomFileName(),
|
|
52
49
|
}),
|
|
53
50
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/file.helper.ts"],"names":[],"mappings":";;;AACA,mCAAqC;AACrC,+BAA+B;AAM/B,MAAqB,UAAU;IAKtB,MAAM,CAAC,oBAAoB,CAAC,cAAc,GAAG,EAAE;QACpD,OAAO,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC9C,CAAC;IAKM,MAAM,CAAC,gBAAgB,CAAC,aAAa,GAAG,cAAc;QAC3D,OAAO,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACzC,CAAC;IAKM,MAAM,CAAC,2BAA2B,CAAC,OAIzC;QACC,OAAO,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;CACF;AA1BD,6BA0BC;AAMD,SAAgB,oBAAoB,CAAC,cAAc,GAAG,EAAE;IACtD,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;QAEvB,MAAM,UAAU,GAAG,KAAK,CAAC,cAAc,CAAC;aACrC,IAAI,CAAC,IAAI,CAAC;aACV,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;aACtD,IAAI,CAAC,EAAE,CAAC,CAAC;QAIZ,EAAE,CAAC,IAAI,EAAE,GAAG,UAAU,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC;AACJ,CAAC;AAZD,oDAYC;AAKD,SAAgB,gBAAgB,CAAC,aAAa,GAAG,cAAc;IAC7D,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;QACvB,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAE7E,IAAI,QAAQ,IAAI,OAAO,EAAE;YACvB,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACvB;QACD,EAAE,CAAC,6DAA6D,GAAG,aAAa,CAAC,CAAC;IACpF,CAAC,CAAC;AACJ,CAAC;AAVD,4CAUC;AAKD,SAAgB,2BAA2B,CAAC,OAI3C;IAEC,
|
|
1
|
+
{"version":3,"file":"file.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/file.helper.ts"],"names":[],"mappings":";;;AACA,mCAAqC;AACrC,+BAA+B;AAM/B,MAAqB,UAAU;IAKtB,MAAM,CAAC,oBAAoB,CAAC,cAAc,GAAG,EAAE;QACpD,OAAO,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC9C,CAAC;IAKM,MAAM,CAAC,gBAAgB,CAAC,aAAa,GAAG,cAAc;QAC3D,OAAO,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACzC,CAAC;IAKM,MAAM,CAAC,2BAA2B,CAAC,OAIzC;QACC,OAAO,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;CACF;AA1BD,6BA0BC;AAMD,SAAgB,oBAAoB,CAAC,cAAc,GAAG,EAAE;IACtD,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;QAEvB,MAAM,UAAU,GAAG,KAAK,CAAC,cAAc,CAAC;aACrC,IAAI,CAAC,IAAI,CAAC;aACV,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;aACtD,IAAI,CAAC,EAAE,CAAC,CAAC;QAIZ,EAAE,CAAC,IAAI,EAAE,GAAG,UAAU,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC;AACJ,CAAC;AAZD,oDAYC;AAKD,SAAgB,gBAAgB,CAAC,aAAa,GAAG,cAAc;IAC7D,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;QACvB,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAE7E,IAAI,QAAQ,IAAI,OAAO,EAAE;YACvB,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACvB;QACD,EAAE,CAAC,6DAA6D,GAAG,aAAa,CAAC,CAAC;IACpF,CAAC,CAAC;AACJ,CAAC;AAVD,4CAUC;AAKD,SAAgB,2BAA2B,CAAC,OAI3C;IAEC,MAAM,MAAM,mBACV,QAAQ,EAAE,IAAI,GAAG,IAAI,EACrB,aAAa,EAAE,cAAc,IAC1B,OAAO,CACX,CAAC;IAEF,OAAO;QAEL,UAAU,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS;QAGrF,MAAM,EAAE;YAEN,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;SACxD;QAID,OAAO,EAAE,IAAA,oBAAW,EAAC;YAInB,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;YAGhE,QAAQ,EAAE,oBAAoB,EAAE;SACjC,CAAC;KACH,CAAC;AACJ,CAAC;AAlCD,kEAkCC"}
|
|
@@ -6,6 +6,13 @@ export declare class Filter {
|
|
|
6
6
|
static generateFilterQuery<T = any>(filter?: Partial<FilterInput>): FilterQuery<T> | any;
|
|
7
7
|
static generateFindOptions<T = any>(filterArgs: Partial<FilterArgs>): QueryOptions;
|
|
8
8
|
}
|
|
9
|
+
export declare function findFilter(options?: {
|
|
10
|
+
conditions?: Record<string, any>[];
|
|
11
|
+
filterOptions?: FilterQuery<any>;
|
|
12
|
+
id?: any;
|
|
13
|
+
ids?: any[];
|
|
14
|
+
type?: '$and' | '$or' | '$nor';
|
|
15
|
+
}): FilterQuery<any>;
|
|
9
16
|
export declare function convertFilterArgsToQuery<T = any>(filterArgs: Partial<FilterArgs>): [FilterQuery<T>, QueryOptions];
|
|
10
17
|
export declare function generateFilterQuery<T = any>(filter?: Partial<FilterInput>): FilterQuery<T> | any;
|
|
11
18
|
export declare function generateFindOptions<T = any>(filterArgs: Partial<FilterArgs>): QueryOptions;
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.generateFindOptions = exports.generateFilterQuery = exports.convertFilterArgsToQuery = exports.Filter = void 0;
|
|
3
|
+
exports.generateFindOptions = exports.generateFilterQuery = exports.convertFilterArgsToQuery = exports.findFilter = exports.Filter = void 0;
|
|
4
4
|
const comparison_operator_enum_1 = require("../enums/comparison-operator.enum");
|
|
5
5
|
const logical_operator_enum_1 = require("../enums/logical-operator.enum");
|
|
6
|
+
const db_helper_1 = require("./db.helper");
|
|
7
|
+
const input_helper_1 = require("./input.helper");
|
|
6
8
|
class Filter {
|
|
7
9
|
static convertFilterArgsToQuery(filterArgs) {
|
|
8
10
|
return convertFilterArgsToQuery(filterArgs);
|
|
@@ -15,6 +17,41 @@ class Filter {
|
|
|
15
17
|
}
|
|
16
18
|
}
|
|
17
19
|
exports.Filter = Filter;
|
|
20
|
+
function findFilter(options) {
|
|
21
|
+
const config = Object.assign({ type: '$and' }, options);
|
|
22
|
+
let filterOptions = config === null || config === void 0 ? void 0 : config.filterOptions;
|
|
23
|
+
if (!filterOptions) {
|
|
24
|
+
filterOptions = {};
|
|
25
|
+
filterOptions[config.type] = [];
|
|
26
|
+
}
|
|
27
|
+
if (!Array.isArray(filterOptions === null || filterOptions === void 0 ? void 0 : filterOptions[config.type])) {
|
|
28
|
+
filterOptions = {};
|
|
29
|
+
filterOptions[config.type] = [config === null || config === void 0 ? void 0 : config.filterOptions];
|
|
30
|
+
}
|
|
31
|
+
if (config === null || config === void 0 ? void 0 : config.id) {
|
|
32
|
+
filterOptions[config.type].push({ _id: (0, db_helper_1.getObjectIds)(config.id) });
|
|
33
|
+
}
|
|
34
|
+
if (config === null || config === void 0 ? void 0 : config.ids) {
|
|
35
|
+
if (!Array.isArray(config.ids)) {
|
|
36
|
+
config.ids = [config.ids];
|
|
37
|
+
}
|
|
38
|
+
filterOptions[config.type].push({ _id: { $in: (0, db_helper_1.getObjectIds)(config.ids) } });
|
|
39
|
+
}
|
|
40
|
+
if (config === null || config === void 0 ? void 0 : config.conditions) {
|
|
41
|
+
filterOptions[config.type] = [...filterOptions[config.type], ...config.conditions];
|
|
42
|
+
}
|
|
43
|
+
filterOptions[config.type] = filterOptions[config.type].filter((value) => value);
|
|
44
|
+
if (!filterOptions[config.type].length) {
|
|
45
|
+
filterOptions = {};
|
|
46
|
+
}
|
|
47
|
+
else if (filterOptions[config.type].length === 1) {
|
|
48
|
+
const additionalProperties = filterOptions[config.type][0];
|
|
49
|
+
delete filterOptions[config.type];
|
|
50
|
+
(0, input_helper_1.assignPlain)(filterOptions, additionalProperties);
|
|
51
|
+
}
|
|
52
|
+
return filterOptions;
|
|
53
|
+
}
|
|
54
|
+
exports.findFilter = findFilter;
|
|
18
55
|
function convertFilterArgsToQuery(filterArgs) {
|
|
19
56
|
return [generateFilterQuery(filterArgs === null || filterArgs === void 0 ? void 0 : filterArgs.filter), generateFindOptions(filterArgs)];
|
|
20
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/filter.helper.ts"],"names":[],"mappings":";;;AAEA,gFAA2E;AAC3E,0EAAqE;
|
|
1
|
+
{"version":3,"file":"filter.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/filter.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ValidatorOptions } from 'class-validator/types/validation/ValidatorOptions';
|
|
1
2
|
import { ProcessType } from '../enums/process-type.enum';
|
|
2
3
|
export default class InputHelper {
|
|
3
4
|
static check(value: any, user: {
|
|
@@ -31,6 +32,7 @@ export default class InputHelper {
|
|
|
31
32
|
static returnFalse(): boolean;
|
|
32
33
|
static map<T>(values: Partial<T>, ctor: new () => T, cloneDeep?: boolean): T;
|
|
33
34
|
}
|
|
35
|
+
export declare function assignPlain(target: Record<any, any>, ...args: Record<any, any>[]): any;
|
|
34
36
|
export declare function check(value: any, user: {
|
|
35
37
|
id: any;
|
|
36
38
|
hasRole: (roles: string[]) => boolean;
|
|
@@ -40,8 +42,11 @@ export declare function check(value: any, user: {
|
|
|
40
42
|
processType?: ProcessType;
|
|
41
43
|
roles?: string | string[];
|
|
42
44
|
throwError?: boolean;
|
|
45
|
+
validatorOptions?: ValidatorOptions;
|
|
43
46
|
}): Promise<any>;
|
|
47
|
+
export declare function combinePlain(...args: Record<any, any>[]): any;
|
|
44
48
|
export declare function errorFunction(caller: (...params: any[]) => any, message?: string): void;
|
|
49
|
+
export declare function filterProperties<T = Record<string, any>>(obj: T, filterFunction: (value?: any, key?: string, obj?: T) => boolean): Partial<T>;
|
|
45
50
|
export declare function isArray(parameter: any, falseFunction?: (...params: any[]) => any): boolean;
|
|
46
51
|
export declare function isBasicType(metatype: any, falseFunction?: (...params: any[]) => any): boolean;
|
|
47
52
|
export declare function isBetween(parameter: number, min: number, max: number, falseFunction?: (...params: any[]) => any): boolean;
|
|
@@ -60,6 +65,7 @@ export declare function isObject(parameter: any, falseFunction?: (...params: any
|
|
|
60
65
|
export declare function isTrue(parameter: any, falseFunction?: (...params: any[]) => any): boolean;
|
|
61
66
|
export declare function isString(parameter: string, falseFunction?: (...params: any[]) => any): boolean;
|
|
62
67
|
export declare function returnFalse(): boolean;
|
|
68
|
+
export declare function match(expression: any, cases: Record<any, any>): any;
|
|
63
69
|
export declare function mapClass<T>(values: Partial<T>, ctor: new () => T, cloneDeep?: boolean): T;
|
|
64
70
|
export declare function typeofArray(arr: any[], strict?: boolean): string;
|
|
65
71
|
export declare function instanceofArray(arr: any[], strict?: boolean): string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.instanceofArray = exports.typeofArray = exports.mapClass = exports.returnFalse = exports.isString = exports.isTrue = exports.isObject = exports.isNumber = exports.isNonEmptyString = exports.isNonEmptyObject = exports.isNonEmptyArray = exports.isLower = exports.isGreater = exports.isFunction = exports.isFile = exports.isFalse = exports.isEmail = exports.isDate = exports.isBetween = exports.isBasicType = exports.isArray = exports.errorFunction = exports.check = void 0;
|
|
3
|
+
exports.instanceofArray = exports.typeofArray = exports.mapClass = exports.match = exports.returnFalse = exports.isString = exports.isTrue = exports.isObject = exports.isNumber = exports.isNonEmptyString = exports.isNonEmptyObject = exports.isNonEmptyArray = exports.isLower = exports.isGreater = exports.isFunction = exports.isFile = exports.isFalse = exports.isEmail = exports.isDate = exports.isBetween = exports.isBasicType = exports.isArray = exports.filterProperties = exports.errorFunction = exports.combinePlain = exports.check = exports.assignPlain = void 0;
|
|
4
4
|
const common_1 = require("@nestjs/common");
|
|
5
5
|
const class_transformer_1 = require("class-transformer");
|
|
6
6
|
const class_validator_1 = require("class-validator");
|
|
@@ -74,9 +74,17 @@ class InputHelper {
|
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
exports.default = InputHelper;
|
|
77
|
+
function assignPlain(target, ...args) {
|
|
78
|
+
return Object.assign(target, ...args.map((item) => !item
|
|
79
|
+
?
|
|
80
|
+
item
|
|
81
|
+
:
|
|
82
|
+
filterProperties(JSON.parse(JSON.stringify(item)), (prop) => prop !== undefined)));
|
|
83
|
+
}
|
|
84
|
+
exports.assignPlain = assignPlain;
|
|
77
85
|
async function check(value, user, options) {
|
|
78
|
-
var _a, _b;
|
|
79
|
-
const config = Object.assign({ throwError: true }, options);
|
|
86
|
+
var _a, _b, _c;
|
|
87
|
+
const config = Object.assign(Object.assign({ throwError: true }, options), { validatorOptions: Object.assign({ skipUndefinedProperties: true }, options === null || options === void 0 ? void 0 : options.validatorOptions) });
|
|
80
88
|
if (((_a = config.roles) === null || _a === void 0 ? void 0 : _a.length) && config.throwError) {
|
|
81
89
|
let roles = config.roles;
|
|
82
90
|
if (!Array.isArray(roles)) {
|
|
@@ -84,8 +92,8 @@ async function check(value, user, options) {
|
|
|
84
92
|
}
|
|
85
93
|
let valid = false;
|
|
86
94
|
if ((roles.includes(role_enum_1.RoleEnum.S_USER) && (user === null || user === void 0 ? void 0 : user.id)) ||
|
|
87
|
-
user.hasRole(roles) ||
|
|
88
|
-
(roles.includes(role_enum_1.RoleEnum.S_CREATOR) && (0, db_helper_1.equalIds)((
|
|
95
|
+
((_b = user === null || user === void 0 ? void 0 : user.hasRole) === null || _b === void 0 ? void 0 : _b.call(user, roles)) ||
|
|
96
|
+
(roles.includes(role_enum_1.RoleEnum.S_CREATOR) && (0, db_helper_1.equalIds)((_c = config.dbObject) === null || _c === void 0 ? void 0 : _c.createdBy, user))) {
|
|
89
97
|
valid = true;
|
|
90
98
|
}
|
|
91
99
|
if (!valid) {
|
|
@@ -115,7 +123,7 @@ async function check(value, user, options) {
|
|
|
115
123
|
}
|
|
116
124
|
}
|
|
117
125
|
}
|
|
118
|
-
const errors = await (0, class_validator_1.validate)(value);
|
|
126
|
+
const errors = await (0, class_validator_1.validate)(value, config.validatorOptions);
|
|
119
127
|
if (errors.length > 0 && config.throwError) {
|
|
120
128
|
throw new common_1.BadRequestException('Validation failed');
|
|
121
129
|
}
|
|
@@ -123,12 +131,22 @@ async function check(value, user, options) {
|
|
|
123
131
|
return value;
|
|
124
132
|
}
|
|
125
133
|
exports.check = check;
|
|
134
|
+
function combinePlain(...args) {
|
|
135
|
+
return assignPlain({}, ...args);
|
|
136
|
+
}
|
|
137
|
+
exports.combinePlain = combinePlain;
|
|
126
138
|
function errorFunction(caller, message = 'Required parameter is missing or invalid') {
|
|
127
139
|
const err = new Error(message);
|
|
128
140
|
Error.captureStackTrace(err, caller);
|
|
129
141
|
throw err;
|
|
130
142
|
}
|
|
131
143
|
exports.errorFunction = errorFunction;
|
|
144
|
+
function filterProperties(obj, filterFunction) {
|
|
145
|
+
return Object.keys(obj)
|
|
146
|
+
.filter((key) => filterFunction(obj[key], key, obj))
|
|
147
|
+
.reduce((res, key) => Object.assign(res, { [key]: obj[key] }), {});
|
|
148
|
+
}
|
|
149
|
+
exports.filterProperties = filterProperties;
|
|
132
150
|
function isArray(parameter, falseFunction = errorFunction) {
|
|
133
151
|
return Array.isArray(parameter) ? true : falseFunction(isArray);
|
|
134
152
|
}
|
|
@@ -222,6 +240,10 @@ function returnFalse() {
|
|
|
222
240
|
return false;
|
|
223
241
|
}
|
|
224
242
|
exports.returnFalse = returnFalse;
|
|
243
|
+
function match(expression, cases) {
|
|
244
|
+
return cases[expression] || (cases === null || cases === void 0 ? void 0 : cases.default);
|
|
245
|
+
}
|
|
246
|
+
exports.match = match;
|
|
225
247
|
function mapClass(values, ctor, cloneDeep = true) {
|
|
226
248
|
const instance = new ctor();
|
|
227
249
|
return Object.keys(instance).reduce((obj, key) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/input.helper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"input.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/input.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,8 +16,8 @@ class ServiceHelper {
|
|
|
16
16
|
}
|
|
17
17
|
exports.default = ServiceHelper;
|
|
18
18
|
async function prepareInput(input, currentUser, options = {}) {
|
|
19
|
-
var _a;
|
|
20
|
-
const config = Object.assign({ checkRoles: false, clone: false, create: false, getNewArray: false, removeUndefined:
|
|
19
|
+
var _a, _b;
|
|
20
|
+
const config = Object.assign({ checkRoles: false, clone: false, create: false, getNewArray: false, removeUndefined: true }, options);
|
|
21
21
|
if (typeof input !== 'object') {
|
|
22
22
|
return input;
|
|
23
23
|
}
|
|
@@ -44,9 +44,7 @@ async function prepareInput(input, currentUser, options = {}) {
|
|
|
44
44
|
if (config.removeUndefined) {
|
|
45
45
|
Object.keys(input).forEach((key) => input[key] === undefined && delete input[key]);
|
|
46
46
|
}
|
|
47
|
-
if (config.checkRoles &&
|
|
48
|
-
input.roles &&
|
|
49
|
-
(!(currentUser === null || currentUser === void 0 ? void 0 : currentUser.hasRole) || !currentUser.hasRole(role_enum_1.RoleEnum.ADMIN))) {
|
|
47
|
+
if (config.checkRoles && input.roles && !((_b = currentUser === null || currentUser === void 0 ? void 0 : currentUser.hasRole) === null || _b === void 0 ? void 0 : _b.call(currentUser, role_enum_1.RoleEnum.ADMIN))) {
|
|
50
48
|
if (!(currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles)) {
|
|
51
49
|
throw new common_1.UnauthorizedException('Missing roles of current user');
|
|
52
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/service.helper.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AACvD,iCAAiC;AACjC,yDAAoD;AACpD,4BAA4B;AAC5B,kDAA8C;AAU9C,MAAqB,aAAa;IAIhC,MAAM,CAAC,KAAK,CAAC,YAAY,CACvB,KAAQ,EACR,WAA+C,EAC/C,UAMI,EAAE;QAEN,OAAO,YAAY,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,aAAa,CACxB,MAAW,EACX,UAMI,EAAE;QAEN,OAAO,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;CACF;AAjCD,gCAiCC;AAKM,KAAK,UAAU,YAAY,CAChC,KAAQ,EACR,WAA+C,EAC/C,UAOI,EAAE;;IAGN,MAAM,MAAM,mBACV,UAAU,EAAE,KAAK,EACjB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,KAAK,EAClB,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"service.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/service.helper.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AACvD,iCAAiC;AACjC,yDAAoD;AACpD,4BAA4B;AAC5B,kDAA8C;AAU9C,MAAqB,aAAa;IAIhC,MAAM,CAAC,KAAK,CAAC,YAAY,CACvB,KAAQ,EACR,WAA+C,EAC/C,UAMI,EAAE;QAEN,OAAO,YAAY,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,aAAa,CACxB,MAAW,EACX,UAMI,EAAE;QAEN,OAAO,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;CACF;AAjCD,gCAiCC;AAKM,KAAK,UAAU,YAAY,CAChC,KAAQ,EACR,WAA+C,EAC/C,UAOI,EAAE;;IAGN,MAAM,MAAM,mBACV,UAAU,EAAE,KAAK,EACjB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,KAAK,EAClB,eAAe,EAAE,IAAI,IAClB,OAAO,CACX,CAAC;IAGF,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC;KACd;IAGD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,MAAM,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAQ,CAAC;QACxG,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC;KACpD;IAGD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,IAAK,KAA6B,CAAC,OAAO,IAAI,OAAQ,KAAa,CAAC,OAAO,KAAK,UAAU,EAAE;YAC1F,KAAK,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SAC3D;aAAM;YACL,KAAK,GAAG,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC5B;KACF;IAGD,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,KAAK,YAAY,MAAM,CAAC,WAAW,CAAC,EAAE;QAChE,IAAI,MAAC,MAAM,CAAC,WAAmB,0CAAE,GAAG,EAAE;YACpC,KAAK,GAAG,MAAO,MAAM,CAAC,WAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACtD;aAAM;YACL,KAAK,GAAG,IAAA,mCAAe,EAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;SACpD;KACF;IAGD,IAAI,MAAM,CAAC,eAAe,EAAE;QAC1B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;KACpF;IAGD,IAAI,MAAM,CAAC,UAAU,IAAK,KAA6B,CAAC,KAAK,IAAI,CAAC,CAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,4DAAG,oBAAQ,CAAC,KAAK,CAAC,CAAA,EAAE;QACxG,IAAI,CAAC,CAAC,WAAmB,aAAnB,WAAW,uBAAX,WAAW,CAAU,KAAK,CAAA,EAAE;YAChC,MAAM,IAAI,8BAAqB,CAAC,+BAA+B,CAAC,CAAC;SAClE;aAAM;YACL,MAAM,YAAY,GAAG,CAAC,CAAC,YAAY,CAAE,KAA6B,CAAC,KAAK,EAAG,WAAmB,CAAC,KAAK,CAAC,CAAC;YACtG,IAAI,YAAY,CAAC,MAAM,KAAM,KAA6B,CAAC,KAAK,CAAC,MAAM,EAAE;gBACvE,MAAM,YAAY,GAAG,CAAC,CAAC,UAAU,CAAE,KAA6B,CAAC,KAAK,EAAG,WAAmB,CAAC,KAAK,CAAC,CAAC;gBACpG,MAAM,IAAI,8BAAqB,CAAC,0CAA0C,GAAG,YAAY,CAAC,CAAC;aAC5F;YACA,KAA6B,CAAC,KAAK,GAAG,YAAY,CAAC;SACrD;KACF;IAGD,IAAK,KAA6B,CAAC,QAAQ,EAAE;QAC1C,KAA6B,CAAC,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAE,KAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;KAC1F;IAGD,IAAI,MAAM,CAAC,MAAM,IAAI,WAAW,EAAE;QAC/B,KAA6B,CAAC,SAAS,GAAG,WAAW,CAAC,EAAE,CAAC;KAC3D;IAGD,IAAI,WAAW,EAAE;QACd,KAA6B,CAAC,SAAS,GAAG,WAAW,CAAC,EAAE,CAAC;KAC3D;IAGD,OAAO,KAAK,CAAC;AACf,CAAC;AAvFD,oCAuFC;AAKM,KAAK,UAAU,aAAa,CACjC,MAAW,EACX,UAMI,EAAE;;IAGN,MAAM,MAAM,mBACV,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,KAAK,EAClB,eAAe,EAAE,KAAK,EACtB,WAAW,EAAE,SAAS,IACnB,OAAO,CACX,CAAC;IAGF,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,OAAO,MAAM,CAAC;KACf;IAGD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACzB,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAQ,CAAC;QAC7F,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC;KACrD;IAGD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,IAAI,MAAM,CAAC,OAAO,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE;YAC1D,MAAM,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SAC9D;aAAM;YACL,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SAC9B;KACF;IAGD,IAAI,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,MAAM,YAAY,MAAM,CAAC,WAAW,CAAC,EAAE;QACjE,IAAI,MAAC,MAAM,CAAC,WAAmB,0CAAE,GAAG,EAAE;YACpC,MAAM,GAAG,MAAO,MAAM,CAAC,WAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,GAAG,IAAA,mCAAe,EAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;SACtD;KACF;IAGD,IAAI,MAAM,CAAC,QAAQ,EAAE;QACnB,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC;KAC7B;IAGD,IAAI,MAAM,CAAC,iBAAiB,EAAE;QAC5B,MAAM,CAAC,iBAAiB,GAAG,SAAS,CAAC;KACtC;IAGD,IAAI,MAAM,CAAC,kBAAkB,EAAE;QAC7B,MAAM,CAAC,kBAAkB,GAAG,SAAS,CAAC;KACvC;IAGD,IAAI,MAAM,CAAC,eAAe,EAAE;QAC1B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;KACvF;IAGD,OAAO,MAAM,CAAC;AAChB,CAAC;AAtED,sCAsEC;AAKD,SAAgB,qBAAqB,CACnC,cAA8B,EAC9B,OAOC;;IAGD,MAAM,MAAM,mBACV,KAAK,EAAE,IAAI,IACR,OAAO,CACX,CAAC;IAGF,IAAI,cAAc,IAAI,MAAM,CAAC,KAAK,EAAE;QAClC,cAAc,GAAG,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;KAC9C;IAGD,cAAc,GAAG,cAAc,IAAI,EAAE,CAAC;IAGtC,cAAc,CAAC,SAAS,GAAG,cAAc,CAAC,SAAS,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,CAAA,CAAC;IAC1E,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC,UAAU,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAA,CAAC;IAG7E,IAAI,CAAC,cAAc,CAAC,YAAY,IAAI,cAAc,IAAI,MAAM,EAAE;QAC5D,cAAc,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;KACnD;IACD,IAAI,CAAC,cAAc,CAAC,aAAa,IAAI,eAAe,IAAI,MAAM,EAAE;QAC9D,cAAc,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;KACrD;IAGD,IAAI,MAAM,CAAC,iBAAiB,EAAE;QAC5B,IAAI,MAAC,cAAc,CAAC,cAAkC,0CAAE,MAAM,EAAE;YAC7D,cAAc,CAAC,cAAkC,CAAC,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,iBAAiB,CAAC;SAC7F;KACF;IAGD,OAAO,cAAc,CAAC;AACxB,CAAC;AA9CD,sDA8CC"}
|
|
@@ -22,7 +22,10 @@ class CoreModel {
|
|
|
22
22
|
}
|
|
23
23
|
map(data, options = {}) {
|
|
24
24
|
const config = Object.assign({ cloneDeep: false, funcAllowed: false, init: undefined, mapId: false }, options);
|
|
25
|
-
|
|
25
|
+
if (config.init) {
|
|
26
|
+
this.init(config.init);
|
|
27
|
+
}
|
|
28
|
+
return (0, model_helper_1.map)(data, this, config);
|
|
26
29
|
}
|
|
27
30
|
mapDeep(data, options = {}) {
|
|
28
31
|
const config = Object.assign({ cloneDeep: true, funcAllowed: false, init: undefined, mapId: false }, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-model.model.js","sourceRoot":"","sources":["../../../../src/core/common/models/core-model.model.ts"],"names":[],"mappings":";;;AAAA,0DAA8C;AAY9C,MAAsB,SAAS;IAItB,MAAM,CAAC,IAAI,CAAuD,GAAG,IAAW;QACrF,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAKM,MAAM,CAAC,GAAG,CAEf,IAAsC,EACtC,UAOI,EAAE;QAEN,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IAUM,MAAM,CAAC,OAAO,CAEnB,IAAsC,EACtC,UAOI,EAAE;QAEN,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;IAMM,IAAI,CAAC,GAAG,IAAW;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAKM,GAAG,CACR,IAAyC,EACzC,UAMI,EAAE;QAEN,MAAM,MAAM,mBACV,SAAS,EAAE,KAAK,EAChB,WAAW,EAAE,KAAK,EAClB,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QACF,
|
|
1
|
+
{"version":3,"file":"core-model.model.js","sourceRoot":"","sources":["../../../../src/core/common/models/core-model.model.ts"],"names":[],"mappings":";;;AAAA,0DAA8C;AAY9C,MAAsB,SAAS;IAItB,MAAM,CAAC,IAAI,CAAuD,GAAG,IAAW;QACrF,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAKM,MAAM,CAAC,GAAG,CAEf,IAAsC,EACtC,UAOI,EAAE;QAEN,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IAUM,MAAM,CAAC,OAAO,CAEnB,IAAsC,EACtC,UAOI,EAAE;QAEN,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACxC,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;IAMM,IAAI,CAAC,GAAG,IAAW;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAKM,GAAG,CACR,IAAyC,EACzC,UAMI,EAAE;QAEN,MAAM,MAAM,mBACV,SAAS,EAAE,KAAK,EAChB,WAAW,EAAE,KAAK,EAClB,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QACF,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACxB;QACD,OAAO,IAAA,kBAAG,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAUM,OAAO,CACZ,IAAyC,EACzC,UAMI,EAAE;QAEN,MAAM,MAAM,mBACV,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,KAAK,EAClB,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QACF,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;CACF;AAnHD,8BAmHC"}
|
|
@@ -4,12 +4,15 @@ exports.CrudService = void 0;
|
|
|
4
4
|
const common_1 = require("@nestjs/common");
|
|
5
5
|
const config_helper_1 = require("../helpers/config.helper");
|
|
6
6
|
const filter_helper_1 = require("../helpers/filter.helper");
|
|
7
|
+
const input_helper_1 = require("../helpers/input.helper");
|
|
7
8
|
const module_service_1 = require("./module.service");
|
|
8
9
|
class CrudService extends module_service_1.ModuleService {
|
|
9
10
|
async create(input, serviceOptions) {
|
|
10
11
|
(0, config_helper_1.merge)({ prepareInput: { create: true } }, serviceOptions);
|
|
11
12
|
return this.process(async (data) => {
|
|
12
|
-
|
|
13
|
+
var _a;
|
|
14
|
+
const currentUserId = (_a = serviceOptions === null || serviceOptions === void 0 ? void 0 : serviceOptions.currentUser) === null || _a === void 0 ? void 0 : _a.id;
|
|
15
|
+
return new this.mainDbModel(Object.assign(Object.assign({}, data.input), { createdBy: currentUserId, updatedBy: currentUserId })).save();
|
|
13
16
|
}, { input, serviceOptions });
|
|
14
17
|
}
|
|
15
18
|
async get(id, serviceOptions) {
|
|
@@ -39,7 +42,9 @@ class CrudService extends module_service_1.ModuleService {
|
|
|
39
42
|
throw new common_1.NotFoundException(`No ${this.mainModelConstructor.name} found with ID: ${id}`);
|
|
40
43
|
}
|
|
41
44
|
return this.process(async (data) => {
|
|
42
|
-
|
|
45
|
+
var _a;
|
|
46
|
+
const currentUserId = (_a = serviceOptions === null || serviceOptions === void 0 ? void 0 : serviceOptions.currentUser) === null || _a === void 0 ? void 0 : _a.id;
|
|
47
|
+
return await (0, input_helper_1.assignPlain)(dbObject, data.input, { updatedBy: currentUserId }).save();
|
|
43
48
|
}, { dbObject, input, serviceOptions });
|
|
44
49
|
}
|
|
45
50
|
async delete(id, serviceOptions) {
|
|
@@ -47,10 +52,10 @@ class CrudService extends module_service_1.ModuleService {
|
|
|
47
52
|
if (!dbObject) {
|
|
48
53
|
throw new common_1.NotFoundException(`No ${this.mainModelConstructor.name} found with ID: ${id}`);
|
|
49
54
|
}
|
|
50
|
-
return this.process(async (
|
|
55
|
+
return this.process(async () => {
|
|
51
56
|
await this.mainDbModel.findByIdAndDelete(id).exec();
|
|
52
57
|
return dbObject;
|
|
53
|
-
}, { dbObject,
|
|
58
|
+
}, { dbObject, serviceOptions });
|
|
54
59
|
}
|
|
55
60
|
}
|
|
56
61
|
exports.CrudService = CrudService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/crud.service.ts"],"names":[],"mappings":";;;AAAA,2CAAmD;AAEnD,4DAAiD;AACjD,4DAAoE;
|
|
1
|
+
{"version":3,"file":"crud.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/crud.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,7 @@ class ModuleService {
|
|
|
65
65
|
return result;
|
|
66
66
|
}
|
|
67
67
|
async prepareInput(input, options = {}) {
|
|
68
|
-
const config = Object.assign({
|
|
68
|
+
const config = Object.assign({}, options === null || options === void 0 ? void 0 : options.prepareInput);
|
|
69
69
|
return (0, service_helper_1.prepareInput)(input, options.currentUser, config);
|
|
70
70
|
}
|
|
71
71
|
async prepareOutput(output, options = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/module.service.ts"],"names":[],"mappings":";;;AAAA,uCAAkD;AAClD,kEAAyD;AACzD,oDAA+D;AAC/D,0DAAgD;AAChD,8DAAwE;AAQxE,MAAsB,aAAa;IAcjC,YAAsB,OAGrB;QACC,IAAI,CAAC,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC;QACxC,IAAI,CAAC,oBAAoB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,oBAAoB,CAAC;IAC5D,CAAC;IAKD,WAAW,CACT,KAAU,EACV,WAA+D,EAC/D,OAMC;QAED,MAAM,MAAM,mBACV,QAAQ,EAAE,IAAI,CAAC,oBAAoB,IAChC,OAAO,CACX,CAAC;QACF,OAAO,IAAA,oBAAK,EAAC,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;IAUD,KAAK,CAAC,OAAO,CACX,WAAoG,EACpG,OAKC;QAGD,MAAM,MAAM,mBACV,WAAW,EAAE,IAAI,EACjB,QAAQ,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAC3B,KAAK,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,EACrB,qBAAqB,EAAE,EAAE,EACzB,YAAY,EAAE,EAAE,EAChB,aAAa,EAAE,EAAE,EACjB,MAAM,EAAE,IAAI,IACT,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc,CAC3B,CAAC;QAGF,IAAI,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,EAAE;YAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,SAAS,EAAE;gBACzC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC;aACrC;YACD,MAAM,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;SAC5D;QAGD,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE;YAC7D,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,YAAY,gBAAK,CAAC,QAAQ,EAAE;gBACpF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAA,wBAAY,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC/D,IAAI,QAAQ,EAAE;oBACZ,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;iBAC5B;aACF;SACF;QAGD,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE;YAC1D,MAAM,IAAI,GAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,+BAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;YACrG,IAAI,MAAM,CAAC,SAAS,EAAE;gBACpB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC;aAClC;YACD,MAAM,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,WAAkB,EAAE,IAAI,CAAC,CAAC;SACtF;QAGD,IAAI,MAAM,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;QAGvC,IAAI,MAAM,CAAC,qBAAqB,IAAI,MAAM,CAAC,cAAc,IAAI,IAAI,CAAC,qBAAqB,EAAE;YACvF,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,qBAAqB,CAAC,CAAC;SAC/F;QAGD,IAAI,MAAM,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,EAAE;YAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,UAAU,EAAE;gBAC1C,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC;aACtC;YACD,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SACjD;QAGD,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE;YAC1C,MAAM,IAAI,GAAQ;gBAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,WAAW,EAAE,+BAAW,CAAC,MAAM;gBAC/B,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,UAAU,EAAE,KAAK;aAClB,CAAC;YACF,IAAI,MAAM,CAAC,UAAU,EAAE;gBACrB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC;aACnC;YACD,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,WAAkB,EAAE,IAAI,CAAC,CAAC;SAC1E;QAGD,OAAO,MAAM,CAAC;IAChB,CAAC;IAKD,KAAK,CAAC,YAAY,CAAC,KAA0B,EAAE,UAA0B,EAAE;QACzE,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"module.service.js","sourceRoot":"","sources":["../../../../src/core/common/services/module.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ let RolesGuard = class RolesGuard extends (0, auth_guard_1.AuthGuard)('jwt') {
|
|
|
21
21
|
this.reflector = reflector;
|
|
22
22
|
}
|
|
23
23
|
handleRequest(err, user, info, context) {
|
|
24
|
+
var _a;
|
|
24
25
|
const reflectorRoles = this.reflector.getAll('roles', [context.getHandler(), context.getClass()]);
|
|
25
26
|
const roles = reflectorRoles[0]
|
|
26
27
|
? reflectorRoles[1]
|
|
@@ -30,7 +31,7 @@ let RolesGuard = class RolesGuard extends (0, auth_guard_1.AuthGuard)('jwt') {
|
|
|
30
31
|
if (!roles || !roles.some((value) => !!value)) {
|
|
31
32
|
return user;
|
|
32
33
|
}
|
|
33
|
-
if (!user ||
|
|
34
|
+
if (!((_a = user === null || user === void 0 ? void 0 : user.hasRole) === null || _a === void 0 ? void 0 : _a.call(user, roles))) {
|
|
34
35
|
const args = graphql_1.GqlExecutionContext.create(context).getArgs();
|
|
35
36
|
if (user && roles.includes(role_enum_1.RoleEnum.S_USER)) {
|
|
36
37
|
return user;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/roles.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA6F;AAC7F,uCAAyC;AACzC,6CAAsD;AACtD,+DAA2D;AAC3D,6CAAyC;AAUzC,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,IAAA,sBAAS,EAAC,KAAK,CAAC;IAI9C,YAA+B,SAAoB;QACjD,KAAK,EAAE,CAAC;QADqB,cAAS,GAAT,SAAS,CAAW;IAEnD,CAAC;IAKD,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO
|
|
1
|
+
{"version":3,"file":"roles.guard.js","sourceRoot":"","sources":["../../../../../src/core/modules/auth/guards/roles.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA6F;AAC7F,uCAAyC;AACzC,6CAAsD;AACtD,+DAA2D;AAC3D,6CAAyC;AAUzC,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,IAAA,sBAAS,EAAC,KAAK,CAAC;IAI9C,YAA+B,SAAoB;QACjD,KAAK,EAAE,CAAC;QADqB,cAAS,GAAT,SAAS,CAAW;IAEnD,CAAC;IAKD,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO;;QAEpC,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAa,OAAO,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC9G,MAAM,KAAK,GAAa,cAAc,CAAC,CAAC,CAAC;YACvC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;gBAC9C,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QAGtB,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;YAC7C,OAAO,IAAI,CAAC;SACb;QAGD,IAAI,CAAC,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,qDAAG,KAAK,CAAC,CAAA,EAAE;YAE3B,MAAM,IAAI,GAAQ,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;YAGhE,IAAI,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,oBAAQ,CAAC,MAAM,CAAC,EAAE;gBAC3C,OAAO,IAAI,CAAC;aACb;YAGD,MAAM,IAAI,8BAAqB,EAAE,CAAC;SACnC;QAGD,OAAO,IAAI,CAAC;IACd,CAAC;IAKD,UAAU,CAAC,OAAyB;QAClC,MAAM,GAAG,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChD,OAAO,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;IACvF,CAAC;CACF,CAAA;AAlDY,UAAU;IADtB,IAAA,mBAAU,GAAE;qCAK+B,gBAAS;GAJxC,UAAU,CAkDtB;AAlDY,gCAAU"}
|
|
@@ -5,6 +5,7 @@ const common_1 = require("@nestjs/common");
|
|
|
5
5
|
const bcrypt = require("bcrypt");
|
|
6
6
|
const crypto = require("crypto");
|
|
7
7
|
const config_helper_1 = require("../../common/helpers/config.helper");
|
|
8
|
+
const input_helper_1 = require("../../common/helpers/input.helper");
|
|
8
9
|
const crud_service_1 = require("../../common/services/crud.service");
|
|
9
10
|
class CoreUserService extends crud_service_1.CrudService {
|
|
10
11
|
constructor(emailService, mainDbModel, mainModelConstructor) {
|
|
@@ -16,7 +17,9 @@ class CoreUserService extends crud_service_1.CrudService {
|
|
|
16
17
|
async create(input, serviceOptions) {
|
|
17
18
|
serviceOptions = (0, config_helper_1.merge)({ prepareInput: { create: true } }, serviceOptions);
|
|
18
19
|
return this.process(async (data) => {
|
|
19
|
-
|
|
20
|
+
var _a;
|
|
21
|
+
const currentUserId = (_a = serviceOptions === null || serviceOptions === void 0 ? void 0 : serviceOptions.currentUser) === null || _a === void 0 ? void 0 : _a._id;
|
|
22
|
+
const createdUser = new this.mainDbModel(Object.assign(Object.assign({}, data.input), { verificationToken: crypto.randomBytes(32).toString('hex'), createdBy: currentUserId, updatedBy: currentUserId }));
|
|
20
23
|
try {
|
|
21
24
|
await createdUser.save();
|
|
22
25
|
}
|
|
@@ -57,11 +60,7 @@ class CoreUserService extends crud_service_1.CrudService {
|
|
|
57
60
|
throw new Error('User already verified');
|
|
58
61
|
}
|
|
59
62
|
return this.process(async () => {
|
|
60
|
-
await
|
|
61
|
-
verified: true,
|
|
62
|
-
verificationToken: null,
|
|
63
|
-
}).save();
|
|
64
|
-
return dbObject;
|
|
63
|
+
return await (0, input_helper_1.assignPlain)(dbObject, { verified: true, verificationToken: null }).save();
|
|
65
64
|
}, { dbObject, serviceOptions });
|
|
66
65
|
}
|
|
67
66
|
async resetPassword(token, newPassword, serviceOptions) {
|
|
@@ -70,11 +69,10 @@ class CoreUserService extends crud_service_1.CrudService {
|
|
|
70
69
|
throw new common_1.NotFoundException(`No user found with password reset token: ${token}`);
|
|
71
70
|
}
|
|
72
71
|
return this.process(async () => {
|
|
73
|
-
await
|
|
72
|
+
return await (0, input_helper_1.assignPlain)(dbObject, {
|
|
74
73
|
password: await bcrypt.hash(newPassword, 10),
|
|
75
74
|
passwordResetToken: null,
|
|
76
75
|
}).save();
|
|
77
|
-
return dbObject;
|
|
78
76
|
}, { dbObject, serviceOptions });
|
|
79
77
|
}
|
|
80
78
|
async setPasswordResetTokenForEmail(email, serviceOptions) {
|
|
@@ -83,10 +81,8 @@ class CoreUserService extends crud_service_1.CrudService {
|
|
|
83
81
|
throw new common_1.NotFoundException(`No user found with email: ${email}`);
|
|
84
82
|
}
|
|
85
83
|
return this.process(async () => {
|
|
86
|
-
|
|
87
|
-
dbObject.
|
|
88
|
-
await dbObject.save();
|
|
89
|
-
return dbObject;
|
|
84
|
+
dbObject.passwordResetToken = crypto.randomBytes(32).toString('hex');
|
|
85
|
+
return await dbObject.save();
|
|
90
86
|
}, { dbObject, serviceOptions });
|
|
91
87
|
}
|
|
92
88
|
async setRoles(userId, roles, serviceOptions) {
|
|
@@ -96,7 +92,7 @@ class CoreUserService extends crud_service_1.CrudService {
|
|
|
96
92
|
if (roles.some((role) => typeof role !== 'string')) {
|
|
97
93
|
throw new common_1.BadRequestException('roles contains invalid values');
|
|
98
94
|
}
|
|
99
|
-
return this.process(async (
|
|
95
|
+
return this.process(async () => {
|
|
100
96
|
return await this.mainDbModel.findByIdAndUpdate(userId, { roles }).exec();
|
|
101
97
|
}, { serviceOptions });
|
|
102
98
|
}
|