From 6beac55826713edcbfe1ecf7e4e8a99b2eb63821 Mon Sep 17 00:00:00 2001
From: root <carloszamora270398@gmail.com>
Date: Wed, 21 Aug 2019 08:24:33 +0200
Subject: [PATCH 1/2] LDAP first login BUG fixed

---
 server/lib/passport.js | 2 +-
 server/models/users.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/lib/passport.js b/server/lib/passport.js
index 97976590..c872cd1d 100644
--- a/server/lib/passport.js
+++ b/server/lib/passport.js
@@ -195,7 +195,7 @@ if (LdapStrategy) {
 
         } catch (err) {
             if (err instanceof interoperableErrors.NotFoundError) {
-                const userId = await users.create(null, {
+                const userId = await users.create(contextHelpers.getAdminContext(), {
                     username: profile[config.ldap.uidTag],
                     role: config.ldap.newUserRole,
                     namespace: config.ldap.newUserNamespaceId
diff --git a/server/models/users.js b/server/models/users.js
index 6ff8626e..09ebac92 100644
--- a/server/models/users.js
+++ b/server/models/users.js
@@ -258,7 +258,11 @@ async function getByAccessToken(accessToken) {
 }
 
 async function getByUsername(username) {
-    return await _getBy(contextHelpers.getAdminContext(), 'username', username);
+    try{
+        return await _getBy(contextHelpers.getAdminContext(), 'username', username);
+    }catch(err){
+        throw new interoperableErrors.NotFoundError();
+    }
 }
 
 async function getByUsernameIfPasswordMatch(context, username, password) {

From de15ba15da13dc0d9d74a8532f06b350f2258f44 Mon Sep 17 00:00:00 2001
From: root <carloszamora270398@gmail.com>
Date: Wed, 21 Aug 2019 14:41:35 +0200
Subject: [PATCH 2/2] LDAP mailTag fix

---
 server/lib/passport.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/lib/passport.js b/server/lib/passport.js
index c872cd1d..d5784464 100644
--- a/server/lib/passport.js
+++ b/server/lib/passport.js
@@ -187,9 +187,9 @@ if (LdapStrategy) {
 
             return {
                 id: user.id,
-                username: user.username,
+                username: profile[config.ldap.uidTag],
                 name: profile[config.ldap.nameTag],
-                email: profile.mail,
+                email: profile[config.ldap.mailTag],
                 role: user.role
             };
 
@@ -205,7 +205,7 @@ if (LdapStrategy) {
                     id: userId,
                     username: profile[config.ldap.uidTag],
                     name: profile[config.ldap.nameTag],
-                    email: profile.mail,
+                    email: profile[config.ldap.mailTag],
                     role: config.ldap.newUserRole
                 };
             } else {