The "/userInfo" endpoint should return all user attributes #76

rest/src/main/java/io/jmix/rest/impl/controller/UserInfoController.java

@@ -16,15 +16,14 @@
 
 package io.jmix.rest.impl.controller;
 
-import io.jmix.rest.impl.service.filter.data.UserInfo;
 import io.jmix.rest.impl.service.UserInfoControllerManager;
+import io.jmix.rest.impl.service.filter.data.UserInfo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
 /**
  * REST controller that is used for getting an information about the current user
  */

rest/src/main/java/io/jmix/rest/impl/service/UserInfoControllerManager.java

@@ -16,13 +16,22 @@
 
 package io.jmix.rest.impl.service;
 
+import io.jmix.core.Metadata;
+import io.jmix.core.MetadataTools;
+import io.jmix.core.annotation.Secret;
+import io.jmix.core.entity.EntityValues;
+import io.jmix.core.metamodel.model.MetaClass;
+import io.jmix.core.metamodel.model.MetaProperty;
 import io.jmix.core.security.CurrentAuthentication;
 import io.jmix.rest.impl.controller.UserInfoController;
 import io.jmix.rest.impl.service.filter.data.UserInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import java.util.Map;
 
 /**
  * Class that is used by the {@link UserInfoController} for getting an information
@@ -31,13 +40,41 @@
 @Component("rest_UserInfoControllerManager")
 public class UserInfoControllerManager {
 
+    private static final Logger log = LoggerFactory.getLogger(UserInfoControllerManager.class);
+
     @Autowired
     protected CurrentAuthentication currentAuthentication;
 
+    @Autowired
+    protected Metadata metadata;
+
+    @Autowired
+    protected MetadataTools metadataTools;
+
+    /**
+     * @return all user attributes if the user stored in db implements {@link UserDetails}. Username and locale otherwise
+     */
     public UserInfo getUserInfo() {
         UserDetails user = currentAuthentication.getUser();
         UserInfo userInfo = new UserInfo(user);
         userInfo.setLocale(currentAuthentication.getLocale().toString());
+
+        MetaClass userMetaClass = metadata.findClass(user.getClass());
+        Map<String, Object> attributes = userInfo.getAttributes();
+        if (userMetaClass != null) {
+            //using metadata we assume that the pojo contains only the "correct" field-getter-setter namings
+            for (MetaProperty metaProperty : userMetaClass.getProperties()) {
+                if (metadataTools.isAnnotationPresent(user, metaProperty.getName(), Secret.class)
+                        || metaProperty.getRange().isClass()) {
+                    continue;
+                }
+                try {
+                    attributes.put(metaProperty.getName(), EntityValues.getValue(user, metaProperty.getName()));
+                } catch (Exception e) {
+                    log.warn(String.format("Can not get value for %s", metaProperty.getName()));
+                }
+            }
+        }
         return userInfo;
     }
 }

rest/src/main/java/io/jmix/rest/impl/service/filter/data/UserInfo.java

@@ -18,9 +18,13 @@
 
 import org.springframework.security.core.userdetails.UserDetails;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 public class UserInfo {
-    public String username;
-    public String locale;
+    protected String username;
+    protected String locale;
+    protected Map<String, Object> attributes = new LinkedHashMap<>();
 
     public UserInfo(UserDetails user) {
         this.username = user.getUsername();
@@ -37,4 +41,12 @@ public String getLocale() {
     public void setLocale(String locale) {
         this.locale = locale;
     }
+
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(Map<String, Object> attributes) {
+        this.attributes = attributes;
+    }
 }