Merge pull request #29 from MetheaX/dev

Enhancement - v0.0.2

Author: kuylim

api/pom.xml

@@ -12,6 +12,7 @@
     <artifactId>api</artifactId>
 
     <properties>
+        <java.version>1.8</java.version>
         <postgres.version>42.2.1</postgres.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

api/src/main/java/io/methea/api/service/MetheaAuthenticationService.java

@@ -12,13 +12,15 @@
 import io.methea.domain.configuration.jwt.entity.TSessionManagement;
 import io.methea.domain.configuration.permission.view.PermissionView;
 import io.methea.domain.configuration.user.entity.TUser;
+import io.methea.domain.webservice.client.entity.Client;
 import io.methea.domain.webservice.system.entity.SystemCertificate;
 import io.methea.exception.CertificateNotFoundException;
 import io.methea.exception.InvalidClientSecretException;
 import io.methea.repository.configuration.group.UserGroupRepository;
 import io.methea.repository.configuration.jwt.SessionManagementRepository;
 import io.methea.repository.configuration.permission.UserGrantedPermissionRepository;
 import io.methea.repository.configuration.user.UserRepository;
+import io.methea.repository.webservice.client.ClientRepository;
 import io.methea.repository.webservice.system.SystemCertificateRepository;
 import io.methea.utils.SystemUtils;
 import io.methea.utils.auth.JwtUtil;
