Merge pull request #154 from kbss-cvut/fix/fix-fetching-user-referenc…

…e-for-change-metadata

Fix fetching user reference for change metadata

src/main/java/cz/cvut/kbss/analysis/service/security/SecurityUtils.java

@@ -38,7 +38,7 @@ public SecurityUtils(UserDao userDao, SecurityConf config) {
      * If the user is impersonating another user, the impersonated user is returned.
      * Otherwise, the currently authenticated user is returned.
      *
-     * @return
+     * @return the instance of the User class representing the currently authenticated user
      */
     public User getCurrentUser() {
         final SecurityContext context = SecurityContextHolder.getContext();
@@ -53,9 +53,21 @@ public User getCurrentUser() {
         }
     }
 
+    public String getCurrentUsername(){
+        final SecurityContext context = SecurityContextHolder.getContext();
+        assert context != null;
+        final Object principal = context.getAuthentication().getPrincipal();
+        if (principal instanceof Jwt) {
+            final OidcUserInfo userInfo = new OidcUserInfo(((Jwt)principal).getClaims());
+            return userInfo.getPreferredUsername();
+        } else {
+            return context.getAuthentication().getName();
+        }
+    }
+
     public UserReference getCurrentUserReference() {
-        User user = getCurrentUser();
-        return new UserReference(user);
+        String username = getCurrentUsername();
+        return userDao.findUserReferenceByUsername(username);
     }
 
     //    TODO map role, but I am not sure which changes in the model when be required if I add addRole method to User