hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-09 19:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-1739 fix LDAP auth appending "null" to username

Browse Source
This commit is contained in:
Ivan Masár
2013-10-29 23:03:11 +01:00
parent 9f55480440
commit 88b9d8fe78
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
View File

@@ -252,13 +252,18 @@ public class LDAPAuthentication
// If there is no email and the email domain is set, add it to the netid // If there is no email and the email domain is set, add it to the netid
String email = ldap.ldapEmail; String email = ldap.ldapEmail;
if (((email == null) || ("".equals(email))) &&
(!"".equals(ConfigurationManager.getProperty("authentication-ldap", "netid_email_domain")))) if ((StringUtils.isEmpty(email)) &&
(StringUtils.isNotEmpty(ConfigurationManager.getProperty("authentication-ldap", "netid_email_domain"))))
{ {
email = netid + ConfigurationManager.getProperty("authentication-ldap", "netid_email_domain"); email = netid + ConfigurationManager.getProperty("authentication-ldap", "netid_email_domain");
} }
else
{
email = netid;
}
if ((email != null) && (!"".equals(email))) if (StringUtils.isNotEmpty(email))
{ {
try try
{ {
@@ -288,19 +293,19 @@ public class LDAPAuthentication
{ {
context.setIgnoreAuthorization(true); context.setIgnoreAuthorization(true);
eperson = EPerson.create(context); eperson = EPerson.create(context);
if ((email != null) && (!"".equals(email))) if (StringUtils.isNotEmpty(email))
{ {
eperson.setEmail(email); eperson.setEmail(email);
} }
if ((ldap.ldapGivenName!=null) && (!ldap.ldapGivenName.equals(""))) if (StringUtils.isNotEmpty(ldap.ldapGivenName))
{ {
eperson.setFirstName(ldap.ldapGivenName); eperson.setFirstName(ldap.ldapGivenName);
} }
if ((ldap.ldapSurname!=null) && (!ldap.ldapSurname.equals(""))) if (StringUtils.isNotEmpty(ldap.ldapSurname))
{ {
eperson.setLastName(ldap.ldapSurname); eperson.setLastName(ldap.ldapSurname);
} }
if ((ldap.ldapPhone!=null)&&(!ldap.ldapPhone.equals(""))) if (StringUtils.isNotEmpty(ldap.ldapPhone))
{ {
eperson.setMetadata("phone", ldap.ldapPhone); eperson.setMetadata("phone", ldap.ldapPhone);
} }