@resolveio/server-lib 8.1.36 → 9.0.0

package/http/auth.js

@@ -46,7 +46,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
     var _this = this;
     // Login via HTTP, return refresh token if authenticated
     app.post('/login', function (request, response) { return __awaiter(_this, void 0, void 0, function () {
-        var body, schema, user_1, username, resAuth_1, emailData_1, emailData_2;
+        var body, schema, user_1, resAuth, emailData_1, emailData_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -55,7 +55,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                         error: true,
                         result: 'Invalid header'
                     }));
-                    return [3 /*break*/, 6];
+                    return [3 /*break*/, 8];
                 case 1:
                     body = request.body;
                     schema = new simpl_schema_1.default({
@@ -80,91 +80,97 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                             return [2 /*return*/];
                         }
                     }
-                    return [4 /*yield*/, user_collection_1.Users.findOne({ username: body.username }).exec()];
+                    return [4 /*yield*/, user_collection_1.Users.findOne({ username: body.username })];
                 case 2:
                     user_1 = _a.sent();
                     if (!!user_1) return [3 /*break*/, 4];
-                    return [4 /*yield*/, user_collection_1.Users.findOne({ email: body.username }).exec()];
+                    return [4 /*yield*/, user_collection_1.Users.findOne({ email: body.username })];
                 case 3:
                     user_1 = _a.sent();
                     _a.label = 4;
                 case 4:
-                    username = user_1 ? user_1.username : body.username;
-                    return [4 /*yield*/, user_collection_1.Users.authenticate()(username, body.password)];
+                    if (!user_1) {
+                        response.send(JSON.stringify({
+                            error: true,
+                            result: 'Invalid Username And Password'
+                        }));
+                        return [2 /*return*/];
+                    }
+                    return [4 /*yield*/, user_collection_1.Users.authenticate(user_1, body.password)];
                 case 5:
-                    resAuth_1 = _a.sent();
-                    if (resAuth_1.error) {
-                        if (resAuth_1.error.name === 'TooManyAttemptsError') {
-                            response.send(JSON.stringify({
-                                error: true,
-                                result: resAuth_1.error.message + '.  A password reset link has been sent to your email, please reset your password.'
-                            }));
-                            user_1.services.forgot_password = jwt.sign({ id_user: user_1._id }, serverConfig['JWT_SECRET']);
-                            emailData_1 = {
-                                userToChangePassword: user_1.fullname,
-                                userWhoResetPassword: __1.ResolveIOServer.getClientName() + ' System',
-                                url: serverConfig['ROOT_URL'] + '/forgot-password?' + encodeURIComponent(serverConfig['SERVER_URL']) + '&' + user_1.services.forgot_password
-                            };
-                            user_collection_1.Users.updateOne({ _id: user_1._id }, { $set: { services: user_1.services } }).exec(function (errUp, resUp) {
-                                mainServer.getMethodManager().readFile('email-templates/forgot-password.html').then(function (html) {
-                                    var template = handlebars.compile(html);
-                                    handlebars.registerHelper('equals', function (a, b) {
-                                        return a === b;
-                                    });
-                                    mainServer.getMethodManager().sendEmail(user_1.email, 'ResolveIO (' + __1.ResolveIOServer.getClientName() + ') - Forgot Password', '', template(emailData_1));
-                                }, function (errEmail) { return console.log(errEmail); });
-                            });
-                        }
-                        else if (resAuth_1.error.name === 'NoSaltValueStoredError') {
-                            response.send(JSON.stringify({
-                                error: true,
-                                result: 'A password reset link has been sent to your email, please reset your password.'
-                            }));
-                            user_1.services.forgot_password = jwt.sign({ id_user: user_1._id }, serverConfig['JWT_SECRET']);
-                            emailData_2 = {
-                                userToChangePassword: user_1.fullname,
-                                userWhoResetPassword: __1.ResolveIOServer.getClientName() + ' System',
-                                url: serverConfig['ROOT_URL'] + '/forgot-password?' + encodeURIComponent(serverConfig['SERVER_URL']) + '&' + user_1.services.forgot_password
-                            };
-                            user_collection_1.Users.updateOne({ _id: user_1._id }, { $set: { services: user_1.services } }).exec(function (errUp, resUp) {
-                                mainServer.getMethodManager().readFile('email-templates/forgot-password.html').then(function (html) {
-                                    var template = handlebars.compile(html);
-                                    handlebars.registerHelper('equals', function (a, b) {
-                                        return a === b;
-                                    });
-                                    mainServer.getMethodManager().sendEmail(user_1.email, 'ResolveIO (' + __1.ResolveIOServer.getClientName() + ') - Forgot Password', '', template(emailData_2));
-                                }, function (errEmail) { return console.log(errEmail); });
-                            });
-                        }
-                        else {
-                            response.send(JSON.stringify({
-                                error: true,
-                                result: resAuth_1.error.message
-                            }));
-                        }
+                    resAuth = _a.sent();
+                    if (!resAuth['error']) return [3 /*break*/, 6];
+                    if (resAuth['error'] === 'Too Many Attempts') {
+                        response.send(JSON.stringify({
+                            error: true,
+                            result: resAuth['error'] + '.  A password reset link has been sent to your email, please reset your password.'
+                        }));
+                        user_1.services['forgot_password'] = jwt.sign({ id_user: user_1._id }, serverConfig['JWT_SECRET']);
+                        emailData_1 = {
+                            userToChangePassword: user_1.fullname,
+                            userWhoResetPassword: __1.ResolveIOServer.getClientName() + ' System',
+                            url: serverConfig['ROOT_URL'] + '/forgot-password?' + encodeURIComponent(serverConfig['SERVER_URL']) + '&' + user_1.services['forgot_password']
+                        };
+                        user_collection_1.Users.updateOne({ _id: user_1._id }, { $set: { services: user_1.services } }).then(function (resUp) {
+                            mainServer.getMethodManager().readFile('email-templates/forgot-password.html').then(function (html) {
+                                var template = handlebars.compile(html);
+                                handlebars.registerHelper('equals', function (a, b) {
+                                    return a === b;
+                                });
+                                mainServer.getMethodManager().sendEmail(user_1.email, 'ResolveIO (' + __1.ResolveIOServer.getClientName() + ') - Forgot Password', '', template(emailData_1));
+                            }, function (errEmail) { return console.log(errEmail); });
+                        }, function (errUp) { });
+                    }
+                    else if (resAuth['error'] === 'No Salt Value Stored') {
+                        response.send(JSON.stringify({
+                            error: true,
+                            result: 'A password reset link has been sent to your email, please reset your password.'
+                        }));
+                        user_1.services['forgot_password'] = jwt.sign({ id_user: user_1._id }, serverConfig['JWT_SECRET']);
+                        emailData_2 = {
+                            userToChangePassword: user_1.fullname,
+                            userWhoResetPassword: __1.ResolveIOServer.getClientName() + ' System',
+                            url: serverConfig['ROOT_URL'] + '/forgot-password?' + encodeURIComponent(serverConfig['SERVER_URL']) + '&' + user_1.services['forgot_password']
+                        };
+                        user_collection_1.Users.updateOne({ _id: user_1._id }, { $set: { services: user_1.services } }).then(function (resUp) {
+                            mainServer.getMethodManager().readFile('email-templates/forgot-password.html').then(function (html) {
+                                var template = handlebars.compile(html);
+                                handlebars.registerHelper('equals', function (a, b) {
+                                    return a === b;
+                                });
+                                mainServer.getMethodManager().sendEmail(user_1.email, 'ResolveIO (' + __1.ResolveIOServer.getClientName() + ') - Forgot Password', '', template(emailData_2));
+                            }, function (errEmail) { return console.log(errEmail); });
+                        }, function (err) { });
                     }
                     else {
-                        if (resAuth_1 && resAuth_1.user && resAuth_1.user.active) {
-                            resAuth_1.user.resetAttempts(function (errAt, resAt) {
-                                response.send(JSON.stringify({
-                                    error: false,
-                                    result: {
-                                        token: jwt.sign({ id_user: resAuth_1.user._id }, serverConfig['JWT_SECRET'], {
-                                            expiresIn: 90 * 24 * 60 * 60 * 1000 // 90 days
-                                        })
-                                    }
-                                }));
-                            });
-                        }
+                        response.send(JSON.stringify({
+                            error: true,
+                            result: resAuth['error']
+                        }));
                     }
-                    _a.label = 6;
-                case 6: return [2 /*return*/];
+                    return [3 /*break*/, 8];
+                case 6:
+                    if (!(resAuth && resAuth['data'] && resAuth['data'].active)) return [3 /*break*/, 8];
+                    return [4 /*yield*/, user_collection_1.Users.resetAttempts(resAuth['data'])];
+                case 7:
+                    _a.sent();
+                    response.send(JSON.stringify({
+                        error: false,
+                        result: {
+                            token: jwt.sign({ id_user: resAuth['data']._id }, serverConfig['JWT_SECRET'], {
+                                expiresIn: 90 * 24 * 60 * 60 * 1000 // 90 days
+                            })
+                        }
+                    }));
+                    _a.label = 8;
+                case 8: return [2 /*return*/];
             }
         });
     }); });
     app.post('/accessToken', function (request, response) {
         return __awaiter(this, void 0, void 0, function () {
             var body, schema;
+            var _this = this;
             return __generator(this, function (_a) {
                 if (request.headers.origin !== serverConfig['ROOT_URL'] && request.headers.origin !== serverConfig['SEC_ROOT_URL'] && request.headers.origin !== serverConfig['RESOLVEIO_URL'] && request.headers.origin !== serverConfig['RESOLVEIO_SECONDARY_URL']) {
                     response.send(JSON.stringify({
@@ -205,10 +211,15 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                                 }));
                             }
                             else {
-                                user_collection_1.Users.findById(decoded['id_user']).exec().then(function (user) {
-                                    if (user) {
-                                        if (user.active) {
-                                            user.resetAttempts(function (err, res) {
+                                user_collection_1.Users.findById(decoded['id_user']).then(function (user) { return __awaiter(_this, void 0, void 0, function () {
+                                    return __generator(this, function (_a) {
+                                        switch (_a.label) {
+                                            case 0:
+                                                if (!user) return [3 /*break*/, 4];
+                                                if (!user.active) return [3 /*break*/, 2];
+                                                return [4 /*yield*/, user_collection_1.Users.resetAttempts(user)];
+                                            case 1:
+                                                _a.sent();
                                                 response.send(JSON.stringify({
                                                     error: false,
                                                     result: {
@@ -218,25 +229,27 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                                                         user: user
                                                     }
                                                 }));
-                                            });
-                                        }
-                                        else {
-                                            response.send(JSON.stringify({
-                                                error: true,
-                                                result: 'Account is Disabled'
-                                            }));
+                                                return [3 /*break*/, 3];
+                                            case 2:
+                                                response.send(JSON.stringify({
+                                                    error: true,
+                                                    result: 'Account is Disabled'
+                                                }));
+                                                _a.label = 3;
+                                            case 3: return [3 /*break*/, 5];
+                                            case 4:
+                                                response.send(JSON.stringify({
+                                                    error: true,
+                                                    result: 'Invalid User'
+                                                }));
+                                                _a.label = 5;
+                                            case 5: return [2 /*return*/];
                                         }
-                                    }
-                                    else {
-                                        response.send(JSON.stringify({
-                                            error: true,
-                                            result: 'Invalid User'
-                                        }));
-                                    }
-                                }, function (error) {
+                                    });
+                                }); }, function (error) {
                                     response.send(JSON.stringify({
                                         error: true,
-                                        result: 'Invalid Mongoose Get User'
+                                        result: 'Invalid Mongo Get User'
                                     }));
                                 });
                             }
@@ -251,10 +264,15 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                                 }));
                             }
                             else {
-                                user_collection_1.Users.findById(decoded['id_user']).exec().then(function (user) {
-                                    if (user) {
-                                        if (user.active) {
-                                            user.resetAttempts(function (err, res) {
+                                user_collection_1.Users.findById(decoded['id_user']).then(function (user) { return __awaiter(_this, void 0, void 0, function () {
+                                    return __generator(this, function (_a) {
+                                        switch (_a.label) {
+                                            case 0:
+                                                if (!user) return [3 /*break*/, 4];
+                                                if (!user.active) return [3 /*break*/, 2];
+                                                return [4 /*yield*/, user_collection_1.Users.resetAttempts(user)];
+                                            case 1:
+                                                _a.sent();
                                                 response.send(JSON.stringify({
                                                     error: false,
                                                     result: {
@@ -264,25 +282,27 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                                                         user: user
                                                     }
                                                 }));
-                                            });
-                                        }
-                                        else {
-                                            response.send(JSON.stringify({
-                                                error: true,
-                                                result: 'Account is Disabled'
-                                            }));
+                                                return [3 /*break*/, 3];
+                                            case 2:
+                                                response.send(JSON.stringify({
+                                                    error: true,
+                                                    result: 'Account is Disabled'
+                                                }));
+                                                _a.label = 3;
+                                            case 3: return [3 /*break*/, 5];
+                                            case 4:
+                                                response.send(JSON.stringify({
+                                                    error: true,
+                                                    result: 'Invalid User'
+                                                }));
+                                                _a.label = 5;
+                                            case 5: return [2 /*return*/];
                                         }
-                                    }
-                                    else {
-                                        response.send(JSON.stringify({
-                                            error: true,
-                                            result: 'Invalid User'
-                                        }));
-                                    }
-                                }, function (error) {
+                                    });
+                                }); }, function (error) {
                                     response.send(JSON.stringify({
                                         error: true,
-                                        result: 'Invalid Mongoose Get User'
+                                        result: 'Invalid Mongo Get User'
                                     }));
                                 });
                             }
@@ -334,7 +354,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                             { _id: decoded['id_user'] },
                             { 'services.enrollment': body_1.enrollmentToken }
                         ]
-                    }).select('_id __v username active').exec().then(function (user) {
+                    }, { projection: { _id: 1, __v: 1, username: 1, active: 1 } }).then(function (user) {
                         if (user) {
                             if (user.active) {
                                 response.send(JSON.stringify({
@@ -360,7 +380,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                     }, function (error) {
                         response.send(JSON.stringify({
                             error: true,
-                            result: 'Invalid Mongoose Get User'
+                            result: 'Invalid Mongo Get User'
                         }));
                     });
                 }
@@ -400,6 +420,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                 }
             }
             jwt.verify(body_2.enrollmentToken, serverConfig['JWT_SECRET'], function (err, decoded) { return __awaiter(_this, void 0, void 0, function () {
+                var _this = this;
                 return __generator(this, function (_a) {
                     if (err) {
                         response.send(JSON.stringify({
@@ -413,43 +434,40 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                                 { _id: decoded['id_user'] },
                                 { 'services.enrollment': body_2.enrollmentToken }
                             ]
-                        }).exec().then(function (user) {
-                            if (user) {
-                                if (user.active) {
-                                    user.setPassword(body_2.password, function (errSet, resSet) {
-                                        if (resSet) {
-                                            user.services.enrollment = '';
-                                            user.resetAttempts();
-                                            response.send(JSON.stringify({
-                                                error: false,
-                                                result: true
-                                            }));
-                                        }
-                                        else {
-                                            response.send(JSON.stringify({
-                                                error: true,
-                                                result: errSet
-                                            }));
-                                        }
-                                    });
-                                }
-                                else {
-                                    response.send(JSON.stringify({
-                                        error: true,
-                                        result: 'Account is Disabled'
-                                    }));
+                        }).then(function (user) { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (!user) return [3 /*break*/, 4];
+                                        if (!user.active) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, user_collection_1.Users.setPassword(user, body_2.password)];
+                                    case 1:
+                                        _a.sent();
+                                        response.send(JSON.stringify({
+                                            error: false,
+                                            result: true
+                                        }));
+                                        return [3 /*break*/, 3];
+                                    case 2:
+                                        response.send(JSON.stringify({
+                                            error: true,
+                                            result: 'Account is Disabled'
+                                        }));
+                                        _a.label = 3;
+                                    case 3: return [3 /*break*/, 5];
+                                    case 4:
+                                        response.send(JSON.stringify({
+                                            error: true,
+                                            result: 'Invalid User'
+                                        }));
+                                        _a.label = 5;
+                                    case 5: return [2 /*return*/];
                                 }
-                            }
-                            else {
-                                response.send(JSON.stringify({
-                                    error: true,
-                                    result: 'Invalid User'
-                                }));
-                            }
-                        }, function (error) {
+                            });
+                        }); }, function (error) {
                             response.send(JSON.stringify({
                                 error: true,
-                                result: 'Invalid Mongoose Get User'
+                                result: 'Invalid Mongo Get User'
                             }));
                         });
                     }
@@ -499,7 +517,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                             { _id: decoded['id_user'] },
                             { 'services.forgot_password': body_3.forgotPasswordToken }
                         ]
-                    }).select('_id __v username active').exec().then(function (user) {
+                    }, { projection: { _id: 1, __v: 1, username: 1, active: 1 } }).then(function (user) {
                         if (user) {
                             if (user.active) {
                                 response.send(JSON.stringify({
@@ -519,13 +537,13 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                         else {
                             response.send(JSON.stringify({
                                 error: true,
-                                result: 'Invalid User'
+                                result: 'Invalid Token'
                             }));
                         }
                     }, function (error) {
                         response.send(JSON.stringify({
                             error: true,
-                            result: 'Invalid Mongoose Get User'
+                            result: 'Invalid Mongo Get User'
                         }));
                     });
                 }
@@ -565,6 +583,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                 }
             }
             jwt.verify(body_4.forgotPasswordToken, serverConfig['JWT_SECRET'], function (err, decoded) { return __awaiter(_this, void 0, void 0, function () {
+                var _this = this;
                 return __generator(this, function (_a) {
                     if (err) {
                         response.send(JSON.stringify({
@@ -578,43 +597,40 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                                 { _id: decoded['id_user'] },
                                 { 'services.forgot_password': body_4.forgotPasswordToken }
                             ]
-                        }).exec().then(function (user) {
-                            if (user) {
-                                if (user.active) {
-                                    user.setPassword(body_4.password, function (errSet, resSet) {
-                                        if (resSet) {
-                                            user.services.forgot_password = '';
-                                            user.resetAttempts();
-                                            response.send(JSON.stringify({
-                                                error: false,
-                                                result: true
-                                            }));
-                                        }
-                                        else {
-                                            response.send(JSON.stringify({
-                                                error: true,
-                                                result: errSet
-                                            }));
-                                        }
-                                    });
-                                }
-                                else {
-                                    response.send(JSON.stringify({
-                                        error: true,
-                                        result: 'Account is Disabled'
-                                    }));
+                        }).then(function (user) { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (!user) return [3 /*break*/, 4];
+                                        if (!user.active) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, user_collection_1.Users.setPassword(user, body_4.password)];
+                                    case 1:
+                                        _a.sent();
+                                        response.send(JSON.stringify({
+                                            error: false,
+                                            result: true
+                                        }));
+                                        return [3 /*break*/, 3];
+                                    case 2:
+                                        response.send(JSON.stringify({
+                                            error: true,
+                                            result: 'Account is Disabled'
+                                        }));
+                                        _a.label = 3;
+                                    case 3: return [3 /*break*/, 5];
+                                    case 4:
+                                        response.send(JSON.stringify({
+                                            error: true,
+                                            result: 'Invalid User'
+                                        }));
+                                        _a.label = 5;
+                                    case 5: return [2 /*return*/];
                                 }
-                            }
-                            else {
-                                response.send(JSON.stringify({
-                                    error: true,
-                                    result: 'Invalid User'
-                                }));
-                            }
-                        }, function (error) {
+                            });
+                        }); }, function (error) {
                             response.send(JSON.stringify({
                                 error: true,
-                                result: 'Invalid Mongoose Get User'
+                                result: 'Invalid Mongo Get User'
                             }));
                         });
                     }
@@ -655,11 +671,11 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                             return [2 /*return*/];
                         }
                     }
-                    return [4 /*yield*/, user_collection_1.Users.findOne({ username: body.username }).exec()];
+                    return [4 /*yield*/, user_collection_1.Users.findOne({ username: body.username })];
                 case 2:
                     user = _a.sent();
                     if (!!user) return [3 /*break*/, 4];
-                    return [4 /*yield*/, user_collection_1.Users.findOne({ email: body.username }).exec()];
+                    return [4 /*yield*/, user_collection_1.Users.findOne({ email: body.username })];
                 case 3:
                     user = _a.sent();
                     _a.label = 4;