Security implementation

src/main/java/net/gepafin/tendermanagement/dao/RegionDao.java

@@ -50,7 +50,7 @@ public class RegionDao {
         regionEntity.setEducationLevel(regionReq.getEducationLevel());
         return regionEntity;
     }
-    private RegionResponseBean convertRegionEntityToRegionResponse(RegionEntity regionEntity) {
+     public RegionResponseBean convertRegionEntityToRegionResponse(RegionEntity regionEntity) {
         RegionResponseBean regionResponseBean = new RegionResponseBean();
         regionResponseBean.setId(regionEntity.getId());
         regionResponseBean.setCreatedDate(regionEntity.getCreatedDate());

src/main/java/net/gepafin/tendermanagement/dao/RoleDao.java

@@ -4,6 +4,7 @@ import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.RoleEntity;
 import net.gepafin.tendermanagement.model.request.RoleReq;
+import net.gepafin.tendermanagement.model.response.RegionResponseBean;
 import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 import net.gepafin.tendermanagement.repositories.RoleRepository;
 import net.gepafin.tendermanagement.service.RegionService;
@@ -23,9 +24,13 @@ public class RoleDao {
 
     @Autowired
     private RoleRepository roleRepository;
+    
     @Autowired
     private RegionService regionService;
 
+    @Autowired
+    private RegionDao regionDao;
+
     public RoleResponseBean createRole(RoleReq roleReq) {
         RoleEntity roleEntity = convertRoleRequestToRoleEntity(roleReq);
         roleEntity = roleRepository.save(roleEntity);
@@ -39,7 +44,7 @@ public class RoleDao {
         roleEntity.setRegion(regionService.getRegionById(roleReq.getRegionId()));
         return roleEntity;
     }
-    private RoleResponseBean convertRoleEntityToRoleResponse(RoleEntity roleEntity) {
+    public RoleResponseBean convertRoleEntityToRoleResponse(RoleEntity roleEntity) {
        RoleResponseBean roleResponseBean=new RoleResponseBean();
        roleResponseBean.setId(roleEntity.getId());
        roleResponseBean.setCreatedDate(roleEntity.getCreatedDate());
@@ -47,7 +52,8 @@ public class RoleDao {
        roleResponseBean.setRoleName(roleEntity.getRoleName());
        roleResponseBean.setDescription(roleEntity.getDescription());
        roleResponseBean.setPermissions(roleEntity.getPermissions());
-       roleResponseBean.setRegion(roleEntity.getRegion());
+       RegionResponseBean regionResponseBean = regionDao.convertRegionEntityToRegionResponse(roleEntity.getRegion());
+       roleResponseBean.setRegion(regionResponseBean);
         return roleResponseBean;
     }
     public RoleResponseBean updateRole(Long id, RoleReq roleReq) {

src/main/java/net/gepafin/tendermanagement/dao/UserDao.java

@@ -1,33 +1,53 @@
 package net.gepafin.tendermanagement.dao;
 
 import net.gepafin.tendermanagement.config.Translator;
+import net.gepafin.tendermanagement.config.jwt.TokenProvider;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.RoleEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
+import net.gepafin.tendermanagement.model.request.LoginReq;
 import net.gepafin.tendermanagement.model.request.UpdateUserReq;
 import net.gepafin.tendermanagement.model.request.UserReq;
+import net.gepafin.tendermanagement.model.response.LoginResponse;
+import net.gepafin.tendermanagement.model.response.RoleResponseBean;
 import net.gepafin.tendermanagement.model.response.UserResponseBean;
+import net.gepafin.tendermanagement.model.util.JWTToken;
 import net.gepafin.tendermanagement.repositories.UserRepository;
 import net.gepafin.tendermanagement.service.RoleService;
+import net.gepafin.tendermanagement.service.impl.AuthenticationService;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
 import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Repository;
 
 import static net.gepafin.tendermanagement.util.ObjectUtils.setIfUpdated;
-
 @Repository
 public class UserDao {
+
     @Autowired
     private UserRepository userRepository;
-
+    @Autowired
+    private AuthenticationService authService;
     @Autowired
     private RoleService roleService;
 
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+    
+    @Autowired
+    private RoleDao roleDao;
+
     public UserResponseBean createUser(UserReq userReq) {
+        if (userRepository.existsByEmail(userReq.getEmail())) {
+            throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.EMAIL_ALREADY_EXISTS));
+        }
         if (!userReq.getPassword().equals(userReq.getConfPassword())) {
-            throw new CustomValidationException(Status.VALIDATION_ERROR,Translator.toLocale(GepafinConstant.PASSWORD_DOESNT_MATCH));
+            throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.PASSWORD_DOESNT_MATCH));
+        }
+        if (userReq.getPassword().length() < 8) {
+            throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.PASSWORD_MIN_LEN));
         }
         UserEntity userEntity = convertUserRequestToUserEntity(userReq);
         userEntity = userRepository.save(userEntity);
@@ -53,15 +73,15 @@ public class UserDao {
 
     private UserEntity convertUserRequestToUserEntity(UserReq userReq) {
         UserEntity userEntity = new UserEntity();
-            userEntity.setPassword(userReq.getPassword());
-            userEntity.setEmail(userReq.getEmail());
-            userEntity.setFirstName(userReq.getFirstName());
-            userEntity.setStatus(userReq.getStatus());
-            userEntity.setLastName(userReq.getLastName());
-            userEntity.setOrganization(userReq.getOrganization());
-            userEntity.setAddress(userReq.getAddress());
-            userEntity.setPhoneNumber(userReq.getPhoneNumber());
-            userEntity.setRoleEntity(roleService.getRoleById(userReq.getRoleId()));
+        userEntity.setPassword(passwordEncoder.encode(userReq.getPassword()));
+        userEntity.setEmail(userReq.getEmail());
+        userEntity.setFirstName(userReq.getFirstName());
+        userEntity.setStatus(userReq.getStatus());
+        userEntity.setLastName(userReq.getLastName());
+        userEntity.setOrganization(userReq.getOrganization());
+        userEntity.setAddress(userReq.getAddress());
+        userEntity.setPhoneNumber(userReq.getPhoneNumber());
+        userEntity.setRoleEntity(roleService.getRoleById(userReq.getRoleId()));
         return userEntity;
     }
 
@@ -80,7 +100,8 @@ public class UserDao {
         userResponseBean.setCity(userEntity.getCity());
         userResponseBean.setCountry(userEntity.getCountry());
         userResponseBean.setStatus(userEntity.getStatus());
-        userResponseBean.setRole(userEntity.getRoleEntity());
+        RoleResponseBean roleResponseBean = roleDao.convertRoleEntityToRoleResponse(userEntity.getRoleEntity());
+        userResponseBean.setRole(roleResponseBean);
         userResponseBean.setLastLogin(userEntity.getLastLogin());
         return userResponseBean;
     }
@@ -96,4 +117,9 @@ public class UserDao {
                 .orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)));
         userRepository.deleteById(id);
     }
+
+
+    public JWTToken login(LoginReq loginReq) {
+        return authService.login(loginReq);
+    }
 }