From 8b6d4e5d19be632742793ccbde92821e6fcfb524 Mon Sep 17 00:00:00 2001
From: Nicolas Micoud <58596990+nmicoud@users.noreply.github.com>
Date: Sun, 24 May 2020 20:02:17 +0200
Subject: [PATCH] IDEMPIERE-4303 : 4303 Web Services : Inconsistency for
 username (doesn't use LDAPUser) that could lead to not reuse previous
 sessions (#77)

Fix inconsistency with 'standard' Login method to get the username (LDAPUser / Name)
---
 .../src/org/idempiere/adinterface/CompiereService.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/CompiereService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/CompiereService.java
index ad8d87f471..9a5f808983 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/CompiereService.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/CompiereService.java
@@ -34,6 +34,7 @@ import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
 import org.compiere.util.Language;
 import org.compiere.util.Login;
+import org.compiere.util.Util;
 import org.idempiere.adInterface.x10.ADLoginRequest;
 
 /**
@@ -263,8 +264,8 @@ public class CompiereService {
 		if (email_login)
 			m_userName = user.getEMail();
 		else
-			m_userName = user.getName();
-		
+			m_userName = Util.isEmpty(user.getLDAPUser()) ? user.getName() : user.getLDAPUser();
+
 		Env.setContext( getCtx(), "#AD_Language", Lang);
 		m_language = Language.getLanguage(Lang);
 		Env.verifyLanguage( getCtx(), m_language );