@lenne.tech/nest-server 2.0.3 → 3.1.1
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/config.env.js +18 -5
- package/dist/config.env.js.map +1 -1
- package/dist/core/common/args/filter.args.js +3 -3
- package/dist/core/common/args/filter.args.js.map +1 -1
- package/dist/core/common/args/pagination.args.js +13 -13
- package/dist/core/common/args/pagination.args.js.map +1 -1
- package/dist/core/common/decorators/graphql-user.decorator.js +1 -1
- package/dist/core/common/decorators/graphql-user.decorator.js.map +1 -1
- package/dist/core/common/decorators/rest-user.decorator.js +1 -1
- package/dist/core/common/decorators/rest-user.decorator.js.map +1 -1
- package/dist/core/common/decorators/restricted.decorator.js +3 -3
- package/dist/core/common/decorators/restricted.decorator.js.map +1 -1
- package/dist/core/common/decorators/roles.decorator.js +1 -1
- package/dist/core/common/decorators/roles.decorator.js.map +1 -1
- package/dist/core/common/enums/comparison-operator.enum.js +1 -1
- package/dist/core/common/enums/comparison-operator.enum.js.map +1 -1
- package/dist/core/common/enums/logical-operator.enum.js +1 -1
- package/dist/core/common/enums/logical-operator.enum.js.map +1 -1
- package/dist/core/common/enums/sort-order.emum.js +1 -1
- package/dist/core/common/enums/sort-order.emum.js.map +1 -1
- package/dist/core/common/helpers/file.helper.js +3 -3
- package/dist/core/common/helpers/file.helper.js.map +1 -1
- package/dist/core/common/helpers/input.helper.js +3 -3
- package/dist/core/common/helpers/input.helper.js.map +1 -1
- package/dist/core/common/helpers/service.helper.d.ts +3 -1
- package/dist/core/common/helpers/service.helper.js +23 -1
- package/dist/core/common/helpers/service.helper.js.map +1 -1
- package/dist/core/common/inputs/combined-filter.input.js +3 -3
- package/dist/core/common/inputs/combined-filter.input.js.map +1 -1
- package/dist/core/common/inputs/filter.input.js +3 -3
- package/dist/core/common/inputs/filter.input.js.map +1 -1
- package/dist/core/common/inputs/single-filter.input.js +6 -6
- package/dist/core/common/inputs/single-filter.input.js.map +1 -1
- package/dist/core/common/inputs/sort.input.js +3 -3
- package/dist/core/common/inputs/sort.input.js.map +1 -1
- package/dist/core/common/interceptors/check-response.interceptor.js +3 -3
- package/dist/core/common/interceptors/check-response.interceptor.js.map +1 -1
- package/dist/core/common/interfaces/mailjet-options.interface.d.ts +4 -0
- package/dist/core/common/interfaces/mailjet-options.interface.js +3 -0
- package/dist/core/common/interfaces/mailjet-options.interface.js.map +1 -0
- package/dist/core/common/interfaces/server-options.interface.d.ts +4 -0
- package/dist/core/common/models/core-persistence.model.js +14 -14
- package/dist/core/common/models/core-persistence.model.js.map +1 -1
- package/dist/core/common/pipes/check-input.pipe.js +5 -5
- package/dist/core/common/pipes/check-input.pipe.js.map +1 -1
- package/dist/core/common/scalars/any.scalar.js +1 -1
- package/dist/core/common/scalars/any.scalar.js.map +1 -1
- package/dist/core/common/scalars/date.scalar.js +1 -1
- package/dist/core/common/scalars/date.scalar.js.map +1 -1
- package/dist/core/common/scalars/json.scalar.js +1 -1
- package/dist/core/common/scalars/json.scalar.js.map +1 -1
- package/dist/core/common/services/email.service.js +1 -1
- package/dist/core/common/services/email.service.js.map +1 -1
- package/dist/core/common/services/mailjet.service.d.ts +15 -0
- package/dist/core/common/services/mailjet.service.js +64 -0
- package/dist/core/common/services/mailjet.service.js.map +1 -0
- package/dist/core/common/services/template.service.js +2 -2
- package/dist/core/common/services/template.service.js.map +1 -1
- package/dist/core/modules/auth/core-auth.model.js +2 -2
- package/dist/core/modules/auth/core-auth.model.js.map +1 -1
- package/dist/core/modules/auth/core-auth.module.js +1 -1
- package/dist/core/modules/auth/core-auth.module.js.map +1 -1
- package/dist/core/modules/auth/core-auth.resolver.js +4 -4
- package/dist/core/modules/auth/core-auth.resolver.js.map +1 -1
- package/dist/core/modules/auth/guards/auth.guard.js +3 -3
- package/dist/core/modules/auth/guards/auth.guard.js.map +1 -1
- package/dist/core/modules/auth/guards/roles.guard.js +2 -2
- package/dist/core/modules/auth/guards/roles.guard.js.map +1 -1
- package/dist/core/modules/auth/jwt.strategy.js +2 -2
- package/dist/core/modules/auth/jwt.strategy.js.map +1 -1
- package/dist/core/modules/auth/services/core-auth.service.js +1 -1
- package/dist/core/modules/auth/services/core-auth.service.js.map +1 -1
- package/dist/core/modules/user/core-basic-user.service.d.ts +1 -1
- package/dist/core/modules/user/core-user.model.d.ts +3 -0
- package/dist/core/modules/user/core-user.model.js +35 -18
- package/dist/core/modules/user/core-user.model.js.map +1 -1
- package/dist/core/modules/user/core-user.service.d.ts +4 -3
- package/dist/core/modules/user/core-user.service.js +28 -1
- package/dist/core/modules/user/core-user.service.js.map +1 -1
- package/dist/core/modules/user/inputs/core-user-create.input.js +3 -3
- package/dist/core/modules/user/inputs/core-user-create.input.js.map +1 -1
- package/dist/core/modules/user/inputs/core-user.input.js +15 -15
- package/dist/core/modules/user/inputs/core-user.input.js.map +1 -1
- package/dist/core.module.js +5 -3
- package/dist/core.module.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/server/common/models/persistence.model.js +5 -5
- package/dist/server/common/models/persistence.model.js.map +1 -1
- package/dist/server/modules/auth/auth.model.js +2 -2
- package/dist/server/modules/auth/auth.model.js.map +1 -1
- package/dist/server/modules/auth/auth.module.js +1 -1
- package/dist/server/modules/auth/auth.module.js.map +1 -1
- package/dist/server/modules/auth/auth.resolver.js +4 -4
- package/dist/server/modules/auth/auth.resolver.js.map +1 -1
- package/dist/server/modules/file/file.controller.js +7 -7
- package/dist/server/modules/file/file.controller.js.map +1 -1
- package/dist/server/modules/user/avatar.controller.js +6 -6
- package/dist/server/modules/user/avatar.controller.js.map +1 -1
- package/dist/server/modules/user/inputs/user-create.input.js +1 -1
- package/dist/server/modules/user/inputs/user-create.input.js.map +1 -1
- package/dist/server/modules/user/inputs/user.input.js +1 -1
- package/dist/server/modules/user/inputs/user.input.js.map +1 -1
- package/dist/server/modules/user/user.model.d.ts +1 -1
- package/dist/server/modules/user/user.model.js +8 -8
- package/dist/server/modules/user/user.model.js.map +1 -1
- package/dist/server/modules/user/user.module.js +1 -1
- package/dist/server/modules/user/user.module.js.map +1 -1
- package/dist/server/modules/user/user.resolver.d.ts +3 -0
- package/dist/server/modules/user/user.resolver.js +55 -24
- package/dist/server/modules/user/user.resolver.js.map +1 -1
- package/dist/server/modules/user/user.service.d.ts +3 -0
- package/dist/server/modules/user/user.service.js +47 -6
- package/dist/server/modules/user/user.service.js.map +1 -1
- package/dist/server/server.controller.js +5 -5
- package/dist/server/server.controller.js.map +1 -1
- package/dist/server/server.module.js +1 -1
- package/dist/server/server.module.js.map +1 -1
- package/dist/test/test.helper.js +2 -2
- package/dist/test/test.helper.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +48 -54
- package/src/config.env.ts +14 -1
- package/src/core/common/helpers/service.helper.ts +34 -4
- package/src/core/common/interfaces/mailjet-options.interface.ts +4 -0
- package/src/core/common/interfaces/server-options.interface.ts +12 -0
- package/src/core/common/models/core-persistence.model.ts +1 -1
- package/src/core/common/services/mailjet.service.ts +84 -0
- package/src/core/modules/user/core-basic-user.service.ts +3 -3
- package/src/core/modules/user/core-user.model.ts +20 -0
- package/src/core/modules/user/core-user.service.ts +54 -8
- package/src/core.module.ts +3 -1
- package/src/index.ts +1 -0
- package/src/server/modules/user/user.resolver.ts +24 -0
- package/src/server/modules/user/user.service.ts +86 -4
- package/src/server/server.module.ts +0 -1
- package/src/templates/password-reset.ejs +3 -0
- package/src/templates/welcome.ejs +3 -2
- package/src/test/test.helper.ts +2 -2
|
@@ -24,29 +24,29 @@ let User = User_1 = class User extends core_user_model_1.CoreUserModel {
|
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
26
|
__decorate([
|
|
27
|
-
graphql_1.Field({ description: 'URL to avatar file of the user', nullable: true }),
|
|
28
|
-
mongoose_1.Prop(),
|
|
27
|
+
(0, graphql_1.Field)({ description: 'URL to avatar file of the user', nullable: true }),
|
|
28
|
+
(0, mongoose_1.Prop)(),
|
|
29
29
|
__metadata("design:type", String)
|
|
30
30
|
], User.prototype, "avatar", void 0);
|
|
31
31
|
__decorate([
|
|
32
|
-
graphql_1.Field((type) => User_1, {
|
|
32
|
+
(0, graphql_1.Field)((type) => User_1, {
|
|
33
33
|
description: 'ID of the user who created the object',
|
|
34
34
|
nullable: true,
|
|
35
35
|
}),
|
|
36
|
-
mongoose_1.Prop({ type: mongoose.Schema.Types.ObjectId, ref: 'User' }),
|
|
36
|
+
(0, mongoose_1.Prop)({ type: mongoose.Schema.Types.ObjectId, ref: 'User' }),
|
|
37
37
|
__metadata("design:type", User)
|
|
38
38
|
], User.prototype, "createdBy", void 0);
|
|
39
39
|
__decorate([
|
|
40
|
-
graphql_1.Field((type) => User_1, {
|
|
40
|
+
(0, graphql_1.Field)((type) => User_1, {
|
|
41
41
|
description: 'ID of the user who last updated the object',
|
|
42
42
|
nullable: true,
|
|
43
43
|
}),
|
|
44
|
-
mongoose_1.Prop({ type: mongoose.Schema.Types.ObjectId, ref: 'User' }),
|
|
44
|
+
(0, mongoose_1.Prop)({ type: mongoose.Schema.Types.ObjectId, ref: 'User' }),
|
|
45
45
|
__metadata("design:type", User)
|
|
46
46
|
], User.prototype, "updatedBy", void 0);
|
|
47
47
|
User = User_1 = __decorate([
|
|
48
|
-
mongoose_1.Schema(),
|
|
49
|
-
graphql_1.ObjectType({ description: 'User' })
|
|
48
|
+
(0, mongoose_1.Schema)(),
|
|
49
|
+
(0, graphql_1.ObjectType)({ description: 'User' })
|
|
50
50
|
], User);
|
|
51
51
|
exports.User = User;
|
|
52
52
|
exports.UserSchema = mongoose_1.SchemaFactory.createForClass(User);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.model.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.model.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6CAAoD;AACpD,gFAA2E;AAE3E,+CAA+D;AAC/D,qCAAqC;AASrC,IAAa,IAAI,YAAjB,MAAa,IAAK,SAAQ,+BAAa;IAAvC;;QAUE,WAAM,GAAW,SAAS,CAAC;QAY3B,cAAS,GAAS,SAAS,CAAC;QAY5B,cAAS,GAAS,SAAS,CAAC;IAC9B,CAAC;CAAA,CAAA;AAzBC;IAFC,eAAK,
|
|
1
|
+
{"version":3,"file":"user.model.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.model.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6CAAoD;AACpD,gFAA2E;AAE3E,+CAA+D;AAC/D,qCAAqC;AASrC,IAAa,IAAI,YAAjB,MAAa,IAAK,SAAQ,+BAAa;IAAvC;;QAUE,WAAM,GAAW,SAAS,CAAC;QAY3B,cAAS,GAAS,SAAS,CAAC;QAY5B,cAAS,GAAS,SAAS,CAAC;IAC9B,CAAC;CAAA,CAAA;AAzBC;IAFC,IAAA,eAAK,EAAC,EAAE,WAAW,EAAE,gCAAgC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACxE,IAAA,eAAI,GAAE;;oCACoB;AAY3B;IALC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAI,EAAE;QACrB,WAAW,EAAE,uCAAuC;QACpD,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;8BACjD,IAAI;uCAAa;AAY5B;IALC,IAAA,eAAK,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAI,EAAE;QACrB,WAAW,EAAE,4CAA4C;QACzD,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;8BACjD,IAAI;uCAAa;AAlCjB,IAAI;IAFhB,IAAA,iBAAM,GAAE;IACR,IAAA,oBAAU,EAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;GACvB,IAAI,CAmChB;AAnCY,oBAAI;AAqCJ,QAAA,UAAU,GAAG,wBAAa,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC"}
|
|
@@ -18,7 +18,7 @@ const graphql_subscriptions_1 = require("graphql-subscriptions");
|
|
|
18
18
|
let UserModule = class UserModule {
|
|
19
19
|
};
|
|
20
20
|
UserModule = __decorate([
|
|
21
|
-
common_1.Module({
|
|
21
|
+
(0, common_1.Module)({
|
|
22
22
|
imports: [mongoose_1.MongooseModule.forFeature([{ name: user_model_1.User.name, schema: user_model_1.UserSchema }])],
|
|
23
23
|
controllers: [avatar_controller_1.AvatarController],
|
|
24
24
|
providers: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,0EAAgE;AAChE,2DAAuD;AACvD,6CAAgD;AAChD,mDAA+C;AAC/C,iDAA6C;AAC7C,+CAAkD;AAClD,iEAA+C;AAmB/C,IAAa,UAAU,GAAvB,MAAa,UAAU;CAAG,CAAA;AAAb,UAAU;IAdtB,eAAM,
|
|
1
|
+
{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,0EAAgE;AAChE,2DAAuD;AACvD,6CAAgD;AAChD,mDAA+C;AAC/C,iDAA6C;AAC7C,+CAAkD;AAClD,iEAA+C;AAmB/C,IAAa,UAAU,GAAvB,MAAa,UAAU;CAAG,CAAA;AAAb,UAAU;IAdtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,yBAAc,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,iBAAI,CAAC,IAAI,EAAE,MAAM,EAAE,uBAAU,EAAE,CAAC,CAAC,CAAC;QAC/E,WAAW,EAAE,CAAC,oCAAgB,CAAC;QAC/B,SAAS,EAAE;YACT,kBAAI;YACJ,4BAAY;YACZ,0BAAW;YACX;gBACE,OAAO,EAAE,SAAS;gBAClB,QAAQ,EAAE,IAAI,8BAAM,EAAE;aACvB;SACF;QACD,OAAO,EAAE,CAAC,yBAAc,EAAE,4BAAY,EAAE,0BAAW,CAAC;KACrD,CAAC;GACW,UAAU,CAAG;AAAb,gCAAU"}
|
|
@@ -11,6 +11,9 @@ 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
|
+
requestPasswordResetMail(email: string): Promise<boolean>;
|
|
16
|
+
resetPassword(token: string, password: string): Promise<boolean>;
|
|
14
17
|
createUser(input: UserCreateInput, user: User, info: GraphQLResolveInfo): Promise<User>;
|
|
15
18
|
updateUser(input: UserInput, id: string, user: User, info: GraphQLResolveInfo): Promise<User>;
|
|
16
19
|
deleteUser(id: string, info: GraphQLResolveInfo): Promise<User>;
|
|
@@ -36,6 +36,15 @@ 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
|
+
async requestPasswordResetMail(email) {
|
|
43
|
+
return await this.usersService.requestPasswordResetMail(email);
|
|
44
|
+
}
|
|
45
|
+
async resetPassword(token, password) {
|
|
46
|
+
return await this.usersService.resetPassword(token, password);
|
|
47
|
+
}
|
|
39
48
|
async createUser(input, user, info) {
|
|
40
49
|
return await this.usersService.create(input, user, info);
|
|
41
50
|
}
|
|
@@ -51,54 +60,76 @@ let UserResolver = class UserResolver {
|
|
|
51
60
|
}
|
|
52
61
|
};
|
|
53
62
|
__decorate([
|
|
54
|
-
graphql_1.Query((returns) => user_model_1.User, { description: 'Get user with specified ID' }),
|
|
55
|
-
__param(0, graphql_1.Args('id')),
|
|
56
|
-
__param(1, graphql_1.Info()),
|
|
63
|
+
(0, graphql_1.Query)((returns) => user_model_1.User, { description: 'Get user with specified ID' }),
|
|
64
|
+
__param(0, (0, graphql_1.Args)('id')),
|
|
65
|
+
__param(1, (0, graphql_1.Info)()),
|
|
57
66
|
__metadata("design:type", Function),
|
|
58
67
|
__metadata("design:paramtypes", [String, Object]),
|
|
59
68
|
__metadata("design:returntype", Promise)
|
|
60
69
|
], UserResolver.prototype, "getUser", null);
|
|
61
70
|
__decorate([
|
|
62
|
-
roles_decorator_1.Roles(role_enum_1.RoleEnum.USER),
|
|
63
|
-
graphql_1.Query((returns) => [user_model_1.User], { description: 'Find users (via filter)' }),
|
|
64
|
-
__param(0, graphql_1.Info()),
|
|
65
|
-
__param(1, graphql_1.Args()),
|
|
71
|
+
(0, roles_decorator_1.Roles)(role_enum_1.RoleEnum.USER),
|
|
72
|
+
(0, graphql_1.Query)((returns) => [user_model_1.User], { description: 'Find users (via filter)' }),
|
|
73
|
+
__param(0, (0, graphql_1.Info)()),
|
|
74
|
+
__param(1, (0, graphql_1.Args)()),
|
|
66
75
|
__metadata("design:type", Function),
|
|
67
76
|
__metadata("design:paramtypes", [Object, filter_args_1.FilterArgs]),
|
|
68
77
|
__metadata("design:returntype", Promise)
|
|
69
78
|
], UserResolver.prototype, "findUsers", null);
|
|
70
79
|
__decorate([
|
|
71
|
-
graphql_1.
|
|
72
|
-
__param(0, graphql_1.Args('
|
|
73
|
-
|
|
74
|
-
|
|
80
|
+
(0, graphql_1.Query)((returns) => Boolean, { description: 'Verify user with email' }),
|
|
81
|
+
__param(0, (0, graphql_1.Args)('token')),
|
|
82
|
+
__metadata("design:type", Function),
|
|
83
|
+
__metadata("design:paramtypes", [String]),
|
|
84
|
+
__metadata("design:returntype", Promise)
|
|
85
|
+
], UserResolver.prototype, "verifyUser", null);
|
|
86
|
+
__decorate([
|
|
87
|
+
(0, graphql_1.Query)((returns) => Boolean, { description: 'Request new password for user with email' }),
|
|
88
|
+
__param(0, (0, graphql_1.Args)('email')),
|
|
89
|
+
__metadata("design:type", Function),
|
|
90
|
+
__metadata("design:paramtypes", [String]),
|
|
91
|
+
__metadata("design:returntype", Promise)
|
|
92
|
+
], UserResolver.prototype, "requestPasswordResetMail", null);
|
|
93
|
+
__decorate([
|
|
94
|
+
(0, graphql_1.Query)((returns) => Boolean, { description: 'Set new password for user with token' }),
|
|
95
|
+
__param(0, (0, graphql_1.Args)('token')),
|
|
96
|
+
__param(1, (0, graphql_1.Args)('password')),
|
|
97
|
+
__metadata("design:type", Function),
|
|
98
|
+
__metadata("design:paramtypes", [String, String]),
|
|
99
|
+
__metadata("design:returntype", Promise)
|
|
100
|
+
], UserResolver.prototype, "resetPassword", null);
|
|
101
|
+
__decorate([
|
|
102
|
+
(0, graphql_1.Mutation)((returns) => user_model_1.User, { description: 'Create a new user' }),
|
|
103
|
+
__param(0, (0, graphql_1.Args)('input')),
|
|
104
|
+
__param(1, (0, graphql_user_decorator_1.GraphQLUser)()),
|
|
105
|
+
__param(2, (0, graphql_1.Info)()),
|
|
75
106
|
__metadata("design:type", Function),
|
|
76
107
|
__metadata("design:paramtypes", [user_create_input_1.UserCreateInput,
|
|
77
108
|
user_model_1.User, Object]),
|
|
78
109
|
__metadata("design:returntype", Promise)
|
|
79
110
|
], UserResolver.prototype, "createUser", null);
|
|
80
111
|
__decorate([
|
|
81
|
-
roles_decorator_1.Roles(role_enum_1.RoleEnum.ADMIN, role_enum_1.RoleEnum.OWNER),
|
|
82
|
-
graphql_1.Mutation((returns) => user_model_1.User, { description: 'Update existing user' }),
|
|
83
|
-
__param(0, graphql_1.Args('input')),
|
|
84
|
-
__param(1, graphql_1.Args('id')),
|
|
85
|
-
__param(2, graphql_user_decorator_1.GraphQLUser()),
|
|
86
|
-
__param(3, graphql_1.Info()),
|
|
112
|
+
(0, roles_decorator_1.Roles)(role_enum_1.RoleEnum.ADMIN, role_enum_1.RoleEnum.OWNER),
|
|
113
|
+
(0, graphql_1.Mutation)((returns) => user_model_1.User, { description: 'Update existing user' }),
|
|
114
|
+
__param(0, (0, graphql_1.Args)('input')),
|
|
115
|
+
__param(1, (0, graphql_1.Args)('id')),
|
|
116
|
+
__param(2, (0, graphql_user_decorator_1.GraphQLUser)()),
|
|
117
|
+
__param(3, (0, graphql_1.Info)()),
|
|
87
118
|
__metadata("design:type", Function),
|
|
88
119
|
__metadata("design:paramtypes", [user_input_1.UserInput, String, user_model_1.User, Object]),
|
|
89
120
|
__metadata("design:returntype", Promise)
|
|
90
121
|
], UserResolver.prototype, "updateUser", null);
|
|
91
122
|
__decorate([
|
|
92
|
-
roles_decorator_1.Roles(role_enum_1.RoleEnum.ADMIN, role_enum_1.RoleEnum.OWNER),
|
|
93
|
-
graphql_1.Mutation((returns) => user_model_1.User, { description: 'Delete existing user' }),
|
|
94
|
-
__param(0, graphql_1.Args('id')),
|
|
95
|
-
__param(1, graphql_1.Info()),
|
|
123
|
+
(0, roles_decorator_1.Roles)(role_enum_1.RoleEnum.ADMIN, role_enum_1.RoleEnum.OWNER),
|
|
124
|
+
(0, graphql_1.Mutation)((returns) => user_model_1.User, { description: 'Delete existing user' }),
|
|
125
|
+
__param(0, (0, graphql_1.Args)('id')),
|
|
126
|
+
__param(1, (0, graphql_1.Info)()),
|
|
96
127
|
__metadata("design:type", Function),
|
|
97
128
|
__metadata("design:paramtypes", [String, Object]),
|
|
98
129
|
__metadata("design:returntype", Promise)
|
|
99
130
|
], UserResolver.prototype, "deleteUser", null);
|
|
100
131
|
__decorate([
|
|
101
|
-
graphql_1.Subscription((returns) => user_model_1.User, {
|
|
132
|
+
(0, graphql_1.Subscription)((returns) => user_model_1.User, {
|
|
102
133
|
resolve: (value) => value,
|
|
103
134
|
}),
|
|
104
135
|
__metadata("design:type", Function),
|
|
@@ -106,8 +137,8 @@ __decorate([
|
|
|
106
137
|
__metadata("design:returntype", Promise)
|
|
107
138
|
], UserResolver.prototype, "userCreated", null);
|
|
108
139
|
UserResolver = __decorate([
|
|
109
|
-
graphql_1.Resolver((of) => user_model_1.User),
|
|
110
|
-
__param(1, common_1.Inject('PUB_SUB')),
|
|
140
|
+
(0, graphql_1.Resolver)((of) => user_model_1.User),
|
|
141
|
+
__param(1, (0, common_1.Inject)('PUB_SUB')),
|
|
111
142
|
__metadata("design:paramtypes", [user_service_1.UserService, graphql_subscriptions_1.PubSub])
|
|
112
143
|
], UserResolver);
|
|
113
144
|
exports.UserResolver = UserResolver;
|
|
@@ -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;IASD,KAAK,CAAC,UAAU,CACC,KAAsB,EACtB,IAAU,EACjB,IAAwB;QAEhC,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3D,CAAC;IAOD,KAAK,CAAC,UAAU,CACC,KAAgB,EACnB,EAAU,EACP,IAAU,EACjB,IAAwB;QAKhC,KAAK,GAAG,MAAM,0BAAW,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,sBAAS,CAAC,CAAC;QAGxD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/D,CAAC;IAOD,KAAK,CAAC,UAAU,CAAa,EAAU,EAAU,IAAwB;QACvE,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAYD,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAClD,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"user.resolver.js","sourceRoot":"","sources":["../../../../src/server/modules/user/user.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,9 @@ 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>;
|
|
21
24
|
find(filterArgs?: FilterArgs, ...args: any[]): Promise<User[]>;
|
|
22
25
|
setAvatar(file: Express.Multer.File, user: User): Promise<string>;
|
|
23
26
|
protected prepareInput(input: {
|
|
@@ -25,6 +25,8 @@ 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");
|
|
28
30
|
let UserService = class UserService extends core_user_service_1.CoreUserService {
|
|
29
31
|
constructor(configService, emailService, userModel, pubSub) {
|
|
30
32
|
super(userModel);
|
|
@@ -36,15 +38,54 @@ let UserService = class UserService extends core_user_service_1.CoreUserService
|
|
|
36
38
|
}
|
|
37
39
|
async create(input, currentUser, ...args) {
|
|
38
40
|
const user = await super.create(input, currentUser);
|
|
39
|
-
|
|
41
|
+
await this.prepareOutput(user, args[0]);
|
|
40
42
|
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();
|
|
41
45
|
await this.emailService.sendMail(user.email, 'Welcome', {
|
|
42
46
|
htmlTemplate: 'welcome',
|
|
43
|
-
templateData: user,
|
|
44
|
-
text,
|
|
47
|
+
templateData: { name: user.username, link: config_env_1.default.email.verificationLink + '/' + verificationToken },
|
|
45
48
|
});
|
|
46
49
|
return user;
|
|
47
50
|
}
|
|
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
|
+
}
|
|
48
89
|
find(filterArgs, ...args) {
|
|
49
90
|
const filterQuery = filter_helper_1.Filter.convertFilterArgsToQuery(filterArgs);
|
|
50
91
|
return this.userModel.find(filterQuery[0], null, filterQuery[1]).exec();
|
|
@@ -76,9 +117,9 @@ let UserService = class UserService extends core_user_service_1.CoreUserService
|
|
|
76
117
|
}
|
|
77
118
|
};
|
|
78
119
|
UserService = __decorate([
|
|
79
|
-
common_1.Injectable(),
|
|
80
|
-
__param(2, mongoose_1.InjectModel('User')),
|
|
81
|
-
__param(3, common_1.Inject('PUB_SUB')),
|
|
120
|
+
(0, common_1.Injectable)(),
|
|
121
|
+
__param(2, (0, mongoose_1.InjectModel)('User')),
|
|
122
|
+
__param(3, (0, common_1.Inject)('PUB_SUB')),
|
|
82
123
|
__metadata("design:paramtypes", [config_service_1.ConfigService,
|
|
83
124
|
email_service_1.EmailService,
|
|
84
125
|
mongoose_2.Model,
|
|
@@ -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":"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"}
|
|
@@ -26,21 +26,21 @@ let ServerController = class ServerController {
|
|
|
26
26
|
}
|
|
27
27
|
};
|
|
28
28
|
__decorate([
|
|
29
|
-
common_1.Get(),
|
|
30
|
-
common_1.Render('index'),
|
|
29
|
+
(0, common_1.Get)(),
|
|
30
|
+
(0, common_1.Render)('index'),
|
|
31
31
|
__metadata("design:type", Function),
|
|
32
32
|
__metadata("design:paramtypes", []),
|
|
33
33
|
__metadata("design:returntype", void 0)
|
|
34
34
|
], ServerController.prototype, "root", null);
|
|
35
35
|
__decorate([
|
|
36
|
-
common_1.Get('config'),
|
|
37
|
-
__1.Roles(__1.RoleEnum.ADMIN),
|
|
36
|
+
(0, common_1.Get)('config'),
|
|
37
|
+
(0, __1.Roles)(__1.RoleEnum.ADMIN),
|
|
38
38
|
__metadata("design:type", Function),
|
|
39
39
|
__metadata("design:paramtypes", []),
|
|
40
40
|
__metadata("design:returntype", void 0)
|
|
41
41
|
], ServerController.prototype, "config", null);
|
|
42
42
|
ServerController = __decorate([
|
|
43
|
-
common_1.Controller(),
|
|
43
|
+
(0, common_1.Controller)(),
|
|
44
44
|
__metadata("design:paramtypes", [__1.ConfigService])
|
|
45
45
|
], ServerController);
|
|
46
46
|
exports.ServerController = ServerController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.controller.js","sourceRoot":"","sources":["../../src/server/server.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyD;AACzD,0BAAoD;AAGpD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAC3B,YAAsB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAItD,IAAI;QACF,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC;SACnC,CAAC;IACJ,CAAC;IAID,MAAM;QACJ,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;IACnC,CAAC;CACF,CAAA;AAXC;IAFC,YAAG,
|
|
1
|
+
{"version":3,"file":"server.controller.js","sourceRoot":"","sources":["../../src/server/server.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyD;AACzD,0BAAoD;AAGpD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAC3B,YAAsB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAItD,IAAI;QACF,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC;SACnC,CAAC;IACJ,CAAC;IAID,MAAM;QACJ,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;IACnC,CAAC;CACF,CAAA;AAXC;IAFC,IAAA,YAAG,GAAE;IACL,IAAA,eAAM,EAAC,OAAO,CAAC;;;;4CAKf;AAID;IAFC,IAAA,YAAG,EAAC,QAAQ,CAAC;IACb,IAAA,SAAK,EAAC,YAAQ,CAAC,KAAK,CAAC;;;;8CAGrB;AAfU,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAE0B,iBAAa;GADvC,gBAAgB,CAgB5B;AAhBY,4CAAgB"}
|
|
@@ -16,7 +16,7 @@ const server_controller_1 = require("./server.controller");
|
|
|
16
16
|
let ServerModule = class ServerModule {
|
|
17
17
|
};
|
|
18
18
|
ServerModule = __decorate([
|
|
19
|
-
common_1.Module({
|
|
19
|
+
(0, common_1.Module)({
|
|
20
20
|
imports: [
|
|
21
21
|
core_module_1.CoreModule.forRoot(config_env_1.default),
|
|
22
22
|
auth_module_1.AuthModule.forRoot(config_env_1.default.jwt),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.module.js","sourceRoot":"","sources":["../../src/server/server.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,8CAAsC;AACtC,gDAA4C;AAC5C,4DAAwD;AACxD,oEAAgE;AAChE,2DAAuD;
|
|
1
|
+
{"version":3,"file":"server.module.js","sourceRoot":"","sources":["../../src/server/server.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,8CAAsC;AACtC,gDAA4C;AAC5C,4DAAwD;AACxD,oEAAgE;AAChE,2DAAuD;AAyBvD,IAAa,YAAY,GAAzB,MAAa,YAAY;CAAG,CAAA;AAAf,YAAY;IAjBxB,IAAA,eAAM,EAAC;QAEN,OAAO,EAAE;YAEP,wBAAU,CAAC,OAAO,CAAC,oBAAS,CAAC;YAI7B,wBAAU,CAAC,OAAO,CAAC,oBAAS,CAAC,GAAG,CAAC;SAClC;QAGD,WAAW,EAAE,CAAC,gCAAc,EAAE,oCAAgB,CAAC;QAG/C,OAAO,EAAE,CAAC,wBAAU,EAAE,wBAAU,CAAC;KAClC,CAAC;GACW,YAAY,CAAG;AAAf,oCAAY"}
|
package/dist/test/test.helper.js
CHANGED
|
@@ -33,7 +33,7 @@ class TestHelper {
|
|
|
33
33
|
}
|
|
34
34
|
graphql = Object.assign({
|
|
35
35
|
arguments: null,
|
|
36
|
-
fields: [
|
|
36
|
+
fields: [],
|
|
37
37
|
name: null,
|
|
38
38
|
type: TestGraphQLType.QUERY,
|
|
39
39
|
}, graphql);
|
|
@@ -43,7 +43,7 @@ class TestHelper {
|
|
|
43
43
|
if (graphql.arguments) {
|
|
44
44
|
queryObj[graphql.type][graphql.name].__args = graphql.arguments;
|
|
45
45
|
}
|
|
46
|
-
query = json_to_graphql_query_1.jsonToGraphQLQuery(queryObj, { pretty: true });
|
|
46
|
+
query = (0, json_to_graphql_query_1.jsonToGraphQLQuery)(queryObj, { pretty: true });
|
|
47
47
|
}
|
|
48
48
|
if (options.convertEnums) {
|
|
49
49
|
if (Array.isArray(options.convertEnums)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.helper.js","sourceRoot":"","sources":["../../src/test/test.helper.ts"],"names":[],"mappings":";;;AAEA,iEAA2D;AAE3D,uCAAuC;AACvC,6BAA6B;AAK7B,IAAY,eAIX;AAJD,WAAY,eAAe;IACzB,kCAAe,CAAA;IACf,wCAAqB,CAAA;IACrB,gDAA6B,CAAA;AAC/B,CAAC,EAJW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAI1B;AAwFD,MAAa,UAAU;IAMrB,YAAY,GAAQ;QAClB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAOD,KAAK,CAAC,OAAO,CAAC,OAAmC,EAAE,UAA8B,EAAE;QAEjF,OAAO,GAAG,MAAM,CAAC,MAAM,CACrB;YACE,YAAY,EAAE,IAAI;YAClB,KAAK,EAAE,IAAI;YACX,UAAU,EAAE,GAAG;YACf,GAAG,EAAE,KAAK;YACV,QAAQ,EAAE,KAAK;SAChB,EACD,OAAO,CACR,CAAC;QAGF,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAGrD,IAAI,KAAK,GAAG,EAAE,CAAC;QAGf,IAAI,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,YAAY,MAAM,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,OAAiB,CAAC,EAAE;YAEvG,KAAK,GAAG,OAAiB,CAAC;SAC3B;aAAM;YAEL,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,YAAY,MAAM,EAAE;gBAC5D,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAS,CAAC;aACpC;YAGD,OAAO,GAAG,MAAM,CAAC,MAAM,CACrB;gBACE,SAAS,EAAE,IAAI;gBACf,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"test.helper.js","sourceRoot":"","sources":["../../src/test/test.helper.ts"],"names":[],"mappings":"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"}
|