@@ -50,6 +52,7 @@
 public class MetheaAuthenticationService implements UserDetailsService, AuthenticationService {
 
     private final UserRepository userRepository;
+    private final ClientRepository clientRepository;
     private final UserGrantedPermissionRepository userGrantedPermissionRepository;
     private final UserGroupRepository userGroupRepository;
     private final SystemCertificateRepository certificateRepository;
@@ -59,10 +62,11 @@ public class MetheaAuthenticationService implements UserDetailsService, Authenti
 
     @Inject
     public MetheaAuthenticationService(UserRepository userRepository,
-                                       UserGrantedPermissionRepository userGrantedPermissionRepository,
-                                       UserGroupRepository userGroupRepository,
-                                       SystemCertificateRepository certificateRepository, SessionManagementRepository sessionManagementRepository) {
+                                       ClientRepository clientRepository, UserGrantedPermissionRepository userGrantedPermissionRepository,
+                                       UserGroupRepository userGroupRepository, SystemCertificateRepository certificateRepository,
+                                       SessionManagementRepository sessionManagementRepository) {
         this.userRepository = userRepository;
+        this.clientRepository = clientRepository;
         this.userGrantedPermissionRepository = userGrantedPermissionRepository;
         this.userGroupRepository = userGroupRepository;
         this.certificateRepository = certificateRepository;
@@ -73,7 +77,10 @@ public MetheaAuthenticationService(UserRepository userRepository,
     public Token generateTokenFromUser(RequestTokenPayload payload, HttpServletRequest request) {
         PrincipalAuthentication authentication = loadUserAsClient(payload);
         if (ObjectUtils.isEmpty(authentication)) {
-            return null;
+            authentication = loadClient(payload);
+            if (ObjectUtils.isEmpty(authentication)) {
+                return null;
+            }
         }
         return generateToken(authentication, request, false);
     }
@@ -136,7 +143,11 @@ public PrincipalAuthentication loadUserByUsername(String s) throws UsernameNotFo
         TUser user = userRepository.findByUsernameAndStatus(s, MConstant.ACTIVE_STATUS);
 
         if (ObjectUtils.isEmpty(user)) {
-            return null;
+            Client client = clientRepository.findClientByClientIdAndStatus(s, MConstant.ACTIVE_STATUS);
+            if (ObjectUtils.isEmpty(client)) {
+                return null;
+            }
+            return buildPrincipal(client);
         }
         return buildPrincipal(user);
     }
@@ -201,6 +212,28 @@ private PrincipalAuthentication loadUserAsClient(RequestTokenPayload payload) {
         return buildPrincipal(user);
     }
 
+    private PrincipalAuthentication loadClient(RequestTokenPayload payload) {
+        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+        Client client = clientRepository.findClientByClientIdAndStatus(payload.getClientId(), MConstant.ACTIVE_STATUS);
+        if (ObjectUtils.isEmpty(client)) {
+            return null;
+        }
+        if (!encoder.matches(payload.getClientSecret(), client.getClientSecret())) {
+            return null;
+        }
+        return buildPrincipal(client);
+    }
+
+    private PrincipalAuthentication buildPrincipal(Client client) {
+        MetheaPrincipal principal = new MetheaPrincipal();
+        Map<String, Object> param = new HashMap<>();
+        param.put("username", client.getClientId());
+        principal.setUsername(client.getClientId());
+        principal.setForceUserResetPassword(MConstant.NO);
+        return new PrincipalAuthentication(client.getClientId(), client.getClientSecret(), new ArrayList<>(),
+                userGrantedPermissionRepository.getByQuery(param, PermissionView.class), principal);
+    }
+
     private PrincipalAuthentication buildPrincipal(TUser user) {
         MetheaPrincipal principal = new MetheaPrincipal();
         Map<String, Object> param = new HashMap<>();

core/src/main/java/io/methea/constant/MConstant.java

@@ -28,6 +28,7 @@ private MConstant() {
     public static final String CORE_TEMPLATE_KEY = "methea.core.freemarker.templates";
     public static final String CLIENT_TEMPLATE_KEY = "methea.client.freemarker.templates";
 
+    public static final String ID = "id";
     public static final String COMMA = ",";
     public static final String COLON = ":";
     public static final String SPACE = " ";

core/src/main/java/io/methea/controller/AbstractSimpleMetheaController.java

@@ -53,20 +53,20 @@ public abstract class AbstractSimpleMetheaController<E extends AbstractMetheaEnt
     protected String configViewName;
 
     private final DataTableUIService dataTableUIService;
-    protected AbstractSimpleMetheaService metheaService;
+    protected AbstractSimpleMetheaService simpleMetheaService;
     protected AbstractMetheaValidator validator;
 
     public AbstractSimpleMetheaController(DataTableUIService dataTableUIService) {
         this.dataTableUIService = dataTableUIService;
     }
 
-    @RequestMapping(value = StringUtils.EMPTY, method = RequestMethod.GET)
+    @GetMapping(value = StringUtils.EMPTY)
     public String viewAllWithFilter(Model model, B binder, F filter, Pagination pagination, HttpServletRequest request) {
         dataTableAttributes(model, binder, filter, pagination, request);
         return templatePath;
     }
 
-    @RequestMapping(value = SAVE_URL, method = RequestMethod.POST)
+    @PostMapping(value = SAVE_URL)
     public ModelAndView save(B binder, Model model, F filter, Pagination pagination, HttpServletRequest request) {
         Map<String, String> errors = new HashMap<>();
         validator.validate(binder, errors);
@@ -77,11 +77,11 @@ public ModelAndView save(B binder, Model model, F filter, Pagination pagination,
             model.addAttribute("hasErrors", true);
             return new ModelAndView(templatePath);
         }
-        metheaService.saveEntity(getEntityFromBinder(binder), binder);
+        simpleMetheaService.saveEntity(getEntityFromBinder(binder), binder);
         return new ModelAndView("redirect:" + ROOT_URL.concat(MConstant.SLASH).concat(entity));
     }
 
-    @RequestMapping(value = MODIFY_URL, method = RequestMethod.POST)
+    @PostMapping(value = MODIFY_URL)
     public ModelAndView modify(B binder, Model model, F filter, Pagination pagination, HttpServletRequest request) {
         Map<String, String> errors = new HashMap<>();
         errors.put("validateType", "EDIT");
@@ -94,7 +94,7 @@ public ModelAndView modify(B binder, Model model, F filter, Pagination paginatio
             model.addAttribute("errors", errors);
             return new ModelAndView(templatePath);
         }
-        metheaService.modifyEntity(getEntityId(binder), binder);
+        simpleMetheaService.modifyEntity(getEntityId(binder), binder);
         return new ModelAndView("redirect:" + ROOT_URL.concat(MConstant.SLASH).concat(entity));
     }
 
@@ -104,7 +104,7 @@ public ResponseEntity<Map<String, Object>> getById(@RequestParam String id) {
         Map<String, Object> map = new HashMap<>();
         map.put(MConstant.JSON_STATUS, 500);
         map.put(MConstant.JSON_MESSAGE, String.format("Failed to get %s", entity));
-        Object view = metheaService.getEntityViewById(id);
+        Object view = simpleMetheaService.getEntityViewById(id);
         if (!ObjectUtils.isEmpty(view)) {
             map.put(MConstant.JSON_STATUS, 200);
             map.put(MConstant.JSON_MESSAGE, String.format("Get %s success!", entity));
@@ -119,7 +119,7 @@ public ResponseEntity<Map<String, Object>> getEntityById(@RequestParam String id
         Map<String, Object> map = new HashMap<>();
         map.put(MConstant.JSON_STATUS, 500);
         map.put(MConstant.JSON_MESSAGE, String.format("Failed to get %s", entity));
-        Optional<E> o = metheaService.getEntityById(id);
+        Optional<E> o = simpleMetheaService.getEntityById(id);
         if (o.isPresent()) {
             map.put(MConstant.JSON_STATUS, 200);
             map.put(MConstant.JSON_MESSAGE, String.format("Get %s success!", entity));
@@ -135,7 +135,7 @@ public ResponseEntity<Map<String, Object>> activateEntity(@RequestBody Map<Strin
         map.put(MConstant.JSON_STATUS, 500);
         map.put(MConstant.JSON_MESSAGE, String.format("Failed to activate %s", entity));
         try {
-            if (metheaService.activateEntity(payload.get("id"))) {
+            if (simpleMetheaService.activateEntity(payload.get("id"))) {
                 map.put(MConstant.JSON_STATUS, 200);
                 map.put(MConstant.JSON_MESSAGE, String.format("Activate %s success!", entity));
             }
@@ -153,7 +153,7 @@ public ResponseEntity<Map<String, Object>> deactivateEntity(@RequestBody Map<Str
         map.put(MConstant.JSON_STATUS, 500);
         map.put(MConstant.JSON_MESSAGE, String.format("Failed to deactivate %s", entity));
         try {
-            if (metheaService.deactivateEntity(payload.get("id"))) {
+            if (simpleMetheaService.deactivateEntity(payload.get("id"))) {
                 map.put(MConstant.JSON_STATUS, 200);
                 map.put(MConstant.JSON_MESSAGE, String.format("Deactivate %s success!", entity));
             }
@@ -170,7 +170,7 @@ protected void dataTableAttributes(Model model, B binder, F filter, Pagination p
         }
 
         Map<String, List<?>> map = new HashMap<>();
-        map.put(MConstant.JSON_DATA, metheaService.getAllEntityViewByFilter(getFilterColumns(filter), pagination));
+        map.put(MConstant.JSON_DATA, simpleMetheaService.getAllEntityViewByFilter(getFilterColumns(filter), pagination));
         model.addAttribute(MConstant.CONTEXT_PATH_KEY, SystemUtils.getBaseUrl(request));
         model.addAttribute("tableHead", MCache.CACHE_META_DATA.get(configViewName.concat(MConstant.COLUMNS_LABEL)));
         model.addAttribute("tableColumns", MCache.CACHE_META_DATA.get(configViewName.concat(MConstant.COLUMNS_KEY)));

core/src/main/java/io/methea/domain/common/entity/BaseEntity.java

@@ -1,6 +1,5 @@
 package io.methea.domain.common.entity;
 
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.methea.domain.common.entity.abs.AbstractMetheaEntity;
 import org.hibernate.annotations.CreationTimestamp;

core/src/main/java/io/methea/domain/configuration/account/entity/TAccount.java

@@ -1,7 +1,7 @@
 package io.methea.domain.configuration.account.entity;
 
 import io.methea.domain.common.entity.BaseEntity;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.persistence.*;
 import java.util.UUID;

core/src/main/java/io/methea/domain/configuration/account/view/AccountView.java

@@ -9,7 +9,7 @@
 import io.methea.repository.hibernateextension.annotation.Column;
 import io.methea.repository.hibernateextension.annotation.SelectFrom;
 
-@SelectFrom(fromClause = "FROM TAccount o", orderBy = "ORDER BY o.updatedDateTime DESC")
+@SelectFrom(fromClause = "FROM TAccount o", orderBy = "ORDER BY o.accountName ASC")
 public class AccountView extends BaseView<AccountView> {
 
     private static final long serialVersionUID = -8462411991270288224L;

core/src/main/java/io/methea/domain/configuration/display/view/DataTableView.java

@@ -8,7 +8,7 @@
  * Author : DKSilverX
  * Date : 18/04/2020
  */
-@SelectFrom(fromClause = "FROM TDataTableView o", orderBy = "ORDER BY o.updatedDateTime DESC")
+@SelectFrom(fromClause = "FROM TDataTableView o", orderBy = "ORDER BY o.viewName ASC")
 public class DataTableView extends BaseView<DataTableView> {
     private static final long serialVersionUID = 2335231132063689758L;
 

core/src/main/java/io/methea/domain/configuration/group/dropdown/GroupDropdown.java

@@ -11,7 +11,7 @@
 @SelectFrom(fromClause = "FROM TUserGroup o", orderBy = "ORDER BY o.groupName ASC")
 public class GroupDropdown extends BaseView<GroupDropdown> {
     private static final long serialVersionUID = -8990771004017469895L;
-    @Column(name = "o.id")
+    @Column(name = "o.id", key = "accountId", where = "AND o.accountId LIKE :accountId")
     private String id;
     @Column(name = "o.groupName", key = "status", where = "AND o.status = :status", isLastColumn = true)
     private String name;

core/src/main/java/io/methea/domain/configuration/group/entity/TUserGroup.java

@@ -1,7 +1,7 @@
 package io.methea.domain.configuration.group.entity;
 
 import io.methea.domain.common.entity.BaseEntity;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;