@resolveio/server-lib 9.0.32 → 9.0.34

package/http/auth.js

@@ -1,159 +1,106 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupAuthRoutes = void 0;
-var user_collection_1 = require("../collections/user.collection");
-var jwt = require("jsonwebtoken");
-var handlebars = require("handlebars");
-var __1 = require("..");
-var simpl_schema_1 = require("simpl-schema");
-function setupAuthRoutes(mainServer, app, serverConfig) {
-    var _this = this;
+import { Users } from '../collections/user.collection';
+import * as jwt from 'jsonwebtoken';
+import * as handlebars from 'handlebars';
+import { ResolveIOServer } from '..';
+import SimpleSchema from 'simpl-schema';
+export function setupAuthRoutes(mainServer, app, serverConfig) {
     // 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, resAuth, emailData_1, emailData_2;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!(request.headers.origin !== serverConfig['ROOT_URL'] && request.headers.origin !== serverConfig['SEC_ROOT_URL'])) return [3 /*break*/, 1];
+    app.post('/login', async (request, response) => {
+        if (request.headers.origin !== serverConfig['ROOT_URL'] && request.headers.origin !== serverConfig['SEC_ROOT_URL']) {
+            response.send(JSON.stringify({
+                error: true,
+                result: 'Invalid header'
+            }));
+        }
+        else {
+            let body = request.body;
+            let schema = new SimpleSchema({
+                username: {
+                    type: String
+                },
+                password: {
+                    type: String
+                }
+            });
+            try {
+                schema.validate(body);
+            }
+            catch (errors) {
+                if (errors) {
+                    console.error('Error in HTTP Check (/login)', errors);
+                    ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/login' + '\n\nData Being Checked\n' + JSON.stringify(body, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
                     response.send(JSON.stringify({
                         error: true,
-                        result: 'Invalid header'
+                        result: 'Invalid Parameters'
                     }));
-                    return [3 /*break*/, 8];
-                case 1:
-                    body = request.body;
-                    schema = new simpl_schema_1.default({
-                        username: {
-                            type: String
-                        },
-                        password: {
-                            type: String
-                        }
-                    });
-                    try {
-                        schema.validate(body);
-                    }
-                    catch (errors) {
-                        if (errors) {
-                            console.error('Error in HTTP Check (/login)', errors);
-                            __1.ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', __1.ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/login' + '\n\nData Being Checked\n' + JSON.stringify(body, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
-                            response.send(JSON.stringify({
-                                error: true,
-                                result: 'Invalid Parameters'
-                            }));
-                            return [2 /*return*/];
-                        }
-                    }
-                    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 })];
-                case 3:
-                    user_1 = _a.sent();
-                    _a.label = 4;
-                case 4:
-                    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 = _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 {
-                        response.send(JSON.stringify({
-                            error: true,
-                            result: resAuth['error']
-                        }));
-                    }
-                    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();
+                    return;
+                }
+            }
+            let user = await Users.findOne({ username: body.username });
+            if (!user) {
+                user = await Users.findOne({ email: body.username });
+            }
+            if (!user) {
+                response.send(JSON.stringify({
+                    error: true,
+                    result: 'Invalid Username And Password'
+                }));
+                return;
+            }
+            let resAuth = await Users.authenticate(user, body.password);
+            if (resAuth['error']) {
+                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.services['forgot_password'] = jwt.sign({ id_user: user._id }, serverConfig['JWT_SECRET']);
+                    let emailData = {
+                        userToChangePassword: user.fullname,
+                        userWhoResetPassword: ResolveIOServer.getClientName() + ' System',
+                        url: serverConfig['ROOT_URL'] + '/forgot-password?' + encodeURIComponent(serverConfig['SERVER_URL']) + '&' + user.services['forgot_password']
+                    };
+                    Users.updateOne({ _id: user._id }, { $set: { services: user.services } }).then(resUp => {
+                        mainServer.getMethodManager().readFile('email-templates/forgot-password.html').then(html => {
+                            let template = handlebars.compile(html);
+                            handlebars.registerHelper('equals', (a, b) => {
+                                return a === b;
+                            });
+                            mainServer.getMethodManager().sendEmail(user.email, 'ResolveIO (' + ResolveIOServer.getClientName() + ') - Forgot Password', '', template(emailData));
+                        }, errEmail => console.log(errEmail));
+                    }, 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.services['forgot_password'] = jwt.sign({ id_user: user._id }, serverConfig['JWT_SECRET']);
+                    let emailData = {
+                        userToChangePassword: user.fullname,
+                        userWhoResetPassword: ResolveIOServer.getClientName() + ' System',
+                        url: serverConfig['ROOT_URL'] + '/forgot-password?' + encodeURIComponent(serverConfig['SERVER_URL']) + '&' + user.services['forgot_password']
+                    };
+                    Users.updateOne({ _id: user._id }, { $set: { services: user.services } }).then(resUp => {
+                        mainServer.getMethodManager().readFile('email-templates/forgot-password.html').then(html => {
+                            let template = handlebars.compile(html);
+                            handlebars.registerHelper('equals', (a, b) => {
+                                return a === b;
+                            });
+                            mainServer.getMethodManager().sendEmail(user.email, 'ResolveIO (' + ResolveIOServer.getClientName() + ') - Forgot Password', '', template(emailData));
+                        }, errEmail => console.log(errEmail));
+                    }, err => { });
+                }
+                else {
+                    response.send(JSON.stringify({
+                        error: true,
+                        result: resAuth['error']
+                    }));
+                }
+            }
+            else {
+                if (resAuth && resAuth['data'] && resAuth['data'].active) {
+                    await Users.resetAttempts(resAuth['data']);
                     response.send(JSON.stringify({
                         error: false,
                         result: {
@@ -162,156 +109,132 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                             })
                         }
                     }));
-                    _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']) {
+        }
+    });
+    app.post('/accessToken', async function (request, response) {
+        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({
+                error: true,
+                result: 'Invalid header'
+            }));
+        }
+        else {
+            let body = request.body;
+            let schema = new SimpleSchema({
+                refreshToken: {
+                    type: String
+                },
+                appVersion: {
+                    type: Number
+                }
+            });
+            try {
+                schema.validate(body);
+            }
+            catch (errors) {
+                if (errors) {
+                    console.error('Error in HTTP Check (/accessToken)', errors);
+                    ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/accessToken' + '\n\nData Being Checked\n' + JSON.stringify(body, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
                     response.send(JSON.stringify({
                         error: true,
-                        result: 'Invalid header'
+                        result: 'Invalid Parameters'
                     }));
+                    return;
                 }
-                else {
-                    body = request.body;
-                    schema = new simpl_schema_1.default({
-                        refreshToken: {
-                            type: String
-                        },
-                        appVersion: {
-                            type: Number
-                        }
-                    });
-                    try {
-                        schema.validate(body);
-                    }
-                    catch (errors) {
-                        if (errors) {
-                            console.error('Error in HTTP Check (/accessToken)', errors);
-                            __1.ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', __1.ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/accessToken' + '\n\nData Being Checked\n' + JSON.stringify(body, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
-                            response.send(JSON.stringify({
-                                error: true,
-                                result: 'Invalid Parameters'
-                            }));
-                            return [2 /*return*/];
-                        }
+            }
+            if (serverConfig['ROOT_URL'] !== 'http://localhost:4200') {
+                jwt.verify(body.refreshToken, serverConfig['JWT_SECRET'], (err, decoded) => {
+                    if (err) {
+                        response.send(JSON.stringify({
+                            error: true,
+                            result: 'Invalid Token'
+                        }));
                     }
-                    if (serverConfig['ROOT_URL'] !== 'http://localhost:4200') {
-                        jwt.verify(body.refreshToken, serverConfig['JWT_SECRET'], function (err, decoded) {
-                            if (err) {
-                                response.send(JSON.stringify({
-                                    error: true,
-                                    result: 'Invalid Token'
-                                }));
-                            }
-                            else {
-                                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: {
-                                                        token: jwt.sign({ id_user: user._id }, serverConfig['JWT_SECRET'], {
-                                                            expiresIn: 3 * 24 * 60 * 60 * 1000 // 3 days
-                                                        }),
-                                                        user: user
-                                                    }
-                                                }));
-                                                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 {
+                        Users.findById(decoded['id_user']).then(async (user) => {
+                            if (user) {
+                                if (user.active) {
+                                    await Users.resetAttempts(user);
+                                    response.send(JSON.stringify({
+                                        error: false,
+                                        result: {
+                                            token: jwt.sign({ id_user: user._id }, serverConfig['JWT_SECRET'], {
+                                                expiresIn: 3 * 24 * 60 * 60 * 1000 // 3 days
+                                            }),
+                                            user: user
                                         }
-                                    });
-                                }); }, function (error) {
+                                    }));
+                                }
+                                else {
                                     response.send(JSON.stringify({
                                         error: true,
-                                        result: 'Invalid Mongo Get User'
+                                        result: 'Account is Disabled'
                                     }));
-                                });
+                                }
                             }
-                        });
-                    }
-                    else {
-                        jwt.verify(body.refreshToken, serverConfig['JWT_SECRET'], function (err, decoded) {
-                            if (err) {
+                            else {
                                 response.send(JSON.stringify({
                                     error: true,
-                                    result: 'Invalid Token'
+                                    result: 'Invalid User'
                                 }));
                             }
-                            else {
-                                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: {
-                                                        token: jwt.sign({ id_user: user._id }, serverConfig['JWT_SECRET'], {
-                                                            expiresIn: 3 * 24 * 60 * 60 * 1000 // 3 days
-                                                        }),
-                                                        user: user
-                                                    }
-                                                }));
-                                                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*/];
+                        }, error => {
+                            response.send(JSON.stringify({
+                                error: true,
+                                result: 'Invalid Mongo Get User'
+                            }));
+                        });
+                    }
+                });
+            }
+            else {
+                jwt.verify(body.refreshToken, serverConfig['JWT_SECRET'], (err, decoded) => {
+                    if (err) {
+                        response.send(JSON.stringify({
+                            error: true,
+                            result: 'Invalid Token'
+                        }));
+                    }
+                    else {
+                        Users.findById(decoded['id_user']).then(async (user) => {
+                            if (user) {
+                                if (user.active) {
+                                    await Users.resetAttempts(user);
+                                    response.send(JSON.stringify({
+                                        error: false,
+                                        result: {
+                                            token: jwt.sign({ id_user: user._id }, serverConfig['JWT_SECRET'], {
+                                                expiresIn: 3 * 24 * 60 * 60 * 1000 // 3 days
+                                            }),
+                                            user: user
                                         }
-                                    });
-                                }); }, function (error) {
+                                    }));
+                                }
+                                else {
                                     response.send(JSON.stringify({
                                         error: true,
-                                        result: 'Invalid Mongo Get User'
+                                        result: 'Account is Disabled'
                                     }));
-                                });
+                                }
                             }
