@resolveio/server-lib 4.0.13 → 4.0.14
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/http/auth.js +23 -6
- package/package.json +1 -1
package/http/auth.js
CHANGED
|
@@ -43,7 +43,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
|
|
|
43
43
|
var _this = this;
|
|
44
44
|
// Login via HTTP, return refresh token if authenticated
|
|
45
45
|
app.post('/login', function (request, response) { return __awaiter(_this, void 0, void 0, function () {
|
|
46
|
-
var user_1, username, resAuth_1, emailData_1;
|
|
46
|
+
var user_1, username, resAuth_1, emailData_1, emailData_2;
|
|
47
47
|
return __generator(this, function (_a) {
|
|
48
48
|
switch (_a.label) {
|
|
49
49
|
case 0:
|
|
@@ -88,6 +88,27 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
|
|
|
88
88
|
}, function (errEmail) { return console.log(errEmail); });
|
|
89
89
|
});
|
|
90
90
|
}
|
|
91
|
+
else if (resAuth_1.error === 'NoSaltValueStoredError') {
|
|
92
|
+
response.send(JSON.stringify({
|
|
93
|
+
error: true,
|
|
94
|
+
result: 'A password reset link has been sent to your email, please reset your password.'
|
|
95
|
+
}));
|
|
96
|
+
user_1.services.forgot_password = jwt.sign({ id_user: user_1._id }, serverConfig['JWT_SECRET']);
|
|
97
|
+
emailData_2 = {
|
|
98
|
+
userToChangePassword: user_1.fullname,
|
|
99
|
+
userWhoResetPassword: __1.ResolveIOServer.getClientName() + ' System',
|
|
100
|
+
url: serverConfig['ROOT_URL'] + '/forgot-password?' + encodeURIComponent(serverConfig['SERVER_URL']) + '&' + user_1.services.forgot_password
|
|
101
|
+
};
|
|
102
|
+
user_collection_1.Users.updateOne({ _id: user_1._id }, { $set: { services: user_1.services } }).exec(function (errUp, resUp) {
|
|
103
|
+
mainServer.getMethodManager().readFile('email-templates/forgot-password.html').then(function (html) {
|
|
104
|
+
var template = handlebars.compile(html);
|
|
105
|
+
handlebars.registerHelper('equals', function (a, b) {
|
|
106
|
+
return a === b;
|
|
107
|
+
});
|
|
108
|
+
mainServer.getMethodManager().sendEmail(user_1.email, 'ResolveIO (' + __1.ResolveIOServer.getClientName() + ') - Forgot Password', '', template(emailData_2));
|
|
109
|
+
}, function (errEmail) { return console.log(errEmail); });
|
|
110
|
+
});
|
|
111
|
+
}
|
|
91
112
|
else {
|
|
92
113
|
response.send(JSON.stringify({
|
|
93
114
|
error: true,
|
|
@@ -137,7 +158,6 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
|
|
|
137
158
|
if (user) {
|
|
138
159
|
if (user.active) {
|
|
139
160
|
user.resetAttempts(function (err, res) {
|
|
140
|
-
user.save();
|
|
141
161
|
response.send(JSON.stringify({
|
|
142
162
|
error: false,
|
|
143
163
|
result: {
|
|
@@ -184,7 +204,6 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
|
|
|
184
204
|
if (user) {
|
|
185
205
|
if (user.active) {
|
|
186
206
|
user.resetAttempts(function (err, res) {
|
|
187
|
-
user.save();
|
|
188
207
|
response.send(JSON.stringify({
|
|
189
208
|
error: false,
|
|
190
209
|
result: {
|
|
@@ -428,9 +447,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
|
|
|
428
447
|
user.setPassword(request.body.password, function (errSet, resSet) {
|
|
429
448
|
if (resSet) {
|
|
430
449
|
user.services.forgot_password = '';
|
|
431
|
-
user.resetAttempts(
|
|
432
|
-
user.save();
|
|
433
|
-
});
|
|
450
|
+
user.resetAttempts();
|
|
434
451
|
response.send(JSON.stringify({
|
|
435
452
|
error: false,
|
|
436
453
|
result: true
|