SSDM-13362: Bugfix, Personal access tokens do not work if emails are used for login

server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenOpenBisSessionManagerDecorator.java

@@ -318,25 +318,40 @@ public class PersonalAccessTokenOpenBisSessionManagerDecorator implements IOpenB
     {
         try
         {
-            final Principal principal = authenticationService.getPrincipal(patSession.getOwnerId());
 
-            if (principal == null)
+            PersonPE person = daoFactory.getPersonDAO().tryFindPersonByUserId(patSession.getOwnerId());
+
+            if (person == null)
             {
                 operationLog.warn("Ignoring a personal access token session (" + patSession
-                        + ") because the session's owner was not found by the authentication service.");
+                        + ") because the session's owner was not found in the openBIS database.");
                 return null;
-            } else
-            {
-                principal.setAuthenticated(true);
             }
 
-            PersonPE person = daoFactory.getPersonDAO().tryFindPersonByUserId(patSession.getOwnerId());
+            Principal principal = null;
+            try
+            {
+                principal = authenticationService.getPrincipal(patSession.getOwnerId());
+            } catch (Exception ex1) {
+                try
+                {
+                    if (authenticationService.supportsAuthenticatingByEmail())
+                    {
+                        principal = authenticationService.getPrincipal(person.getEmail());
+                    }
+                } catch (Exception ex2) {
+                    operationLog.warn(ex2);
+                }
+            }
 
-            if (person == null)
+            if (principal == null)
             {
                 operationLog.warn("Ignoring a personal access token session (" + patSession
-                        + ") because the session's owner was not found in the openBIS database.");
+                        + ") because the session's owner was not found by the authentication service.");
                 return null;
+            } else
+            {
+                principal.setAuthenticated(true);
             }
 
             final Session session = sessionFactory.create(patSession.getHash(), patSession.getOwnerId(), principal, getRemoteHost(),