[LMS-1816] Enable login with email address

SVN: 18216

openbis/dist/server/service.properties

@@ -60,6 +60,8 @@ ldap.attributenames.email =
 ldap.attributenames.first.name =
 # The attribute name for the last name, defaults to "sn"
 ldap.attributenames.last.name =
+# Set to true to also query for email aliases
+ldap.queryEmailForAliases = true
 
 # The database instance local unique identifier. Used when the new database is created.
 database-instance = TEST

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java

@@ -253,7 +253,7 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
         assert persons.size() > 0 : "At least system user should be in the database";
         // If only one user (system user), then this is the first logged user.
         final boolean isFirstLoggedUser = (persons.size() == 1);
-        PersonPE person = daoFactory.getPersonDAO().tryFindPersonByUserId(user);
+        PersonPE person = daoFactory.getPersonDAO().tryFindPersonByUserId(session.getUserName());
         if (person == null)
         {
             final PersonPE systemUser = getSystemUser(persons);

openbis/source/java/genericApplicationContext.xml

@@ -60,6 +60,8 @@
         </constructor-arg>
         <!-- The time after which an inactive session is expired by the service (in minutes). -->
         <constructor-arg value="${session-timeout}" />
+        <!-- Enable login with email addresses -->
+        <constructor-arg value="true" />
     </bean>
     
     <bean id="remote-host-validator" class="ch.systemsx.cisd.openbis.generic.server.WhiteListBasedRemoteHostValidator">