From 18827a90283c5f29984c3dc8d791b4ea9a92a0a7 Mon Sep 17 00:00:00 2001
From: Anton Romanov <a.romanov@ulstu.ru>
Date: Tue, 5 Dec 2023 16:19:45 +0400
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BE=D0=B3?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=88=D0=B5=D0=B3=D0=BE=20=D0=BF=D1=80=D0=BE=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gipro/giprolab/models/UserDto.java    | 10 ++++++++++
 .../com/gipro/giprolab/services/UserService.java   | 14 +++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gipro/giprolab/models/UserDto.java b/src/main/java/com/gipro/giprolab/models/UserDto.java
index 1461425..5f8b9fc 100644
--- a/src/main/java/com/gipro/giprolab/models/UserDto.java
+++ b/src/main/java/com/gipro/giprolab/models/UserDto.java
@@ -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();
diff --git a/src/main/java/com/gipro/giprolab/services/UserService.java b/src/main/java/com/gipro/giprolab/services/UserService.java
index eecfa01..ab591b7 100644
--- a/src/main/java/com/gipro/giprolab/services/UserService.java
+++ b/src/main/java/com/gipro/giprolab/services/UserService.java
@@ -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));
+    }
 }