diff --git a/pom.xml b/pom.xml
index 1fb618b..b481cfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
com.ai.st.microservice.administration
st-microservice-administration
- 1.3.5
+ 1.3.6
st-microservice-administration2
Microservice Administration Users and Roles
@@ -100,7 +100,7 @@
com.ai.st.microservice.common
st-common
- 1.0.0
+ 1.1.2
diff --git a/src/main/java/com/ai/st/microservice/administration/business/UserBusiness.java b/src/main/java/com/ai/st/microservice/administration/business/UserBusiness.java
index 15658c5..1f4b978 100644
--- a/src/main/java/com/ai/st/microservice/administration/business/UserBusiness.java
+++ b/src/main/java/com/ai/st/microservice/administration/business/UserBusiness.java
@@ -5,9 +5,15 @@
import java.util.stream.Collectors;
import com.ai.st.microservice.administration.dto.*;
+import com.ai.st.microservice.administration.entities.CodeEntity;
+import com.ai.st.microservice.administration.entities.RoleEntity;
+import com.ai.st.microservice.administration.entities.UserEntity;
+import com.ai.st.microservice.administration.exceptions.BusinessException;
+import com.ai.st.microservice.administration.models.services.IRoleService;
+import com.ai.st.microservice.administration.models.services.IUserService;
+
import com.ai.st.microservice.common.business.RoleBusiness;
import com.ai.st.microservice.common.clients.ManagerFeignClient;
-import com.ai.st.microservice.common.clients.NotifierFeignClient;
import com.ai.st.microservice.common.clients.OperatorFeignClient;
import com.ai.st.microservice.common.clients.ProviderFeignClient;
import com.ai.st.microservice.common.dto.managers.MicroserviceManagerDto;
@@ -16,19 +22,13 @@
import com.ai.st.microservice.common.dto.providers.MicroserviceProviderDto;
import com.ai.st.microservice.common.dto.providers.MicroserviceProviderProfileDto;
import com.ai.st.microservice.common.dto.providers.MicroserviceProviderRoleDto;
+
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Component;
-import com.ai.st.microservice.administration.entities.CodeEntity;
-import com.ai.st.microservice.administration.entities.RoleEntity;
-import com.ai.st.microservice.administration.entities.UserEntity;
-import com.ai.st.microservice.administration.exceptions.BusinessException;
-import com.ai.st.microservice.administration.models.services.IRoleService;
-import com.ai.st.microservice.administration.models.services.IUserService;
-
@Component
public class UserBusiness {
@@ -114,7 +114,7 @@ public UserDto getUserById(Long id) {
return userDto;
}
- public UserDto createUser(String firstName, String lastName, String password, String email, String username,
+ public UserDto createUser(String firstName, String lastName, String password, String email, String username, boolean enabled,
List roles) throws BusinessException {
email = email.toLowerCase().trim();
@@ -147,7 +147,7 @@ public UserDto createUser(String firstName, String lastName, String password, St
userEntity.setLastName(lastName);
userEntity.setCreatedAt(new Date());
userEntity.setEmail(email);
- userEntity.setEnabled(true);
+ userEntity.setEnabled(enabled);
userEntity.setUsername(username);
userEntity.setPassword(passwordEncode.encode(password));
userEntity.setRoles(listRoles);
diff --git a/src/main/java/com/ai/st/microservice/administration/controllers/v1/UserV1Controller.java b/src/main/java/com/ai/st/microservice/administration/controllers/v1/UserV1Controller.java
index 60c80d8..a8e01f7 100644
--- a/src/main/java/com/ai/st/microservice/administration/controllers/v1/UserV1Controller.java
+++ b/src/main/java/com/ai/st/microservice/administration/controllers/v1/UserV1Controller.java
@@ -150,7 +150,7 @@ public ResponseEntity