Added ?key=xxx to user invitation email, #3611
Ylian Saint-Hilaire committed
Feb 7, 2022 at 16:56 UTC
885ab14833676083b52c151159ec92fce3298860
14 files changed
+7
-4
agents/MeshCmd-signed.exe
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
agents/MeshCmd64-signed.exe
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
agents/MeshService-signed.exe
Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ
agents/MeshService.exe
Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ
agents/MeshService64-signed.exe
Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ
agents/MeshService64.exe
Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ
agents/agents-old/MeshCmd-signed.exe
Binary files a/agents/agents-old/MeshCmd-signed.exe and /dev/null differ
agents/agents-old/MeshCmd64-signed.exe
Binary files a/agents/agents-old/MeshCmd64-signed.exe and /dev/null differ
agents/agents-old/MeshService-signed.exe
Binary files a/agents/agents-old/MeshService-signed.exe and /dev/null differ
agents/agents-old/MeshService.exe
Binary files a/agents/agents-old/MeshService.exe and /dev/null differ
agents/agents-old/MeshService64-signed.exe
Binary files a/agents/agents-old/MeshService64-signed.exe and /dev/null differ
agents/agents-old/MeshService64.exe
Binary files a/agents/agents-old/MeshService64.exe and /dev/null differ
meshuser.js
+3
-3
@@ -5265,7 +5265,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
5265
5266
// Perform email invitation
5267
if ((command.emailInvitation == true) && (command.emailVerified == true) && command.email && domain.mailserver) {
5268
- domain.mailserver.sendAccountInviteMail(newuserdomain, (user.realname ? user.realname : user.name), newusername, command.email.toLowerCase(), command.pass, parent.getLanguageCodes(req));
5268
+ domain.mailserver.sendAccountInviteMail(newuserdomain, (user.realname ? user.realname : user.name), newusername, command.email.toLowerCase(), command.pass, parent.getLanguageCodes(req), req.query.key);
5269
}
5270
5271
// Log in the auth log
@@ -5504,7 +5504,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
5504
if (parent.parent.authlog) { parent.parent.authLog('https', 'User ' + user.name + ' changed email from ' + oldemail + ' to ' + user.email); }
5505
5506
// Send the verification email
5507
- if (domain.mailserver != null) { domain.mailserver.sendAccountCheckMail(domain, user.name, user._id, user.email, parent.getLanguageCodes(req)); }
5507
+ if (domain.mailserver != null) { domain.mailserver.sendAccountCheckMail(domain, user.name, user._id, user.email, parent.getLanguageCodes(req), req.query.key); }
5508
}
5509
});
5510
}
@@ -6100,7 +6100,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
6100
6101
if ((domain.mailserver != null) && (obj.user.email.toLowerCase() == command.email)) {
6102
// Send the verification email
6103
- domain.mailserver.sendAccountCheckMail(domain, user.name, user._id, user.email, parent.getLanguageCodes(req));
6103
+ domain.mailserver.sendAccountCheckMail(domain, user.name, user._id, user.email, parent.getLanguageCodes(req), req.query.key);
6104
}
6105
}
6106
package.json
+4
-1
@@ -36,6 +36,7 @@
36
"sample-config-advanced.json"
37
],
38
"dependencies": {
39
+ "@yetzt/nedb": "^1.8.0",
40
"body-parser": "^1.19.0",
41
"cbor": "~5.2.0",
42
"compression": "^1.7.4",
@@ -43,10 +44,12 @@
44
"express": "^4.17.0",
45
"express-handlebars": "^3.1.0",
46
"express-ws": "^4.0.0",
47
+ "html-minifier": "^4.0.0",
48
"ipcheck": "^0.1.0",
49
+ "jsdom": "^19.0.0",
50
+ "minify-js": "^0.0.4",
51
"minimist": "^1.2.5",
52
"multiparty": "^4.2.1",
49
- "@yetzt/nedb": "^1.8.0",
53
"node-forge": "^1.0.0",
54
"ws": "^5.2.3",
55
"yauzl": "^2.10.0"