trying to fix errors in compiles

1 files changed, 165 insertions, 141 deletions

diff --git a/src/server/authentication/AuthenticationManager.ts b/src/server/authentication/AuthenticationManager.ts
index b736f0d35..3622be4c5 100644
--- a/src/server/authentication/AuthenticationManager.ts
+++ b/src/server/authentication/AuthenticationManager.ts
@@ -1,14 +1,14 @@
-import { default as User, DashUserModel } from "./DashUserModel";
-import { Request, Response, NextFunction } from "express";
-import * as passport from "passport";
-import { IVerifyOptions } from "passport-local";
-import "./Passport";
-import flash = require("express-flash");
+import { default as User, DashUserModel } from './DashUserModel';
+import { Request, Response, NextFunction } from 'express';
+import * as passport from 'passport';
+import { IVerifyOptions } from 'passport-local';
+import './Passport';
+import flash = require('express-flash');
 import * as async from 'async';
 import * as nodemailer from 'nodemailer';
-import c = require("crypto");
-import { Utils } from "../../Utils";
-import { MailOptions } from "nodemailer/lib/stream-transport";
+import c = require('crypto');
+import { emptyFunction, Utils } from '../../Utils';
+import { MailOptions } from 'nodemailer/lib/stream-transport';
 
 /**
  * GET /signup
@@ -17,10 +17,10 @@ import { MailOptions } from "nodemailer/lib/stream-transport";
  */
 export let getSignup = (req: Request, res: Response) => {
     if (req.user) {
-        return res.redirect("/home");
+        return res.redirect('/home');
     }
-    res.render("signup.pug", {
-        title: "Sign Up",
+    res.render('signup.pug', {
+        title: 'Sign Up',
         user: req.user,
     });
 };
@@ -30,15 +30,15 @@ export let getSignup = (req: Request, res: Response) => {
  * Create a new local account.
  */
 export let postSignup = (req: Request, res: Response, next: NextFunction) => {
-    req.assert("email", "Email is not valid").isEmail();
-    req.assert("password", "Password must be at least 4 characters long").len({ min: 4 });
-    req.assert("confirmPassword", "Passwords do not match").equals(req.body.password);
-    req.sanitize("email").normalizeEmail({ gmail_remove_dots: false });
+    req.assert('email', 'Email is not valid').isEmail();
+    req.assert('password', 'Password must be at least 4 characters long').len({ min: 4 });
+    req.assert('confirmPassword', 'Passwords do not match').equals(req.body.password);
+    req.sanitize('email').normalizeEmail({ gmail_remove_dots: false });
 
     const errors = req.validationErrors();
 
     if (errors) {
-        return res.redirect("/signup");
+        return res.redirect('/signup');
     }
 
     const email = req.body.email as String;
@@ -50,25 +50,30 @@ export let postSignup = (req: Request, res: Response, next: NextFunction) => {
         userDocumentId: Utils.GenerateGuid(),
         sharingDocumentId: Utils.GenerateGuid(),
         linkDatabaseId: Utils.GenerateGuid(),
-        cacheDocumentIds: ""
+        cacheDocumentIds: '',
     } as Partial<DashUserModel>;
 
     const user = new User(model);
 
     User.findOne({ email }, (err: any, existingUser: any) => {
-        if (err) { return next(err); }
+        if (err) {
+            return next(err);
+        }
         if (existingUser) {
-            return res.redirect("/login");
+            return res.redirect('/login');
         }
         user.save((err: any) => {
-            if (err) { return next(err); }
-            req.logIn(user, (err) => {
-                if (err) { return next(err); }
+            if (err) {
+                return next(err);
+            }
+            req.logIn(user, err => {
+                if (err) {
+                    return next(err);
+                }
                 tryRedirectToTarget(req, res);
             });
         });
     });
-
 };
 
 const tryRedirectToTarget = (req: Request, res: Response) => {
@@ -76,11 +81,10 @@ const tryRedirectToTarget = (req: Request, res: Response) => {
     if (req.session && target) {
         res.redirect(target);
     } else {
-        res.redirect("/home");
+        res.redirect('/home');
     }
 };
 
-
 /**
  * GET /login
  * Login page.
@@ -88,11 +92,11 @@ const tryRedirectToTarget = (req: Request, res: Response) => {
 export let getLogin = (req: Request, res: Response) => {
     if (req.user) {
         //req.session.target = undefined;
-        return res.redirect("/home");
+        return res.redirect('/home');
     }
-    res.render("login.pug", {
-        title: "Log In",
-        user: req.user
+    res.render('login.pug', {
+        title: 'Log In',
+        user: req.user,
     });
 };
 
@@ -102,24 +106,30 @@ export let getLogin = (req: Request, res: Response) => {
  * On failure, redirect to signup page
  */
 export let postLogin = (req: Request, res: Response, next: NextFunction) => {
-    req.assert("email", "Email is not valid").isEmail();
-    req.assert("password", "Password cannot be blank").notEmpty();
-    req.sanitize("email").normalizeEmail({ gmail_remove_dots: false });
+    req.assert('email', 'Email is not valid').isEmail();
+    req.assert('password', 'Password cannot be blank').notEmpty();
+    req.sanitize('email').normalizeEmail({ gmail_remove_dots: false });
 
     const errors = req.validationErrors();
 
     if (errors) {
-        req.flash("errors", "Unable to login at this time. Please try again.");
-        return res.redirect("/signup");
+        req.flash('errors', 'Unable to login at this time. Please try again.');
+        return res.redirect('/signup');
     }
 
-    passport.authenticate("local", (err: Error, user: DashUserModel, _info: IVerifyOptions) => {
-        if (err) { next(err); return; }
+    passport.authenticate('local', (err: Error, user: DashUserModel, _info: IVerifyOptions) => {
+        if (err) {
+            next(err);
+            return;
+        }
         if (!user) {
-            return res.redirect("/signup");
+            return res.redirect('/signup');
         }
-        req.logIn(user, (err) => {
-            if (err) { next(err); return; }
+        req.logIn(user, err => {
+            if (err) {
+                next(err);
+                return;
+            }
             tryRedirectToTarget(req, res);
         });
     })(req, res, next);
@@ -131,140 +141,154 @@ export let postLogin = (req: Request, res: Response, next: NextFunction) => {
  * and destroys the user's current session.
  */
 export let getLogout = (req: Request, res: Response) => {
-    req.logout();
+    req.logout(emptyFunction);
     const sess = req.session;
     if (sess) {
-        sess.destroy((err) => { if (err) { console.log(err); } });
+        sess.destroy(err => {
+            if (err) {
+                console.log(err);
+            }
+        });
     }
-    res.redirect("/login");
+    res.redirect('/login');
 };
 
 export let getForgot = function (req: Request, res: Response) {
-    res.render("forgot.pug", {
-        title: "Recover Password",
+    res.render('forgot.pug', {
+        title: 'Recover Password',
         user: req.user,
     });
 };
 
 export let postForgot = function (req: Request, res: Response, next: NextFunction) {
     const email = req.body.email;
-    async.waterfall([
-        function (done: any) {
-            c.randomBytes(20, function (err: any, buffer: Buffer) {
-                if (err) {
-                    done(null);
-                    return;
-                }
-                done(null, buffer.toString('hex'));
-            });
-        },
-        function (token: string, done: any) {
-            User.findOne({ email }, function (err: any, user: DashUserModel) {
-                if (!user) {
-                    // NO ACCOUNT WITH SUBMITTED EMAIL
-                    res.redirect("/forgotPassword");
-                    return;
-                }
-                user.passwordResetToken = token;
-                user.passwordResetExpires = new Date(Date.now() + 3600000); // 1 HOUR
-                user.save(function (err: any) {
-                    done(null, token, user);
+    async.waterfall(
+        [
+            function (done: any) {
+                c.randomBytes(20, function (err: any, buffer: Buffer) {
+                    if (err) {
+                        done(null);
+                        return;
+                    }
+                    done(null, buffer.toString('hex'));
                 });
-            });
-        },
-        function (token: Uint16Array, user: DashUserModel, done: any) {
-            const smtpTransport = nodemailer.createTransport({
-                service: 'Gmail',
-                auth: {
-                    user: 'browndashptc@gmail.com',
-                    pass: 'TsarNicholas#2'
-                }
-            });
-            const mailOptions = {
-                to: user.email,
-                from: 'browndashptc@gmail.com',
-                subject: 'Dash Password Reset',
-                text: 'You are receiving this because you (or someone else) have requested the reset of the password for your account.\n\n' +
-                    'Please click on the following link, or paste this into your browser to complete the process:\n\n' +
-                    'http://' + req.headers.host + '/resetPassword/' + token + '\n\n' +
-                    'If you did not request this, please ignore this email and your password will remain unchanged.\n'
-            } as MailOptions;
-            smtpTransport.sendMail(mailOptions, function (err: Error | null) {
-                // req.flash('info', 'An e-mail has been sent to ' + user.email + ' with further instructions.');
-                done(null, err, 'done');
-            });
+            },
+            function (token: string, done: any) {
+                User.findOne({ email }, function (err: any, user: DashUserModel) {
+                    if (!user) {
+                        // NO ACCOUNT WITH SUBMITTED EMAIL
+                        res.redirect('/forgotPassword');
+                        return;
+                    }
+                    user.passwordResetToken = token;
+                    user.passwordResetExpires = new Date(Date.now() + 3600000); // 1 HOUR
+                    user.save(function (err: any) {
+                        done(null, token, user);
+                    });
+                });
+            },
+            function (token: Uint16Array, user: DashUserModel, done: any) {
+                const smtpTransport = nodemailer.createTransport({
+                    service: 'Gmail',
+                    auth: {
+                        user: 'browndashptc@gmail.com',
+                        pass: 'TsarNicholas#2',
+                    },
+                });
+                const mailOptions = {
+                    to: user.email,
+                    from: 'browndashptc@gmail.com',
+                    subject: 'Dash Password Reset',
+                    text:
+                        'You are receiving this because you (or someone else) have requested the reset of the password for your account.\n\n' +
+                        'Please click on the following link, or paste this into your browser to complete the process:\n\n' +
+                        'http://' +
+                        req.headers.host +
+                        '/resetPassword/' +
+                        token +
+                        '\n\n' +
+                        'If you did not request this, please ignore this email and your password will remain unchanged.\n',
+                } as MailOptions;
+                smtpTransport.sendMail(mailOptions, function (err: Error | null) {
+                    // req.flash('info', 'An e-mail has been sent to ' + user.email + ' with further instructions.');
+                    done(null, err, 'done');
+                });
+            },
+        ],
+        function (err) {
+            if (err) return next(err);
+            res.redirect('/forgotPassword');
         }
-    ], function (err) {
-        if (err) return next(err);
-        res.redirect("/forgotPassword");
-    });
+    );
 };
 
 export let getReset = function (req: Request, res: Response) {
     User.findOne({ passwordResetToken: req.params.token, passwordResetExpires: { $gt: Date.now() } }, function (err: any, user: DashUserModel) {
         if (!user || err) {
-            return res.redirect("/forgotPassword");
+            return res.redirect('/forgotPassword');
         }
-        res.render("reset.pug", {
-            title: "Reset Password",
+        res.render('reset.pug', {
+            title: 'Reset Password',
             user: req.user,
         });
     });
 };
 
 export let postReset = function (req: Request, res: Response) {
-    async.waterfall([
-        function (done: any) {
-            User.findOne({ passwordResetToken: req.params.token, passwordResetExpires: { $gt: Date.now() } }, function (err: any, user: DashUserModel) {
-                if (!user || err) {
-                    return res.redirect('back');
-                }
+    async.waterfall(
+        [
+            function (done: any) {
+                User.findOne({ passwordResetToken: req.params.token, passwordResetExpires: { $gt: Date.now() } }, function (err: any, user: DashUserModel) {
+                    if (!user || err) {
+                        return res.redirect('back');
+                    }
 
-                req.assert("password", "Password must be at least 4 characters long").len({ min: 4 });
-                req.assert("confirmPassword", "Passwords do not match").equals(req.body.password);
+                    req.assert('password', 'Password must be at least 4 characters long').len({ min: 4 });
+                    req.assert('confirmPassword', 'Passwords do not match').equals(req.body.password);
 
-                if (req.validationErrors()) {
-                    return res.redirect('back');
-                }
+                    if (req.validationErrors()) {
+                        return res.redirect('back');
+                    }
 
-                user.password = req.body.password;
-                user.passwordResetToken = undefined;
-                user.passwordResetExpires = undefined;
+                    user.password = req.body.password;
+                    user.passwordResetToken = undefined;
+                    user.passwordResetExpires = undefined;
 
-                user.save(function (err) {
-                    if (err) {
-                        res.redirect("/login");
-                        return;
-                    }
-                    req.logIn(user, function (err) {
+                    user.save(function (err) {
                         if (err) {
+                            res.redirect('/login');
                             return;
                         }
+                        req.logIn(user, function (err) {
+                            if (err) {
+                                return;
+                            }
+                        });
+                        done(null, user);
                     });
-                    done(null, user);
                 });
-            });
-        },
-        function (user: DashUserModel, done: any) {
-            const smtpTransport = nodemailer.createTransport({
-                service: 'Gmail',
-                auth: {
-                    user: 'browndashptc@gmail.com',
-                    pass: 'TsarNicholas#2'
-                }
-            });
-            const mailOptions = {
-                to: user.email,
-                from: 'browndashptc@gmail.com',
-                subject: 'Your password has been changed',
-                text: 'Hello,\n\n' +
-                    'This is a confirmation that the password for your account ' + user.email + ' has just been changed.\n'
-            } as MailOptions;
-            smtpTransport.sendMail(mailOptions, function (err) {
-                done(null, err);
-            });
+            },
+            function (user: DashUserModel, done: any) {
+                const smtpTransport = nodemailer.createTransport({
+                    service: 'Gmail',
+                    auth: {
+                        user: 'browndashptc@gmail.com',
+                        pass: 'TsarNicholas#2',
+                    },
+                });
+                const mailOptions = {
+                    to: user.email,
+                    from: 'browndashptc@gmail.com',
+                    subject: 'Your password has been changed',
+                    text: 'Hello,\n\n' + 'This is a confirmation that the password for your account ' + user.email + ' has just been changed.\n',
+                } as MailOptions;
+                smtpTransport.sendMail(mailOptions, function (err) {
+                    done(null, err);
+                });
+            },
+        ],
+        function (err) {
+            res.redirect('/login');
         }
-    ], function (err) {
-        res.redirect("/login");
-    });
-};
\ No newline at end of file
+    );
+};