Merge branch 'DEVELOP_BE' of ssh://git.eclipse.org/gitroot/elogbook/authandauth into DEVELOP_BE

diff --git a/src/main/java/org/eclipse/openk/portal/auth2/model/KeyCloakUser.java b/src/main/java/org/eclipse/openk/portal/auth2/model/KeyCloakUser.java
index d33c9b2..67bc1ce 100644
--- a/src/main/java/org/eclipse/openk/portal/auth2/model/KeyCloakUser.java
+++ b/src/main/java/org/eclipse/openk/portal/auth2/model/KeyCloakUser.java

@@ -23,6 +23,7 @@
     private boolean emailVerified;
     private String firstName;
     private String lastName;
+    private String name;
     private List<String> realmRoles;
     private Map<String, List<String>> clientRoles;
 
@@ -89,4 +90,12 @@
     public void setClientRoles(Map<String, List<String>> clientRoles) {
         this.clientRoles = clientRoles;
     }
+
+    public void setName() {
+        if (lastName!= null && !lastName.isEmpty()){
+            this.name = firstName+ " " + lastName;
+        } else {
+            this.name = firstName;
+        }
+    }
 }

diff --git a/src/main/java/org/eclipse/openk/portal/common/UserCacheTimerTask.java b/src/main/java/org/eclipse/openk/portal/common/UserCacheTimerTask.java
index 399f912..e4d572c 100644
--- a/src/main/java/org/eclipse/openk/portal/common/UserCacheTimerTask.java
+++ b/src/main/java/org/eclipse/openk/portal/common/UserCacheTimerTask.java

@@ -59,6 +59,7 @@
     for (KeyCloakUser user : allUsers) {
       List<String> rolesList = new ArrayList<>();
       List<KeyCloakRole> rolesForUser = JwtHelper.getRolesForUser(token, user.getId());
+      user.setName();
       for (KeyCloakRole keyCloakRole : rolesForUser) {
         rolesList.add(keyCloakRole.getName());
       }