@resolveio/server-lib 2.2.3-newrole → 2.2.4-newrole
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 +4 -5
- package/package.json +1 -1
package/http/auth.js
CHANGED
|
@@ -64,7 +64,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
|
|
|
64
64
|
case 4:
|
|
65
65
|
username = user_1 ? user_1.username : request.body.username;
|
|
66
66
|
user_collection_1.Users.authenticate()(username, request.body.password).then(function (res) {
|
|
67
|
-
if (res && res.user && res.user.active) {
|
|
67
|
+
if (res && res.user && res.user.active && !res.error) {
|
|
68
68
|
res.user.resetAttempts(function (errAt, resAt, errorAt) {
|
|
69
69
|
response.send(JSON.stringify({
|
|
70
70
|
error: false,
|
|
@@ -76,11 +76,10 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
|
|
|
76
76
|
}));
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
|
-
|
|
80
|
-
if (error.name === 'TooManyAttemptsError') {
|
|
79
|
+
else if (res.error.name === 'TooManyAttemptsError') {
|
|
81
80
|
response.send(JSON.stringify({
|
|
82
81
|
error: true,
|
|
83
|
-
result: error.message + '. A password reset link has been sent to your email, please reset your password.'
|
|
82
|
+
result: res.error.message + '. A password reset link has been sent to your email, please reset your password.'
|
|
84
83
|
}));
|
|
85
84
|
user_1.services.forgot_password = jwt.sign({ id_user: user_1._id }, serverConfig['JWT_SECRET']);
|
|
86
85
|
var emailData_1 = {
|
|
@@ -101,7 +100,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
|
|
|
101
100
|
else {
|
|
102
101
|
response.send(JSON.stringify({
|
|
103
102
|
error: true,
|
|
104
|
-
result: error.message
|
|
103
|
+
result: res.error.message
|
|
105
104
|
}));
|
|
106
105
|
}
|
|
107
106
|
});
|