[NAE-2169] User flag for internal or external

- removed duplicate class UpdateUserRequest.java
- moved user type resolution from createUser method to saveUser method in UserServiceImpl.java

Author: SamuelPalaj

application-engine/src/main/java/com/netgrif/application/engine/auth/web/requestbodies/UpdateUserRequest.java

@@ -136,6 +136,7 @@ public User saveUser(User user) {
         log.debug("Saving user [{}] in realm with id [{}]", user.getUsername(), user.getRealmId());
         user.setModifiedAt(LocalDateTime.now());
         String collectionName = collectionNameProvider.getCollectionNameForRealm(user.getRealmId());
+        user.setType(resolveUserType(user.getEmail(), user.getRealmId()));
         user = userRepository.saveUser(user, mongoTemplate, collectionName);
         log.trace("User [{}] saved in collection [{}]", user.getUsername(), collectionName);
         return user;
@@ -189,10 +190,7 @@ public User createUser(User user, String realmId) {
         addDefaultAuthorities(user);
         addDefaultRole(user);
         setPassword(user, user.getPassword());
-
-        String collectionName = collectionNameProvider.getCollectionNameForRealm(realmId);
-        user.setType(resolveUserType(user.getEmail(), null));
-        user = userRepository.saveUser(user, mongoTemplate, collectionName);
+        user = this.saveUser(user, realmId);;
 
         filterImportExportService.createFilterImport(user);
         filterImportExportService.createFilterExport(user);
@@ -203,7 +201,7 @@ public User createUser(User user, String realmId) {
         if (groupConfigurationProperties.isSystemEnabled())
             groupService.addUserToDefaultSystemGroup(user);
 
-        user = userRepository.saveUser(user, mongoTemplate, collectionName);
+        user = this.saveUser(user, realmId);
         log.info("User [{}] successfully created in realm [{}]", user.getUsername(), realmId);
         return user;
     }
@@ -275,7 +273,7 @@ public List<Group> getUserGroups(AbstractActor actor) {
     }
 
     @Override
-    public AbstractUser changePassword(AbstractUser user, String newPassword, String oldPassword) {
+    public User changePassword(User user, String newPassword, String oldPassword) {
         canUpdatePassword(user, newPassword);
 
         if (!verifyPasswords(user, oldPassword)) {
@@ -410,8 +408,8 @@ public User update(User user, UpdateUserRequest userUpdate) {
         user.setMiddleName(resolveUserUpdateValue(user.getMiddleName(), userUpdate.getMiddleName()));
         user.setLastName(resolveUserUpdateValue(user.getLastName(), userUpdate.getLastName()));
         user.setEmail(resolveUserUpdateValue(user.getEmail(), userUpdate.getEmail()));
-        if(userUpdate.getUserType() != null) {
-            user.setType(userUpdate.getUserType());
+        if(userUpdate.getType() != null) {
+            user.setType(userUpdate.getType());
         }
         return saveUser(user);
     }
@@ -594,7 +592,7 @@ public void removeRoleOfDeletedPetriNet(Set<ProcessRole> petriNetRoles) {
         String defaultRealmCollection = collectionNameProvider.getDefaultRealmCollection();
         Pageable pageable = PageRequest.of(0, paginationProperties.getBackendPageSize());
         Collection<ProcessResourceId> roleIds = petriNetRoles.stream().map(ProcessRole::get_id).collect(Collectors.toSet());
-        Page<AbstractUser> users;
+        Page<User> users;
         do {
             users = searchUsersByRoleIds(roleIds, defaultRealmCollection, pageable);
             users.getContent().forEach(u -> removeRoles(u, petriNetRoles));

nae-user-ce/src/main/java/com/netgrif/application/engine/auth/service/UserServiceImpl.java

@@ -441,5 +441,5 @@ Page<User> searchAllCoMembers(String query, Collection<ProcessResourceId> roleId
      * @param oldPassword old password
      * @return the updated user
      */
-    AbstractUser changePassword(AbstractUser user, String newPassword, String oldPassword);
+    User changePassword(User user, String newPassword, String oldPassword);
 }

nae-user-common/src/main/java/com/netgrif/application/engine/auth/service/UserService.java

@@ -19,7 +19,7 @@ public class UpdateUserRequest implements Serializable {
     public String middleName;
     public String lastName;
     public String email;
-    public UserType userType;
+    public UserType type;
 
     public UpdateUserRequest() {
     }
@@ -32,7 +32,7 @@ public String toString() {
                 ", middleName='" + middleName + '\'' +
                 ", lastName='" + lastName + '\'' +
                 ", email='" + email + '\'' +
-                ", userType='" + userType + '\'' +
+                ", type='" + type + '\'' +
                 '}';
     }
 }

nae-user-common/src/main/java/com/netgrif/application/engine/auth/web/requestbodies/UpdateUserRequest.java

@@ -64,6 +64,7 @@ public User(AbstractUser user) {
         attributes = user.getAttributes() != null
                 ? new java.util.HashMap<>(user.getAttributes())
                 : new java.util.HashMap<>();
+        type = user.getType();
         if (enabledCredentialsAttribute.getValue() != null && !enabledCredentialsAttribute.getValue().isEmpty()) {
             attributes.put(ATTR_ENABLED_CREDENTIALS, enabledCredentialsAttribute);
         }