+                            else {
+                                response.send(JSON.stringify({
+                                    error: true,
+                                    result: 'Invalid User'
+                                }));
+                            }
+                        }, error => {
+                            response.send(JSON.stringify({
+                                error: true,
+                                result: 'Invalid Mongo Get User'
+                            }));
                         });
                     }
-                }
-                return [2 /*return*/];
-            });
-        });
+                });
+            }
+        }
     });
     app.post('/userWithEnrollmentToken', function (request, response) {
         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']) {
@@ -321,19 +244,19 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
             }));
         }
         else {
-            var body_1 = request.body;
-            var schema = new simpl_schema_1.default({
+            let body = request.body;
+            let schema = new SimpleSchema({
                 enrollmentToken: {
                     type: String
                 }
             });
             try {
-                schema.validate(body_1);
+                schema.validate(body);
             }
             catch (errors) {
                 if (errors) {
                     console.error('Error in HTTP Check (/userWithEnrollmentToken)', errors);
-                    __1.ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', __1.ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/userWithEnrollmentToken' + '\n\nData Being Checked\n' + JSON.stringify(body_1, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
+                    ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/userWithEnrollmentToken' + '\n\nData Being Checked\n' + JSON.stringify(body, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
                     response.send(JSON.stringify({
                         error: true,
                         result: 'Invalid Parameters'
@@ -341,7 +264,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                     return;
                 }
             }
-            jwt.verify(body_1.enrollmentToken, serverConfig['JWT_SECRET'], function (err, decoded) {
+            jwt.verify(body.enrollmentToken, serverConfig['JWT_SECRET'], (err, decoded) => {
                 if (err) {
                     response.send(JSON.stringify({
                         error: true,
@@ -349,12 +272,12 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                     }));
                 }
                 else {
-                    user_collection_1.Users.findOne({
+                    Users.findOne({
                         $and: [
                             { _id: decoded['id_user'] },
-                            { 'services.enrollment': body_1.enrollmentToken }
+                            { 'services.enrollment': body.enrollmentToken }
                         ]
-                    }, { projection: { _id: 1, __v: 1, username: 1, active: 1 } }).then(function (user) {
+                    }, { projection: { _id: 1, __v: 1, username: 1, active: 1 } }).then((user) => {
                         if (user) {
                             if (user.active) {
                                 response.send(JSON.stringify({
@@ -377,7 +300,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                                 result: 'Invalid User'
                             }));
                         }
-                    }, function (error) {
+                    }, error => {
                         response.send(JSON.stringify({
                             error: true,
                             result: 'Invalid Mongo Get User'
@@ -388,7 +311,6 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
         }
     });
     app.post('/setUserWithEnrollmentToken', function (request, response) {
-        var _this = this;
         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({
                 error: true,
@@ -396,8 +318,8 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
             }));
         }
         else {
-            var body_2 = request.body;
-            var schema = new simpl_schema_1.default({
+            let body = request.body;
+            let schema = new SimpleSchema({
                 enrollmentToken: {
                     type: String
                 },
@@ -406,12 +328,12 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                 }
             });
             try {
-                schema.validate(body_2);
+                schema.validate(body);
             }
             catch (errors) {
                 if (errors) {
                     console.error('Error in HTTP Check (/setUserWithEnrollmentToken)', errors);
-                    __1.ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', __1.ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/setUserWithEnrollmentToken' + '\n\nData Being Checked\n' + JSON.stringify(body_2, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
+                    ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/setUserWithEnrollmentToken' + '\n\nData Being Checked\n' + JSON.stringify(body, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
                     response.send(JSON.stringify({
                         error: true,
                         result: 'Invalid Parameters'
@@ -419,61 +341,49 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                     return;
                 }
             }
-            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({
-                            error: true,
-                            result: 'Invalid Token'
-                        }));
-                    }
-                    else {
-                        user_collection_1.Users.findOne({
-                            $and: [
-                                { _id: decoded['id_user'] },
-                                { 'services.enrollment': body_2.enrollmentToken }
-                            ]
-                        }).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*/];
-                                }
-                            });
-                        }); }, function (error) {
+            jwt.verify(body.enrollmentToken, serverConfig['JWT_SECRET'], async (err, decoded) => {
+                if (err) {
+                    response.send(JSON.stringify({
+                        error: true,
+                        result: 'Invalid Token'
+                    }));
+                }
+                else {
+                    Users.findOne({
+                        $and: [
+                            { _id: decoded['id_user'] },
+                            { 'services.enrollment': body.enrollmentToken }
+                        ]
+                    }).then(async (user) => {
+                        if (user) {
+                            if (user.active) {
+                                await Users.setPassword(user, body.password);
+                                response.send(JSON.stringify({
+                                    error: false,
+                                    result: true
+                                }));
+                            }
+                            else {
+                                response.send(JSON.stringify({
+                                    error: true,
+                                    result: 'Account is Disabled'
+                                }));
+                            }
+                        }
+                        else {
                             response.send(JSON.stringify({
                                 error: true,
-                                result: 'Invalid Mongo Get User'
+                                result: 'Invalid User'
                             }));
-                        });
-                    }
-                    return [2 /*return*/];
-                });
-            }); });
+                        }
+                    }, error => {
+                        response.send(JSON.stringify({
+                            error: true,
+                            result: 'Invalid Mongo Get User'
+                        }));
+                    });
+                }
+            });
         }
     });
     app.post('/userWithForgotPasswordToken', function (request, response) {
@@ -484,19 +394,19 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
             }));
         }
         else {
-            var body_3 = request.body;
-            var schema = new simpl_schema_1.default({
+            let body = request.body;
+            let schema = new SimpleSchema({
                 forgotPasswordToken: {
                     type: String
                 }
             });
             try {
-                schema.validate(body_3);
+                schema.validate(body);
             }
             catch (errors) {
                 if (errors) {
                     console.error('Error in HTTP Check (/userWithForgotPasswordToken)', errors);
-                    __1.ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', __1.ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/userWithForgotPasswordToken' + '\n\nData Being Checked\n' + JSON.stringify(body_3, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
+                    ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/userWithForgotPasswordToken' + '\n\nData Being Checked\n' + JSON.stringify(body, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
                     response.send(JSON.stringify({
                         error: true,
                         result: 'Invalid Parameters'
@@ -504,7 +414,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                     return;
                 }
             }
-            jwt.verify(body_3.forgotPasswordToken, serverConfig['JWT_SECRET'], function (err, decoded) {
+            jwt.verify(body.forgotPasswordToken, serverConfig['JWT_SECRET'], (err, decoded) => {
                 if (err) {
                     response.send(JSON.stringify({
                         error: true,
@@ -512,12 +422,12 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                     }));
                 }
                 else {
-                    user_collection_1.Users.findOne({
+                    Users.findOne({
                         $and: [
                             { _id: decoded['id_user'] },
-                            { 'services.forgot_password': body_3.forgotPasswordToken }
+                            { 'services.forgot_password': body.forgotPasswordToken }
                         ]
-                    }, { projection: { _id: 1, __v: 1, username: 1, active: 1 } }).then(function (user) {
+                    }, { projection: { _id: 1, __v: 1, username: 1, active: 1 } }).then((user) => {
                         if (user) {
                             if (user.active) {
                                 response.send(JSON.stringify({
@@ -540,7 +450,7 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                                 result: 'Invalid Token'
                             }));
                         }
-                    }, function (error) {
+                    }, error => {
                         response.send(JSON.stringify({
                             error: true,
                             result: 'Invalid Mongo Get User'
@@ -551,7 +461,6 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
         }
     });
     app.post('/setUserWithForgotPasswordToken', function (request, response) {
-        var _this = this;
         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({
                 error: true,
@@ -559,8 +468,8 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
             }));
         }
         else {
-            var body_4 = request.body;
-            var schema = new simpl_schema_1.default({
+            let body = request.body;
+            let schema = new SimpleSchema({
                 forgotPasswordToken: {
                     type: String
                 },
@@ -569,12 +478,12 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                 }
             });
             try {
-                schema.validate(body_4);
+                schema.validate(body);
             }
             catch (errors) {
                 if (errors) {
                     console.error('Error in HTTP Check (/setUserWithForgotPasswordToken)', errors);
-                    __1.ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', __1.ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/setUserWithForgotPasswordToken' + '\n\nData Being Checked\n' + JSON.stringify(body_4, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
+                    ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/setUserWithForgotPasswordToken' + '\n\nData Being Checked\n' + JSON.stringify(body, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
                     response.send(JSON.stringify({
                         error: true,
                         result: 'Invalid Parameters'
@@ -582,117 +491,92 @@ function setupAuthRoutes(mainServer, app, serverConfig) {
                     return;
                 }
             }
-            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({
-                            error: true,
-                            result: 'Invalid Token'
-                        }));
-                    }
-                    else {
-                        user_collection_1.Users.findOne({
-                            $and: [
-                                { _id: decoded['id_user'] },
-                                { 'services.forgot_password': body_4.forgotPasswordToken }
-                            ]
-                        }).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*/];
-                                }
-                            });
-                        }); }, function (error) {
-                            response.send(JSON.stringify({
-                                error: true,
-                                result: 'Invalid Mongo Get User'
-                            }));
-                        });
-                    }
-                    return [2 /*return*/];
-                });
-            }); });
-        }
-    });
-    app.post('/resetPassword', function (request, response) { return __awaiter(_this, void 0, void 0, function () {
-        var body, schema, user;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!(request.headers.origin !== serverConfig['ROOT_URL'] && request.headers.origin !== serverConfig['SEC_ROOT_URL'])) return [3 /*break*/, 1];
+            jwt.verify(body.forgotPasswordToken, serverConfig['JWT_SECRET'], async (err, decoded) => {
+                if (err) {
                     response.send(JSON.stringify({
                         error: true,
-                        result: 'Invalid header'
+                        result: 'Invalid Token'
                     }));
-                    return [3 /*break*/, 5];
-                case 1:
-                    body = request.body;
-                    schema = new simpl_schema_1.default({
-                        username: {
-                            type: String
+                }
+                else {
+                    Users.findOne({
+                        $and: [
+                            { _id: decoded['id_user'] },
+                            { 'services.forgot_password': body.forgotPasswordToken }
+                        ]
+                    }).then(async (user) => {
+                        if (user) {
+                            if (user.active) {
+                                await Users.setPassword(user, body.password);
+                                response.send(JSON.stringify({
+                                    error: false,
+                                    result: true
+                                }));
+                            }
+                            else {
+                                response.send(JSON.stringify({
+                                    error: true,
+                                    result: 'Account is Disabled'
+                                }));
+                            }
                         }
-                    });
-                    try {
-                        schema.validate(body);
-                    }
-                    catch (errors) {
-                        if (errors) {
-                            console.error('Error in HTTP Check (/resetPassword)', errors);
-                            __1.ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', __1.ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/resetPassword' + '\n\nData Being Checked\n' + JSON.stringify(body, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
+                        else {
                             response.send(JSON.stringify({
                                 error: true,
-                                result: 'Invalid Parameters'
+                                result: 'Invalid User'
                             }));
-                            return [2 /*return*/];
                         }
-                    }
-                    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 })];
-                case 3:
-                    user = _a.sent();
-                    _a.label = 4;
-                case 4:
-                    if (user) {
-                        mainServer.getMethodManager().callMethodInternal.call(mainServer.getMethodManager(), 'resetUserPassword', user._id);
-                    }
+                    }, error => {
+                        response.send(JSON.stringify({
+                            error: true,
+                            result: 'Invalid Mongo Get User'
+                        }));
+                    });
+                }
+            });
+        }
+    });
+    app.post('/resetPassword', async (request, response) => {
+        if (request.headers.origin !== serverConfig['ROOT_URL'] && request.headers.origin !== serverConfig['SEC_ROOT_URL']) {
+            response.send(JSON.stringify({
+                error: true,
+                result: 'Invalid header'
+            }));
+        }
+        else {
+            let body = request.body;
+            let schema = new SimpleSchema({
+                username: {
+                    type: String
+                }
+            });
+            try {
+                schema.validate(body);
+            }
+            catch (errors) {
+                if (errors) {
+                    console.error('Error in HTTP Check (/resetPassword)', errors);
+                    ResolveIOServer.getMainServer().getMethodManager().sendEmail('dev@resolveio.com', ResolveIOServer.getClientName() + 'HTTP - Error Detected', 'Match Error On HTTP ' + '/resetPassword' + '\n\nData Being Checked\n' + JSON.stringify(body, null, 2) + '\n\nErrors\n' + JSON.stringify(errors, null, 2));
                     response.send(JSON.stringify({
-                        error: false,
-                        result: ''
+                        error: true,
+                        result: 'Invalid Parameters'
                     }));
-                    _a.label = 5;
-                case 5: return [2 /*return*/];
+                    return;
+                }
+            }
+            let user = await Users.findOne({ username: body.username });
+            if (!user) {
+                user = await Users.findOne({ email: body.username });
+            }
+            if (user) {
+                mainServer.getMethodManager().callMethodInternal.call(mainServer.getMethodManager(), 'resetUserPassword', user._id);
             }
-        });
-    }); });
+            response.send(JSON.stringify({
+                error: false,
+                result: ''
+            }));
+        }
+    });
 }
-exports.setupAuthRoutes = setupAuthRoutes;
 
 //# sourceMappingURL=auth.js.map