From 734fc13967ee964ebf52e52d6a7ceb51c66ce5c2 Mon Sep 17 00:00:00 2001
From: James Ketrenos <james_git@ketrenos.com>
Date: Thu, 11 Oct 2018 20:38:19 -0700
Subject: [PATCH] Chain login to use getSessionUser to fill all the correct
 fields

Signed-off-by: James Ketrenos <james_git@ketrenos.com>
---
 server/routes/users.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/routes/users.js b/server/routes/users.js
index 276a021..c239d9f 100755
--- a/server/routes/users.js
+++ b/server/routes/users.js
@@ -287,11 +287,12 @@ router.post("/login", function(req, res) {
   /* We use LDAP as the primary authenticator; if the user is not
    * found there, we look the user up in the site-specific user database */
    
-  return ldapPromise(username, password).then(function(user) {
-    user.name = user.displayName;
-    user.username = user.uid;
+  return ldapPromise(username, password).then(function(ldap) {
+    let user = {};
+    user.name = ldap.displayName;
+    user.username = ldap.uid;
     user.id = "LDAP";
-    user.mail = user.mail;
+    user.mail = ldap.mail;
     user.authenticated = 1;
     user.mailVerified = 1;
     req.session.userId = "LDAP";
@@ -332,9 +333,9 @@ router.post("/login", function(req, res) {
       console.log(message);
     }
 
-    delete user.id;
-
-    return res.status(200).send(user);
+    return getSessionUser(req).then(function(user) {
+      return res.status(200).send(user);
+    });
   });
 });