@lenne.tech/nest-server 3.1.1 → 3.1.2
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/modules/user/core-user.service.d.ts +6 -1
- package/dist/core/modules/user/core-user.service.js +44 -2
- package/dist/core/modules/user/core-user.service.js.map +1 -1
- package/dist/server/modules/user/user.resolver.d.ts +1 -1
- package/dist/server/modules/user/user.resolver.js +10 -10
- 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/modules/user/core-user.service.ts +77 -2
- package/src/server/modules/user/user.resolver.ts +12 -12
- package/src/server/modules/user/user.service.ts +3 -83
|
@@ -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');
|
|
@@ -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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"}
|
|
@@ -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),
|
|
@@ -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":"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"}
|