From 17678350fc7dde4d2631a4a5c289ef76b6511aae Mon Sep 17 00:00:00 2001
From: James Ketrenos <james_git@ketrenos.com>
Date: Wed, 17 Oct 2018 21:51:27 -0700
Subject: [PATCH] Fix auth email sending

Signed-off-by: James Ketrenos <james_git@ketrenos.com>
---
 server/app.js          |  9 ++++-----
 server/routes/users.js | 11 ++++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/server/app.js b/server/app.js
index bebf3c0..6ed8ed9 100755
--- a/server/app.js
+++ b/server/app.js
@@ -23,13 +23,12 @@ const picturesPath = config.get("picturesPath").replace(/\/$/, "") + "/",
   serverConfig = config.get("server");
 
 let basePath = config.get("basePath");
-
-let photoDB = null, userDB = null;
-
 basePath = "/" + basePath.replace(/^\/+/, "").replace(/\/+$/, "") + "/";
 if (basePath == "//") {
   basePath = "/";
 }
+
+let photoDB = null, userDB = null;
 console.log("Loading pictures out of: " + picturesPath);
 console.log("Hosting server from: " + basePath);
 
@@ -178,8 +177,8 @@ app.use(basePath, function(req, res, next) {
           if (results.length == 0) {
             throw "DB mis-match between authentications and users table";
           }
-
-          if (!app.get("transporter")) {
+          const transporter = app.get("transporter");
+          if (!transporter) {
             console.log("Not sending VERIFIED email; SMTP not configured.");
             return;
           }
diff --git a/server/routes/users.js b/server/routes/users.js
index 2147ed9..402c540 100755
--- a/server/routes/users.js
+++ b/server/routes/users.js
@@ -4,7 +4,6 @@ const express = require("express"),
   config = require("config"),
   LdapAuth = require("ldapauth-fork"),
   crypto = require("crypto"),
-  createTransport = require("nodemailer").createTransport,
   hb = require("handlebars");
 
 const router = express.Router();
@@ -139,7 +138,7 @@ router.post("/create", function(req, res) {
         throw error;
       });
     }).then(function() {
-      const transporter = app.get("transporter");
+      const transporter = req.app.get("transporter");
       if (!transporter) {
         console.log("Not sending VERIFY email; SMTP not configured.");
         return;
@@ -186,11 +185,11 @@ router.post("/create", function(req, res) {
     }).then(function() {
       return getSessionUser(req).then(function(user) {
         return res.status(200).send(user);
+      }).catch(function(error) {
+        console.log("Error creating account: ", error);
+        return res.status(401).send(error);
       });
     });
-  }).catch(function(error) {
-    console.log("Error creating account: ", error);
-    return res.status(401).send(error);
   });
 });
 
@@ -338,6 +337,8 @@ router.post("/login", function(req, res) {
     return getSessionUser(req).then(function(user) {
       return res.status(200).send(user);
     });
+  }).catch(function(error) {
+    return res.status(403).send(error);
   });
 });