romanov73/giprolab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

убрал ограничения объекта для вашего проекта

Browse Source
This commit is contained in:
Anton Romanov 2023-12-05 16:19:45 +04:00
parent 928e7a1e30
commit 18827a9028
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gipro/giprolab/models/UserDto.java
View File

@ -51,6 +51,16 @@ public class UserDto {
roles = new LinkedHashSet<>();
}
public UserDto(String login, String password) {
this();
this.login = login;
this.password = password;
this.passwordConfirm = password;
this.email = "email@email.ru";
this.firstName = "user";
this.lastName = "user";
}
public UserDto(User user) {
this();
this.id = user.getId();

14
src/main/java/com/gipro/giprolab/services/UserService.java
View File

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