Merge branch 'master' into dataviz-ai-sarah

1 files changed, 12 insertions, 12 deletions

diff --git a/src/server/authentication/AuthenticationManager.ts b/src/server/authentication/AuthenticationManager.ts
index b1b84c300..9c1525df0 100644
--- a/src/server/authentication/AuthenticationManager.ts
+++ b/src/server/authentication/AuthenticationManager.ts
@@ -56,7 +56,7 @@ export let postSignup = (req: Request, res: Response, next: NextFunction) => {
     const user = new User(model);
 
     User.findOne({ email })
-        .then(existingUser => {
+        .then((existingUser: any) => {
             if (existingUser) {
                 return res.redirect('/login');
             }
@@ -67,9 +67,9 @@ export let postSignup = (req: Request, res: Response, next: NextFunction) => {
                         tryRedirectToTarget(req, res);
                     });
                 })
-                .catch(err => next(err));
+                .catch((err: any) => next(err));
         })
-        .catch(err => next(err));
+        .catch((err: any) => next(err));
 };
 
 const tryRedirectToTarget = (req: Request, res: Response) => {
@@ -104,8 +104,8 @@ export let getLogin = (req: Request, res: Response) => {
 export let postLogin = (req: Request, res: Response, next: NextFunction) => {
     if (req.body.email === '') {
         User.findOne({ email: 'guest' })
-            .then(user => !user && initializeGuest())
-            .catch(err => err);
+            .then((user: any) => !user && initializeGuest())
+            .catch((err: any) => err);
         req.body.email = 'guest';
         req.body.password = 'guest';
     } else {
@@ -115,7 +115,7 @@ export let postLogin = (req: Request, res: Response, next: NextFunction) => {
     }
 
     if (validationResult(req).array().length) {
-        req.flash('errors', 'Unable to login at this time. Please try again.');
+        // req.flash('errors', 'Unable to login at this time. Please try again.');
         return res.redirect('/signup');
     }
 
@@ -171,7 +171,7 @@ export let postForgot = function (req: Request, res: Response, next: NextFunctio
                 });
             },
             function (token: string, done: any) {
-                User.findOne({ email }).then(user => {
+                User.findOne({ email }).then((user: any) => {
                     if (!user) {
                         // NO ACCOUNT WITH SUBMITTED EMAIL
                         res.redirect('/forgotPassword');
@@ -219,14 +219,14 @@ export let postForgot = function (req: Request, res: Response, next: NextFunctio
 
 export let getReset = function (req: Request, res: Response) {
     User.findOne({ passwordResetToken: req.params.token, passwordResetExpires: { $gt: Date.now() } })
-        .then(user => {
+        .then((user: any) => {
             if (!user) return res.redirect('/forgotPassword');
             res.render('reset.pug', {
                 title: 'Reset Password',
                 user: req.user,
             });
         })
-        .catch(err => res.redirect('/forgotPassword'));
+        .catch((err: any) => res.redirect('/forgotPassword'));
 };
 
 export let postReset = function (req: Request, res: Response) {
@@ -234,7 +234,7 @@ export let postReset = function (req: Request, res: Response) {
         [
             function (done: any) {
                 User.findOne({ passwordResetToken: req.params.token, passwordResetExpires: { $gt: Date.now() } })
-                    .then(user => {
+                    .then((user: any) => {
                         if (!user) return res.redirect('back');
 
                         check('password', 'Password must be at least 4 characters long').isLength({ min: 4 }).run(req);
@@ -251,10 +251,10 @@ export let postReset = function (req: Request, res: Response) {
                                 () => (req as any).logIn(user),
                                 (err: any) => err
                             )
-                            .catch(err => res.redirect('/login'));
+                            .catch((err: any) => res.redirect('/login'));
                         done(null, user);
                     })
-                    .catch(err => res.redirect('back'));
+                    .catch((err: any) => res.redirect('back'));
             },
             function (user: DashUserModel, done: any) {
                 const smtpTransport = nodemailer.createTransport({