|
|
@ -82,11 +82,14 @@ public class UserService implements UserDetailsService {
|
|
|
|
throw new UserPasswordsNotValidOrNotMatchException();
|
|
|
|
throw new UserPasswordsNotValidOrNotMatchException();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
User user = userMapper.userDtoToUserEntity(userDto);
|
|
|
|
User user = userMapper.userDtoToUserEntity(userDto);
|
|
|
|
user.setActivated(false);
|
|
|
|
user.setActivated(true);
|
|
|
|
user.setActivationKey(UserUtils.generateActivationKey());
|
|
|
|
|
|
|
|
user.setRoles(Collections.singleton(new UserRole(UserRoleConstants.USER)));
|
|
|
|
|
|
|
|
user.setPassword(passwordEncoder.encode(userDto.getPassword()));
|
|
|
|
user.setPassword(passwordEncoder.encode(userDto.getPassword()));
|
|
|
|
user = userRepository.save(user);
|
|
|
|
user = userRepository.save(user);
|
|
|
|
|
|
|
|
//user.setActivationKey(UserUtils.generateActivationKey());
|
|
|
|
|
|
|
|
Set<UserRole> set = new HashSet<>();
|
|
|
|
|
|
|
|
set.add(new UserRole(UserRoleConstants.USER));
|
|
|
|
|
|
|
|
user.setRoles(set);
|
|
|
|
|
|
|
|
user = userRepository.save(user);
|
|
|
|
//TODO: mailService.sendActivationEmail(user);
|
|
|
|
//TODO: mailService.sendActivationEmail(user);
|
|
|
|
log.debug("Created Information for User: {}", user.getLogin());
|
|
|
|
log.debug("Created Information for User: {}", user.getLogin());
|
|
|
|
return userMapper.userEntityToUserDto(user);
|
|
|
|
return userMapper.userEntityToUserDto(user);
|
|
|
@ -259,4 +262,9 @@ public class UserService implements UserDetailsService {
|
|
|
|
.map(role -> new SimpleGrantedAuthority(role.getName()))
|
|
|
|
.map(role -> new SimpleGrantedAuthority(role.getName()))
|
|
|
|
.collect(Collectors.toList()));
|
|
|
|
.collect(Collectors.toList()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void createDefaultRoles() {
|
|
|
|
|
|
|
|
userRoleRepository.save(new UserRole(UserRoleConstants.USER));
|
|
|
|
|
|
|
|
userRoleRepository.save(new UserRole(UserRoleConstants.ADMIN));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|