@lenne.tech/nest-server 3.1.0 → 3.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/common/decorators/restricted.decorator.js +2 -0
- package/dist/core/common/decorators/restricted.decorator.js.map +1 -1
- package/dist/core/common/helpers/model.helper.js +1 -0
- package/dist/core/common/helpers/model.helper.js.map +1 -1
- package/dist/core/common/helpers/service.helper.d.ts +2 -1
- package/dist/core/common/helpers/service.helper.js +4 -1
- package/dist/core/common/helpers/service.helper.js.map +1 -1
- package/dist/core/common/pipes/map.pipe.d.ts +4 -0
- package/dist/core/common/pipes/map.pipe.js +25 -0
- package/dist/core/common/pipes/map.pipe.js.map +1 -0
- package/dist/core/modules/user/core-user.model.js +1 -0
- package/dist/core/modules/user/core-user.model.js.map +1 -1
- package/dist/core/modules/user/core-user.service.d.ts +6 -1
- package/dist/core/modules/user/core-user.service.js +45 -3
- package/dist/core/modules/user/core-user.service.js.map +1 -1
- package/dist/core/modules/user/inputs/core-user-create.input.js +4 -0
- package/dist/core/modules/user/inputs/core-user-create.input.js.map +1 -1
- package/dist/core/modules/user/inputs/core-user.input.d.ts +2 -1
- package/dist/core/modules/user/inputs/core-user.input.js +12 -2
- package/dist/core/modules/user/inputs/core-user.input.js.map +1 -1
- package/dist/main.js +2 -0
- package/dist/main.js.map +1 -1
- package/dist/server/modules/user/user.resolver.d.ts +1 -1
- package/dist/server/modules/user/user.resolver.js +11 -11
- package/dist/server/modules/user/user.resolver.js.map +1 -1
- package/dist/server/modules/user/user.service.d.ts +0 -3
- package/dist/server/modules/user/user.service.js +2 -44
- package/dist/server/modules/user/user.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/core/common/decorators/restricted.decorator.ts +2 -0
- package/src/core/common/helpers/model.helper.ts +3 -0
- package/src/core/common/helpers/service.helper.ts +8 -3
- package/src/core/common/pipes/map.pipe.ts +16 -0
- package/src/core/modules/user/core-user.model.ts +1 -0
- package/src/core/modules/user/core-user.service.ts +78 -3
- package/src/core/modules/user/inputs/core-user-create.input.ts +1 -1
- package/src/core/modules/user/inputs/core-user.input.ts +9 -8
- package/src/main.ts +4 -0
- package/src/server/modules/user/user.resolver.ts +13 -13
- package/src/server/modules/user/user.service.ts +3 -83
|
@@ -34,10 +34,12 @@ const checkRestricted = (data, user, processedObjects = []) => {
|
|
|
34
34
|
(Array.isArray(data.ownerIds) &&
|
|
35
35
|
data.ownerIds.some((item) => (item.id ? item.id.toString() === userId : item.toString() === userId))))) {
|
|
36
36
|
delete data[propertyKey];
|
|
37
|
+
continue;
|
|
37
38
|
}
|
|
38
39
|
}
|
|
39
40
|
else {
|
|
40
41
|
delete data[propertyKey];
|
|
42
|
+
continue;
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restricted.decorator.js","sourceRoot":"","sources":["../../../../src/core/common/decorators/restricted.decorator.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,kDAA8C;AAK9C,MAAM,iBAAiB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAUxC,MAAM,UAAU,GAAG,CAAC,GAAG,KAAe,EAAqB,EAAE;IAClE,OAAO,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;AACpD,CAAC,CAAC;AAFW,QAAA,UAAU,cAErB;AAKK,MAAM,aAAa,GAAG,CAAC,MAAe,EAAE,WAAmB,EAAE,EAAE;IACpE,OAAO,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;AACrE,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAKK,MAAM,eAAe,GAAG,CAC7B,IAAS,EACT,IAAwD,EACxD,mBAA0B,EAAE,EAC5B,EAAE;IAEF,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,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,uBAAe,EAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;KAC1E;IAGD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAE3C,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAG/C,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;YAE3C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAEjC,IAAI,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,oBAAQ,CAAC,KAAK,CAAC,EAAE;oBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;oBAElC,IACE,CAAC,IAAI,CAAC,QAAQ;wBACd,CAAC,CACC,IAAI,CAAC,QAAQ,KAAK,MAAM;4BACxB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;gCAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,CACxG,EACD;wBAEA,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"restricted.decorator.js","sourceRoot":"","sources":["../../../../src/core/common/decorators/restricted.decorator.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,kDAA8C;AAK9C,MAAM,iBAAiB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAUxC,MAAM,UAAU,GAAG,CAAC,GAAG,KAAe,EAAqB,EAAE;IAClE,OAAO,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;AACpD,CAAC,CAAC;AAFW,QAAA,UAAU,cAErB;AAKK,MAAM,aAAa,GAAG,CAAC,MAAe,EAAE,WAAmB,EAAE,EAAE;IACpE,OAAO,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;AACrE,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAKK,MAAM,eAAe,GAAG,CAC7B,IAAS,EACT,IAAwD,EACxD,mBAA0B,EAAE,EAC5B,EAAE;IAEF,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,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,uBAAe,EAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;KAC1E;IAGD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAE3C,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAG/C,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;YAE3C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAEjC,IAAI,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,oBAAQ,CAAC,KAAK,CAAC,EAAE;oBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;oBAElC,IACE,CAAC,IAAI,CAAC,QAAQ;wBACd,CAAC,CACC,IAAI,CAAC,QAAQ,KAAK,MAAM;4BACxB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;gCAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,CACxG,EACD;wBAEA,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;wBACzB,SAAS;qBACV;iBACF;qBAAM;oBAEL,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;oBACzB,SAAS;iBACV;aACF;SACF;QAGD,IAAI,CAAC,WAAW,CAAC,GAAG,IAAA,uBAAe,EAAC,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;KAChF;IAGD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AA7DW,QAAA,eAAe,mBA6D1B"}
|
|
@@ -25,6 +25,7 @@ class ModelHelper {
|
|
|
25
25
|
}
|
|
26
26
|
const preparedSource = ModelHelper.prepareMap(source, target, config);
|
|
27
27
|
Object.assign(target, preparedSource);
|
|
28
|
+
Object.keys(target).forEach((key) => target[key] === undefined && delete target[key]);
|
|
28
29
|
return target;
|
|
29
30
|
}
|
|
30
31
|
static maps(data, targetClass, cloneDeep = true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/model.helper.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAK5B,MAAa,WAAW;IAOf,MAAM,CAAC,UAAU,CACtB,MAAwC,EACxC,MAAS,EACT,UAII,EAAE;QAGN,MAAM,MAAM,mBACV,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QAGF,MAAM,MAAM,GAAG,EAAE,CAAC;QAGlB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACrC,IACE,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC;gBAC9C,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS;gBACzB,CAAC,MAAM,CAAC,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,CAAC,EAC3D;gBACA,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,UAAU,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACvG;iBAAM,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACxC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;aAC5B;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAKM,MAAM,CAAC,GAAG,CACf,MAAwC,EACxC,MAAS,EACT,UAII,EAAE;QAGN,MAAM,MAAM,mBACV,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QAGF,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAClE,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;SACxD;QAGD,MAAM,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAGtE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAGtC,OAAO,MAAM,CAAC;IAChB,CAAC;IAKM,MAAM,CAAC,IAAI,CAChB,IAA6E,EAC7E,WAAsC,EACtC,SAAS,GAAG,IAAI;QAGhB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACrC,OAAO,SAAS,CAAC;SAClB;QAGD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;SACf;QAGD,OAAQ,IAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAClC,OAAQ,WAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"model.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/model.helper.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAK5B,MAAa,WAAW;IAOf,MAAM,CAAC,UAAU,CACtB,MAAwC,EACxC,MAAS,EACT,UAII,EAAE;QAGN,MAAM,MAAM,mBACV,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QAGF,MAAM,MAAM,GAAG,EAAE,CAAC;QAGlB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACrC,IACE,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC;gBAC9C,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS;gBACzB,CAAC,MAAM,CAAC,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,CAAC,EAC3D;gBACA,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,UAAU,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACvG;iBAAM,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACxC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;aAC5B;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAKM,MAAM,CAAC,GAAG,CACf,MAAwC,EACxC,MAAS,EACT,UAII,EAAE;QAGN,MAAM,MAAM,mBACV,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,KAAK,EAClB,KAAK,EAAE,KAAK,IACT,OAAO,CACX,CAAC;QAGF,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAClE,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;SACxD;QAGD,MAAM,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAGtE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAGtC,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;QAGtF,OAAO,MAAM,CAAC;IAChB,CAAC;IAKM,MAAM,CAAC,IAAI,CAChB,IAA6E,EAC7E,WAAsC,EACtC,SAAS,GAAG,IAAI;QAGhB,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACrC,OAAO,SAAS,CAAC;SAClB;QAGD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;SACf;QAGD,OAAQ,IAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAClC,OAAQ,WAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAxGD,kCAwGC"}
|
|
@@ -11,8 +11,9 @@ export declare class ServiceHelper {
|
|
|
11
11
|
}, ...args: any[]): Promise<{
|
|
12
12
|
[key: string]: any;
|
|
13
13
|
}>;
|
|
14
|
-
static prepareOutput(output: any, userModel: new () => any, userService: any, options?: {
|
|
14
|
+
static prepareOutput<T = Record<string, any>>(output: any, userModel: new () => any, userService: any, options?: {
|
|
15
15
|
[key: string]: any;
|
|
16
16
|
clone?: boolean;
|
|
17
|
+
targetModel?: Partial<T>;
|
|
17
18
|
}, ...args: any[]): Promise<any>;
|
|
18
19
|
}
|
|
@@ -8,7 +8,7 @@ const role_enum_1 = require("../enums/role.enum");
|
|
|
8
8
|
class ServiceHelper {
|
|
9
9
|
static async prepareInput(input, currentUser, options = {}, ...args) {
|
|
10
10
|
var _a;
|
|
11
|
-
const config = Object.assign({ checkRoles:
|
|
11
|
+
const config = Object.assign({ checkRoles: false, clone: false, create: false }, options);
|
|
12
12
|
if (config.clone) {
|
|
13
13
|
input = JSON.parse(JSON.stringify(input));
|
|
14
14
|
}
|
|
@@ -41,6 +41,9 @@ class ServiceHelper {
|
|
|
41
41
|
if (config.clone) {
|
|
42
42
|
output = JSON.parse(JSON.stringify(output));
|
|
43
43
|
}
|
|
44
|
+
if (options.targetModel) {
|
|
45
|
+
options.targetModel.map(output);
|
|
46
|
+
}
|
|
44
47
|
delete output.password;
|
|
45
48
|
delete output.verificationToken;
|
|
46
49
|
delete output.passwordResetToken;
|
|
@@ -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,4BAA4B;AAC5B,kDAA8C;AAK9C,MAAa,aAAa;IAIxB,MAAM,CAAC,KAAK,CAAC,YAAY,CACvB,KAA6B,EAC7B,WAA+C,EAC/C,UAAqE,EAAE,EACvE,GAAG,IAAW;;QAGd,MAAM,MAAM,mBACV,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"service.helper.js","sourceRoot":"","sources":["../../../../src/core/common/helpers/service.helper.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AACvD,iCAAiC;AACjC,4BAA4B;AAC5B,kDAA8C;AAK9C,MAAa,aAAa;IAIxB,MAAM,CAAC,KAAK,CAAC,YAAY,CACvB,KAA6B,EAC7B,WAA+C,EAC/C,UAAqE,EAAE,EACvE,GAAG,IAAW;;QAGd,MAAM,MAAM,mBACV,UAAU,EAAE,KAAK,EACjB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,KAAK,IACV,OAAO,CACX,CAAC;QAGF,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;SAC3C;QAGD,IAAI,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAA,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,oBAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;YACvG,IAAI,CAAC,CAAA,MAAC,WAAmB,0CAAE,KAAK,CAAA,EAAE;gBAChC,MAAM,IAAI,8BAAqB,CAAC,+BAA+B,CAAC,CAAC;aAClE;iBAAM;gBACL,MAAM,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,EAAG,WAAmB,CAAC,KAAK,CAAC,CAAC;gBAC7E,IAAI,YAAY,CAAC,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE;oBAC9C,MAAM,YAAY,GAAG,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAG,WAAmB,CAAC,KAAK,CAAC,CAAC;oBAC3E,MAAM,IAAI,8BAAqB,CAAC,0CAA0C,GAAG,YAAY,CAAC,CAAC;iBAC5F;gBACD,KAAK,CAAC,KAAK,GAAG,YAAY,CAAC;aAC5B;SACF;QAGD,IAAI,KAAK,CAAC,QAAQ,EAAE;YAClB,KAAK,CAAC,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAE,KAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SACjE;QAGD,IAAI,MAAM,CAAC,MAAM,IAAI,WAAW,EAAE;YAChC,KAAK,CAAC,SAAS,GAAG,WAAW,CAAC,EAAE,CAAC;SAClC;QAGD,IAAI,WAAW,EAAE;YACf,KAAK,CAAC,SAAS,GAAG,WAAW,CAAC,EAAE,CAAC;SAClC;QAGD,OAAO,KAAK,CAAC;IACf,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,aAAa,CACxB,MAAW,EACX,SAAwB,EACxB,WAAgB,EAChB,UAA6E,EAAE,EAC/E,GAAG,IAAW;QAGd,MAAM,MAAM,mBACV,KAAK,EAAE,IAAI,IACR,OAAO,CACX,CAAC;QAGF,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;SAC7C;QAGD,IAAI,OAAO,CAAC,WAAW,EAAE;YACtB,OAAO,CAAC,WAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SAC1C;QAGD,OAAO,MAAM,CAAC,QAAQ,CAAC;QAGvB,OAAO,MAAM,CAAC,iBAAiB,CAAC;QAGhC,OAAO,MAAM,CAAC,kBAAkB,CAAC;QAGjC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA9FD,sCA8FC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.MapPipe = void 0;
|
|
10
|
+
const common_1 = require("@nestjs/common");
|
|
11
|
+
let MapPipe = class MapPipe {
|
|
12
|
+
transform(value, metadata) {
|
|
13
|
+
var _a;
|
|
14
|
+
let result = value;
|
|
15
|
+
if ((_a = metadata.metatype) === null || _a === void 0 ? void 0 : _a.map) {
|
|
16
|
+
result = metadata.metatype.map(value);
|
|
17
|
+
}
|
|
18
|
+
return result;
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
MapPipe = __decorate([
|
|
22
|
+
(0, common_1.Injectable)()
|
|
23
|
+
], MapPipe);
|
|
24
|
+
exports.MapPipe = MapPipe;
|
|
25
|
+
//# sourceMappingURL=map.pipe.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"map.pipe.js","sourceRoot":"","sources":["../../../../src/core/common/pipes/map.pipe.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA6E;AAG7E,IAAa,OAAO,GAApB,MAAa,OAAO;IAClB,SAAS,CAAC,KAAU,EAAE,QAA0B;;QAC9C,IAAI,MAAM,GAAG,KAAK,CAAC;QAGnB,IAAI,MAAC,QAAQ,CAAC,QAAgB,0CAAE,GAAG,EAAE;YAEnC,MAAM,GAAI,QAAQ,CAAC,QAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAChD;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AAZY,OAAO;IADnB,IAAA,mBAAU,GAAE;GACA,OAAO,CAYnB;AAZY,0BAAO"}
|
|
@@ -91,6 +91,7 @@ __decorate([
|
|
|
91
91
|
__metadata("design:type", String)
|
|
92
92
|
], CoreUserModel.prototype, "verificationToken", void 0);
|
|
93
93
|
__decorate([
|
|
94
|
+
(0, graphql_1.Field)((type) => Boolean, { description: 'Verification state of the user', nullable: true }),
|
|
94
95
|
(0, mongoose_1.Prop)({ type: Boolean }),
|
|
95
96
|
__metadata("design:type", Object)
|
|
96
97
|
], CoreUserModel.prototype, "verified", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-user.model.js","sourceRoot":"","sources":["../../../../src/core/modules/user/core-user.model.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAoD;AACpD,qDAAsD;AACtD,uFAAkF;AAClF,+CAAgD;AAOhD,IAAsB,aAAa,GAAnC,MAAsB,aAAc,SAAQ,6CAAoB;IAAhE;;QAWE,UAAK,GAAW,SAAS,CAAC;QAQ1B,cAAS,GAAW,SAAS,CAAC;QAQ9B,aAAQ,GAAW,SAAS,CAAC;QAM7B,aAAQ,GAAW,SAAS,CAAC;QAQ7B,UAAK,GAAa,EAAE,CAAC;QAQrB,aAAQ,GAAW,SAAS,CAAC;QAO7B,uBAAkB,GAAW,SAAS,CAAC;QAOvC,sBAAiB,GAAW,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"core-user.model.js","sourceRoot":"","sources":["../../../../src/core/modules/user/core-user.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,13 +4,18 @@ import { CoreUserModel } from './core-user.model';
|
|
|
4
4
|
import { CoreUserCreateInput } from './inputs/core-user-create.input';
|
|
5
5
|
import { CoreUserInput } from './inputs/core-user.input';
|
|
6
6
|
import { Model } from 'mongoose';
|
|
7
|
+
import { EmailService } from '../../common/services/email.service';
|
|
7
8
|
export declare abstract class CoreUserService<TUser extends CoreUserModel, TUserInput extends CoreUserInput, TUserCreateInput extends CoreUserCreateInput> extends CoreBasicUserService<TUser, TUserInput, TUserCreateInput> {
|
|
8
9
|
protected readonly userModel: Model<any>;
|
|
9
|
-
protected
|
|
10
|
+
protected emailService: EmailService;
|
|
11
|
+
protected constructor(userModel: Model<any>, emailService: EmailService);
|
|
10
12
|
create(input: TUserCreateInput, currentUser?: TUser, ...args: any[]): Promise<TUser>;
|
|
11
13
|
delete(id: string, ...args: any[]): Promise<TUser>;
|
|
12
14
|
get(id: string, ...args: any[]): Promise<TUser>;
|
|
13
15
|
find(filterArgs?: FilterArgs, ...args: any[]): Promise<TUser[]>;
|
|
16
|
+
verify(token: string): Promise<boolean>;
|
|
17
|
+
resetPassword(token: string, newPassword: string): Promise<boolean>;
|
|
18
|
+
requestPasswordResetMail(email: string): Promise<boolean>;
|
|
14
19
|
setRoles(userId: string, roles: string[]): Promise<TUser>;
|
|
15
20
|
update(id: string, input: TUserInput, currentUser: TUser, ...args: any[]): Promise<TUser>;
|
|
16
21
|
protected prepareInput(input: {
|
|
@@ -8,15 +8,19 @@ const role_enum_1 = require("../../common/enums/role.enum");
|
|
|
8
8
|
const filter_helper_1 = require("../../common/helpers/filter.helper");
|
|
9
9
|
const core_basic_user_service_1 = require("./core-basic-user.service");
|
|
10
10
|
const _ = require("lodash");
|
|
11
|
+
const crypto = require("crypto");
|
|
12
|
+
const config_env_1 = require("../../../config.env");
|
|
11
13
|
const pubSub = new graphql_subscriptions_1.PubSub();
|
|
12
14
|
class CoreUserService extends core_basic_user_service_1.CoreBasicUserService {
|
|
13
|
-
constructor(userModel) {
|
|
15
|
+
constructor(userModel, emailService) {
|
|
14
16
|
super(userModel);
|
|
15
17
|
this.userModel = userModel;
|
|
18
|
+
this.emailService = emailService;
|
|
16
19
|
}
|
|
17
20
|
async create(input, currentUser, ...args) {
|
|
18
21
|
await this.prepareInput(input, currentUser, { create: true });
|
|
19
|
-
const
|
|
22
|
+
const newUser = Object.assign(Object.assign({}, input), { verificationToken: crypto.randomBytes(32).toString('hex') });
|
|
23
|
+
const createdUser = new this.userModel(this.model.map(newUser));
|
|
20
24
|
try {
|
|
21
25
|
await createdUser.save();
|
|
22
26
|
}
|
|
@@ -54,6 +58,44 @@ class CoreUserService extends core_basic_user_service_1.CoreBasicUserService {
|
|
|
54
58
|
return this.prepareOutput(user, args[0]);
|
|
55
59
|
}));
|
|
56
60
|
}
|
|
61
|
+
async verify(token) {
|
|
62
|
+
const user = await this.userModel.findOne({ verificationToken: token }).exec();
|
|
63
|
+
if (!user) {
|
|
64
|
+
throw new common_1.NotFoundException();
|
|
65
|
+
}
|
|
66
|
+
if (!user.verificationToken) {
|
|
67
|
+
throw new Error('User has no token');
|
|
68
|
+
}
|
|
69
|
+
if (user.verified) {
|
|
70
|
+
throw new Error('User already verified');
|
|
71
|
+
}
|
|
72
|
+
await this.userModel.findByIdAndUpdate(user.id, { $set: { verified: true, verificationToken: null } }).exec();
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
async resetPassword(token, newPassword) {
|
|
76
|
+
const user = await this.userModel.findOne({ passwordResetToken: token }).exec();
|
|
77
|
+
if (!user) {
|
|
78
|
+
throw new common_1.NotFoundException();
|
|
79
|
+
}
|
|
80
|
+
const cryptedPassword = await bcrypt.hash(newPassword, 10);
|
|
81
|
+
await this.userModel
|
|
82
|
+
.findByIdAndUpdate(user.id, { $set: { password: cryptedPassword, passwordResetToken: null } })
|
|
83
|
+
.exec();
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
async requestPasswordResetMail(email) {
|
|
87
|
+
const user = await this.userModel.findOne({ email }).exec();
|
|
88
|
+
if (!user) {
|
|
89
|
+
throw new common_1.NotFoundException();
|
|
90
|
+
}
|
|
91
|
+
const resetToken = crypto.randomBytes(32).toString('hex');
|
|
92
|
+
await this.userModel.findByIdAndUpdate(user.id, { $set: { passwordResetToken: resetToken } }).exec();
|
|
93
|
+
await this.emailService.sendMail(user.email, 'Password reset', {
|
|
94
|
+
htmlTemplate: 'password-reset',
|
|
95
|
+
templateData: { name: user.username, link: config_env_1.default.email.passwordResetLink + '/' + resetToken },
|
|
96
|
+
});
|
|
97
|
+
return true;
|
|
98
|
+
}
|
|
57
99
|
async setRoles(userId, roles) {
|
|
58
100
|
if (!Array.isArray(roles)) {
|
|
59
101
|
throw new common_1.BadRequestException('Missing roles');
|
|
@@ -76,7 +118,7 @@ class CoreUserService extends core_basic_user_service_1.CoreBasicUserService {
|
|
|
76
118
|
}
|
|
77
119
|
async prepareInput(input, currentUser, options = {}, ...args) {
|
|
78
120
|
var _a;
|
|
79
|
-
const config = Object.assign({ checkRoles:
|
|
121
|
+
const config = Object.assign({ checkRoles: false, clone: false }, options);
|
|
80
122
|
if (config.clone) {
|
|
81
123
|
input = JSON.parse(JSON.stringify(input));
|
|
82
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-user.service.js","sourceRoot":"","sources":["../../../../src/core/modules/user/core-user.service.ts"],"names":[],"mappings":";;;AAAA,2CAKwB;AACxB,iCAAiC;AACjC,iEAA+C;AAE/C,4DAAwD;AACxD,sEAA4D;AAC5D,uEAAiE;AAKjE,4BAA4B;
|
|
1
|
+
{"version":3,"file":"core-user.service.js","sourceRoot":"","sources":["../../../../src/core/modules/user/core-user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,10 @@ const class_validator_1 = require("class-validator");
|
|
|
14
14
|
const graphql_1 = require("@nestjs/graphql");
|
|
15
15
|
const core_user_input_1 = require("./core-user.input");
|
|
16
16
|
let CoreUserCreateInput = class CoreUserCreateInput extends core_user_input_1.CoreUserInput {
|
|
17
|
+
constructor() {
|
|
18
|
+
super(...arguments);
|
|
19
|
+
this.email = undefined;
|
|
20
|
+
}
|
|
17
21
|
};
|
|
18
22
|
__decorate([
|
|
19
23
|
(0, graphql_1.Field)({ description: 'Email of the user', nullable: false }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-user-create.input.js","sourceRoot":"","sources":["../../../../../src/core/modules/user/inputs/core-user-create.input.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA0C;AAC1C,6CAAmD;AACnD,uDAAkD;AAMlD,IAAsB,mBAAmB,GAAzC,MAAsB,mBAAoB,SAAQ,+BAAa;
|
|
1
|
+
{"version":3,"file":"core-user-create.input.js","sourceRoot":"","sources":["../../../../../src/core/modules/user/inputs/core-user-create.input.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAA0C;AAC1C,6CAAmD;AACnD,uDAAkD;AAMlD,IAAsB,mBAAmB,GAAzC,MAAsB,mBAAoB,SAAQ,+BAAa;IAA/D;;QAGE,UAAK,GAAW,SAAS,CAAC;IAC5B,CAAC;CAAA,CAAA;AADC;IAFC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,mBAAmB,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC5D,IAAA,yBAAO,GAAE;;kDACgB;AAHN,mBAAmB;IADxC,IAAA,mBAAS,EAAC,EAAE,WAAW,EAAE,iCAAiC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;GAC1D,mBAAmB,CAIxC;AAJqB,kDAAmB"}
|
|
@@ -14,7 +14,17 @@ const class_validator_1 = require("class-validator");
|
|
|
14
14
|
const graphql_1 = require("@nestjs/graphql");
|
|
15
15
|
const restricted_decorator_1 = require("../../../common/decorators/restricted.decorator");
|
|
16
16
|
const role_enum_1 = require("../../../common/enums/role.enum");
|
|
17
|
-
|
|
17
|
+
const core_model_model_1 = require("../../../common/models/core-model.model");
|
|
18
|
+
let CoreUserInput = class CoreUserInput extends core_model_model_1.CoreModel {
|
|
19
|
+
constructor() {
|
|
20
|
+
super(...arguments);
|
|
21
|
+
this.email = undefined;
|
|
22
|
+
this.firstName = undefined;
|
|
23
|
+
this.lastName = undefined;
|
|
24
|
+
this.roles = [];
|
|
25
|
+
this.username = undefined;
|
|
26
|
+
this.password = undefined;
|
|
27
|
+
}
|
|
18
28
|
};
|
|
19
29
|
__decorate([
|
|
20
30
|
(0, graphql_1.Field)({ description: 'Email of the user', nullable: true }),
|
|
@@ -33,7 +43,7 @@ __decorate([
|
|
|
33
43
|
__metadata("design:type", String)
|
|
34
44
|
], CoreUserInput.prototype, "lastName", void 0);
|
|
35
45
|
__decorate([
|
|
36
|
-
(0, restricted_decorator_1.Restricted)(role_enum_1.RoleEnum.ADMIN
|
|
46
|
+
(0, restricted_decorator_1.Restricted)(role_enum_1.RoleEnum.ADMIN),
|
|
37
47
|
(0, graphql_1.Field)((type) => [String], { description: 'Roles of the user', nullable: true }),
|
|
38
48
|
(0, class_validator_1.IsOptional)(),
|
|
39
49
|
__metadata("design:type", Array)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core-user.input.js","sourceRoot":"","sources":["../../../../../src/core/modules/user/inputs/core-user.input.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAsD;AACtD,6CAAmD;AACnD,0FAA6E;AAC7E,+DAA2D;
|
|
1
|
+
{"version":3,"file":"core-user.input.js","sourceRoot":"","sources":["../../../../../src/core/modules/user/inputs/core-user.input.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAsD;AACtD,6CAAmD;AACnD,0FAA6E;AAC7E,+DAA2D;AAC3D,8EAAoE;AAMpE,IAAsB,aAAa,GAAnC,MAAsB,aAAc,SAAQ,4BAAS;IAArD;;QAOE,UAAK,GAAY,SAAS,CAAC;QAO3B,cAAS,GAAY,SAAS,CAAC;QAO/B,aAAQ,GAAY,SAAS,CAAC;QAQ9B,UAAK,GAAc,EAAE,CAAC;QAOtB,aAAQ,GAAY,SAAS,CAAC;QAO9B,aAAQ,GAAY,SAAS,CAAC;IAChC,CAAC;CAAA,CAAA;AArCC;IAHC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC3D,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,GAAE;;4CACiB;AAO3B;IAFC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAChE,IAAA,4BAAU,GAAE;;gDACkB;AAO/B;IAFC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,uBAAuB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC/D,IAAA,4BAAU,GAAE;;+CACiB;AAQ9B;IAHC,IAAA,iCAAU,EAAC,oBAAQ,CAAC,KAAK,CAAC;IAC1B,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC/E,IAAA,4BAAU,GAAE;;4CACS;AAOtB;IAFC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,8BAA8B,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACtE,IAAA,4BAAU,GAAE;;+CACiB;AAO9B;IAFC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,sBAAsB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC9D,IAAA,4BAAU,GAAE;;+CACiB;AA3CV,aAAa;IADlC,IAAA,mBAAS,EAAC,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;GACrC,aAAa,CA4ClC;AA5CqB,sCAAa"}
|
package/dist/main.js
CHANGED
|
@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const core_1 = require("@nestjs/core");
|
|
4
4
|
const config_env_1 = require("./config.env");
|
|
5
5
|
const server_module_1 = require("./server/server.module");
|
|
6
|
+
const map_pipe_1 = require("./core/common/pipes/map.pipe");
|
|
6
7
|
async function bootstrap() {
|
|
7
8
|
const server = await core_1.NestFactory.create(server_module_1.ServerModule);
|
|
9
|
+
server.useGlobalPipes(new map_pipe_1.MapPipe());
|
|
8
10
|
server.useStaticAssets(config_env_1.default.staticAssets.path, config_env_1.default.staticAssets.options);
|
|
9
11
|
server.setBaseViewsDir(config_env_1.default.templates.path);
|
|
10
12
|
server.setViewEngine(config_env_1.default.templates.engine);
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;AAAA,uCAA2C;AAE3C,6CAAqC;AACrC,0DAAsD;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;AAAA,uCAA2C;AAE3C,6CAAqC;AACrC,0DAAsD;AACtD,2DAAuD;AAKvD,KAAK,UAAU,SAAS;IAEtB,MAAM,MAAM,GAAG,MAAM,kBAAW,CAAC,MAAM,CAErC,4BAAY,CACb,CAAC;IAGF,MAAM,CAAC,cAAc,CAAC,IAAI,kBAAO,EAAE,CAAC,CAAC;IAGrC,MAAM,CAAC,eAAe,CAAC,oBAAS,CAAC,YAAY,CAAC,IAAI,EAAE,oBAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAGpF,MAAM,CAAC,eAAe,CAAC,oBAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,CAAC,aAAa,CAAC,oBAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAGjD,MAAM,CAAC,UAAU,EAAE,CAAC;IAGpB,MAAM,MAAM,CAAC,MAAM,CAAC,oBAAS,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAGD,SAAS,EAAE,CAAC"}
|
|
@@ -11,8 +11,8 @@ export declare class UserResolver {
|
|
|
11
11
|
constructor(usersService: UserService, pubSub: PubSub);
|
|
12
12
|
getUser(id: string, info: GraphQLResolveInfo): Promise<User>;
|
|
13
13
|
findUsers(info: GraphQLResolveInfo, args?: FilterArgs): Promise<User[]>;
|
|
14
|
-
verifyUser(token: string): Promise<boolean>;
|
|
15
14
|
requestPasswordResetMail(email: string): Promise<boolean>;
|
|
15
|
+
verifyUser(token: string): Promise<boolean>;
|
|
16
16
|
resetPassword(token: string, password: string): Promise<boolean>;
|
|
17
17
|
createUser(input: UserCreateInput, user: User, info: GraphQLResolveInfo): Promise<User>;
|
|
18
18
|
updateUser(input: UserInput, id: string, user: User, info: GraphQLResolveInfo): Promise<User>;
|
|
@@ -36,12 +36,12 @@ let UserResolver = class UserResolver {
|
|
|
36
36
|
async findUsers(info, args) {
|
|
37
37
|
return await this.usersService.find(args, info);
|
|
38
38
|
}
|
|
39
|
-
async verifyUser(token) {
|
|
40
|
-
return await this.usersService.verify(token);
|
|
41
|
-
}
|
|
42
39
|
async requestPasswordResetMail(email) {
|
|
43
40
|
return await this.usersService.requestPasswordResetMail(email);
|
|
44
41
|
}
|
|
42
|
+
async verifyUser(token) {
|
|
43
|
+
return await this.usersService.verify(token);
|
|
44
|
+
}
|
|
45
45
|
async resetPassword(token, password) {
|
|
46
46
|
return await this.usersService.resetPassword(token, password);
|
|
47
47
|
}
|
|
@@ -77,21 +77,21 @@ __decorate([
|
|
|
77
77
|
__metadata("design:returntype", Promise)
|
|
78
78
|
], UserResolver.prototype, "findUsers", null);
|
|
79
79
|
__decorate([
|
|
80
|
-
(0, graphql_1.Query)((returns) => Boolean, { description: '
|
|
81
|
-
__param(0, (0, graphql_1.Args)('
|
|
80
|
+
(0, graphql_1.Query)((returns) => Boolean, { description: 'Request new password for user with email' }),
|
|
81
|
+
__param(0, (0, graphql_1.Args)('email')),
|
|
82
82
|
__metadata("design:type", Function),
|
|
83
83
|
__metadata("design:paramtypes", [String]),
|
|
84
84
|
__metadata("design:returntype", Promise)
|
|
85
|
-
], UserResolver.prototype, "
|
|
85
|
+
], UserResolver.prototype, "requestPasswordResetMail", null);
|
|
86
86
|
__decorate([
|
|
87
|
-
(0, graphql_1.
|
|
88
|
-
__param(0, (0, graphql_1.Args)('
|
|
87
|
+
(0, graphql_1.Mutation)((returns) => Boolean, { description: 'Verify user with email' }),
|
|
88
|
+
__param(0, (0, graphql_1.Args)('token')),
|
|
89
89
|
__metadata("design:type", Function),
|
|
90
90
|
__metadata("design:paramtypes", [String]),
|
|
91
91
|
__metadata("design:returntype", Promise)
|
|
92
|
-
], UserResolver.prototype, "
|
|
92
|
+
], UserResolver.prototype, "verifyUser", null);
|
|
93
93
|
__decorate([
|
|
94
|
-
(0, graphql_1.
|
|
94
|
+
(0, graphql_1.Mutation)((returns) => Boolean, { description: 'Set new password for user with token' }),
|
|
95
95
|
__param(0, (0, graphql_1.Args)('token')),
|
|
96
96
|
__param(1, (0, graphql_1.Args)('password')),
|
|
97
97
|
__metadata("design:type", Function),
|
|
@@ -111,7 +111,7 @@ __decorate([
|
|
|
111
111
|
__decorate([
|
|
112
112
|
(0, roles_decorator_1.Roles)(role_enum_1.RoleEnum.ADMIN, role_enum_1.RoleEnum.OWNER),
|
|
113
113
|
(0, graphql_1.Mutation)((returns) => user_model_1.User, { description: 'Update existing user' }),
|
|
114
|
-
__param(0, (0, graphql_1.Args)('input')),
|
|
114
|
+
__param(0, (0, graphql_1.Args)('input', { type: () => user_input_1.UserInput })),
|
|
115
115
|
__param(1, (0, graphql_1.Args)('id')),
|
|
116
116
|
__param(2, (0, graphql_user_decorator_1.GraphQLUser)()),
|
|
117
117
|
__param(3, (0, graphql_1.Info)()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.resolver.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAsF;AAEtF,iEAA+C;AAC/C,uEAAmE;AACnE,mGAAqF;AACrF,qFAAwE;AACxE,oEAAgE;AAChE,4EAAwE;AACxE,kEAA6D;AAC7D,oDAAgD;AAChD,6CAAoC;AACpC,iDAA6C;AAC7C,2CAAwC;AAMxC,IAAa,YAAY,GAAzB,MAAa,YAAY;IAIvB,YAA+B,YAAyB,EAAwC,MAAc;QAA/E,iBAAY,GAAZ,YAAY,CAAa;QAAwC,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAUlH,KAAK,CAAC,OAAO,CAAa,EAAU,EAAU,IAAwB;QACpE,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;IAOD,KAAK,CAAC,SAAS,CAAS,IAAwB,EAAU,IAAiB;QACzE,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAMD,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"user.resolver.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,9 +18,6 @@ export declare class UserService extends CoreUserService<User, UserInput, UserCr
|
|
|
18
18
|
protected readonly model: ICorePersistenceModel;
|
|
19
19
|
constructor(configService: ConfigService, emailService: EmailService, userModel: Model<User>, pubSub: PubSub);
|
|
20
20
|
create(input: UserCreateInput, currentUser?: User, ...args: any[]): Promise<User>;
|
|
21
|
-
verify(token: string): Promise<boolean>;
|
|
22
|
-
resetPassword(token: string, newPassword: string): Promise<boolean>;
|
|
23
|
-
requestPasswordResetMail(email: string): Promise<boolean>;
|
|
24
21
|
find(filterArgs?: FilterArgs, ...args: any[]): Promise<User[]>;
|
|
25
22
|
setAvatar(file: Express.Multer.File, user: User): Promise<string>;
|
|
26
23
|
protected prepareInput(input: {
|
|
@@ -25,11 +25,9 @@ const user_model_1 = require("./user.model");
|
|
|
25
25
|
const mongoose_1 = require("@nestjs/mongoose");
|
|
26
26
|
const mongoose_2 = require("mongoose");
|
|
27
27
|
const graphql_subscriptions_1 = require("graphql-subscriptions");
|
|
28
|
-
const crypto = require("crypto");
|
|
29
|
-
const bcrypt = require("bcrypt");
|
|
30
28
|
let UserService = class UserService extends core_user_service_1.CoreUserService {
|
|
31
29
|
constructor(configService, emailService, userModel, pubSub) {
|
|
32
|
-
super(userModel);
|
|
30
|
+
super(userModel, emailService);
|
|
33
31
|
this.configService = configService;
|
|
34
32
|
this.emailService = emailService;
|
|
35
33
|
this.userModel = userModel;
|
|
@@ -40,52 +38,12 @@ let UserService = class UserService extends core_user_service_1.CoreUserService
|
|
|
40
38
|
const user = await super.create(input, currentUser);
|
|
41
39
|
await this.prepareOutput(user, args[0]);
|
|
42
40
|
await this.pubSub.publish('userCreated', user_model_1.User.map(user));
|
|
43
|
-
const verificationToken = crypto.randomBytes(32).toString('hex');
|
|
44
|
-
await this.userModel.findByIdAndUpdate(user.id, { $set: { verificationToken } }).exec();
|
|
45
41
|
await this.emailService.sendMail(user.email, 'Welcome', {
|
|
46
42
|
htmlTemplate: 'welcome',
|
|
47
|
-
templateData: { name: user.username, link: config_env_1.default.email.verificationLink + '/' + verificationToken },
|
|
43
|
+
templateData: { name: user.username, link: config_env_1.default.email.verificationLink + '/' + user.verificationToken },
|
|
48
44
|
});
|
|
49
45
|
return user;
|
|
50
46
|
}
|
|
51
|
-
async verify(token) {
|
|
52
|
-
const user = await this.userModel.findOne({ verificationToken: token }).exec();
|
|
53
|
-
if (!user) {
|
|
54
|
-
throw new common_1.NotFoundException();
|
|
55
|
-
}
|
|
56
|
-
if (!user.verificationToken) {
|
|
57
|
-
throw new Error('User has no token');
|
|
58
|
-
}
|
|
59
|
-
if (user.verified) {
|
|
60
|
-
throw new Error('User already verified');
|
|
61
|
-
}
|
|
62
|
-
await this.userModel.findByIdAndUpdate(user.id, { $set: { verified: true, verificationToken: null } }).exec();
|
|
63
|
-
return true;
|
|
64
|
-
}
|
|
65
|
-
async resetPassword(token, newPassword) {
|
|
66
|
-
const user = await this.userModel.findOne({ passwordResetToken: token }).exec();
|
|
67
|
-
if (!user) {
|
|
68
|
-
throw new common_1.NotFoundException();
|
|
69
|
-
}
|
|
70
|
-
const cryptedPassword = await bcrypt.hash(newPassword, 10);
|
|
71
|
-
await this.userModel
|
|
72
|
-
.findByIdAndUpdate(user.id, { $set: { password: cryptedPassword, passwordResetToken: null } })
|
|
73
|
-
.exec();
|
|
74
|
-
return true;
|
|
75
|
-
}
|
|
76
|
-
async requestPasswordResetMail(email) {
|
|
77
|
-
const user = await this.userModel.findOne({ email }).exec();
|
|
78
|
-
if (!user) {
|
|
79
|
-
throw new common_1.NotFoundException();
|
|
80
|
-
}
|
|
81
|
-
const resetToken = crypto.randomBytes(32).toString('hex');
|
|
82
|
-
await this.userModel.findByIdAndUpdate(user.id, { $set: { passwordResetToken: resetToken } }).exec();
|
|
83
|
-
await this.emailService.sendMail(user.email, 'Password reset', {
|
|
84
|
-
htmlTemplate: 'password-reset',
|
|
85
|
-
templateData: { name: user.username, link: config_env_1.default.email.passwordResetLink + '/' + resetToken },
|
|
86
|
-
});
|
|
87
|
-
return true;
|
|
88
|
-
}
|
|
89
47
|
find(filterArgs, ...args) {
|
|
90
48
|
const filterQuery = filter_helper_1.Filter.convertFilterArgsToQuery(filterArgs);
|
|
91
49
|
return this.userModel.find(filterQuery[0], null, filterQuery[1]).exec();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyG;AACzG,yBAAyB;AAEzB,oDAA4C;AAE5C,8EAAoE;AACpE,gFAA4E;AAC5E,iFAA6E;AAC7E,+EAA2E;AAC3E,oFAA+E;AAG/E,6CAAoC;AACpC,+CAA+C;AAC/C,uCAAiC;AAEjC,iEAA+C;AAM/C,IAAa,WAAW,GAAxB,MAAa,WAAY,SAAQ,mCAAiD;IAgBhF,YACqB,aAA4B,EAC5B,YAA0B,EACL,SAAsB,EACxB,MAAc;QAEpD,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QALZ,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAc;QACL,cAAS,GAAT,SAAS,CAAa;QACxB,WAAM,GAAN,MAAM,CAAQ;QAGpD,IAAI,CAAC,KAAK,GAAG,iBAAI,CAAC;IACpB,CAAC;IASD,KAAK,CAAC,MAAM,CAAC,KAAsB,EAAE,WAAkB,EAAE,GAAG,IAAW;QACrE,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAEpD,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAExC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,iBAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAEzD,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE;YACtD,YAAY,EAAE,SAAS;YACvB,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,oBAAS,CAAC,KAAK,CAAC,gBAAgB,GAAG,GAAG,GAAG,IAAI,CAAC,iBAAiB,EAAE;SAC7G,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;IAKD,IAAI,CAAC,UAAuB,EAAE,GAAG,IAAW;QAC1C,MAAM,WAAW,GAAG,sBAAM,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAEhE,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1E,CAAC;IAKD,KAAK,CAAC,SAAS,CAAC,IAAyB,EAAE,IAAU;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAEpE,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,8BAAqB,EAAE,CAAC;SACnC;QAGD,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,qCAA4B,CAAC,qBAAqB,CAAC,CAAC;SAC/D;QAGD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,EAAE,CAAC,MAAM,CAAC,oBAAS,CAAC,YAAY,CAAC,IAAI,GAAG,WAAW,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;gBACzE,IAAI,GAAG,EAAE;oBACP,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBAClB;YACH,CAAC,CAAC,CAAC;SACJ;QAGD,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAE9B,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAGpB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IASS,KAAK,CAAC,YAAY,CAAC,KAA6B,EAAE,WAAiB,EAAE,UAAgC,EAAE;QAC/G,OAAO,8BAAa,CAAC,YAAY,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAKS,KAAK,CAAC,aAAa,CAAC,IAAU,EAAE,IAAyB;QACjE,OAAO,8BAAa,CAAC,aAAa,CAAC,IAAI,EAAE,iBAAI,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;CACF,CAAA;AA3GY,WAAW;IADvB,IAAA,mBAAU,GAAE;IAoBR,WAAA,IAAA,sBAAW,EAAC,MAAM,CAAC,CAAA;IACnB,WAAA,IAAA,eAAM,EAAC,SAAS,CAAC,CAAA;qCAHgB,8BAAa;QACd,4BAAY;QACM,gBAAK;QACV,8BAAM;GApB3C,WAAW,CA2GvB;AA3GY,kCAAW"}
|