Merge branch 'naafi-linking' of https://github.com/brown-dash/Dash-Web into naafi-linking

1 files changed, 7 insertions, 8 deletions

diff --git a/src/server/authentication/AuthenticationManager.ts b/src/server/authentication/AuthenticationManager.ts
index 3fbd4b3a7..b736f0d35 100644
--- a/src/server/authentication/AuthenticationManager.ts
+++ b/src/server/authentication/AuthenticationManager.ts
@@ -55,7 +55,7 @@ export let postSignup = (req: Request, res: Response, next: NextFunction) => {
 
     const user = new User(model);
 
-    User.findOne({ email }, (err, existingUser) => {
+    User.findOne({ email }, (err: any, existingUser: any) => {
         if (err) { return next(err); }
         if (existingUser) {
             return res.redirect("/login");
@@ -72,9 +72,8 @@ export let postSignup = (req: Request, res: Response, next: NextFunction) => {
 };
 
 const tryRedirectToTarget = (req: Request, res: Response) => {
-    if (req.session && req.session.target) {
-        const target = req.session.target;
-        req.session.target = undefined;
+    const target = (req.session as any)?.target;
+    if (req.session && target) {
         res.redirect(target);
     } else {
         res.redirect("/home");
@@ -88,7 +87,7 @@ const tryRedirectToTarget = (req: Request, res: Response) => {
  */
 export let getLogin = (req: Request, res: Response) => {
     if (req.user) {
-        req.session!.target = undefined;
+        //req.session.target = undefined;
         return res.redirect("/home");
     }
     res.render("login.pug", {
@@ -160,7 +159,7 @@ export let postForgot = function (req: Request, res: Response, next: NextFunctio
             });
         },
         function (token: string, done: any) {
-            User.findOne({ email }, function (err, user: DashUserModel) {
+            User.findOne({ email }, function (err: any, user: DashUserModel) {
                 if (!user) {
                     // NO ACCOUNT WITH SUBMITTED EMAIL
                     res.redirect("/forgotPassword");
@@ -202,7 +201,7 @@ 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() } }, function (err, user: DashUserModel) {
+    User.findOne({ passwordResetToken: req.params.token, passwordResetExpires: { $gt: Date.now() } }, function (err: any, user: DashUserModel) {
         if (!user || err) {
             return res.redirect("/forgotPassword");
         }
@@ -216,7 +215,7 @@ export let getReset = function (req: Request, res: Response) {
 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, user: DashUserModel) {
+            User.findOne({ passwordResetToken: req.params.token, passwordResetExpires: { $gt: Date.now() } }, function (err: any, user: DashUserModel) {
                 if (!user || err) {
                     return res.redirect('back');
                 }