dev add reset password

src/main/java/ru/soune/nocopy/service/auth/CleanUpNotActiveUser.java

@@ -0,0 +1,48 @@
+package ru.soune.nocopy.service.auth;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import ru.soune.nocopy.entity.user.User;
+import ru.soune.nocopy.entity.user.UserNotActive;
+import ru.soune.nocopy.repository.UserNotActiveRepository;
+import ru.soune.nocopy.repository.UserRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CleanUpNotActiveUser {
+
+    @Autowired
+    private UserNotActiveRepository userNotActiveRepository;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Transactional
+    @Scheduled(fixedDelay = 600000)
+    public void cleanupNotActiveUsers() {
+        LocalDateTime now = LocalDateTime.now();
+
+        List<UserNotActive> expiredTokens = userNotActiveRepository.findByBlockedUntilBefore(now);
+
+        for (UserNotActive userNotActive : expiredTokens) {
+            User user = userNotActive.getUser();
+            user.setActive(true);
+            user.setFailedLoginAttempts(0);
+
+            userRepository.save(user);
+        }
+
+        if (!expiredTokens.isEmpty()) {
+            userNotActiveRepository.deleteAll(expiredTokens);
+
+        }
+    }
+}

src/main/java/ru/soune/nocopy/service/mail/EmailService.java

@@ -38,6 +38,9 @@ public class EmailService {
     @Value("${app.email.verification.user}")
     private String user;
 
+    @Value("${app.email.verification.drop-password-subject}")
+    private String dropPasswordSubject;
+
     public void sendVerificationEmail(User user, String code) throws MessagingException, IOException {
         MimeMessage message = mailSender.createMimeMessage();
         MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
@@ -45,8 +48,8 @@ public class EmailService {
         helper.setFrom("noreply@no-copy.ru");
         helper.setTo(user.getEmail());
         helper.setSubject(standartSubject);
-
-        String htmlContent = loadAndProcessTemplate(user.getFullName(), code);
+        String htmlContent = loadAndProcessTemplate(user.getFullName(), code,
+                "templates/email-verification.html");
         helper.setText(htmlContent, true);
 
         mailSender.send(message);
@@ -69,8 +72,8 @@ public class EmailService {
         return String.valueOf(code);
     }
 
-    private String loadAndProcessTemplate(String username, String code) throws IOException {
-        ClassPathResource resource = new ClassPathResource("templates/email-verification.html");
+    private String loadAndProcessTemplate(String username, String code, String templatePath) throws IOException {
+        ClassPathResource resource = new ClassPathResource(templatePath);
         String template = new String(resource.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
         String safeUsername = escapeHtml(username != null ? username : user);
         String safeCode = escapeHtml(code);
@@ -89,4 +92,25 @@ public class EmailService {
                 .replace("\"", """)
                 .replace("'", "'");
     }
+
+    public void sendResetPasswordEmail(User user, String code) {
+        try {
+            MimeMessage message = mailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
+
+            helper.setFrom(standartAdressFrom);
+            helper.setTo(user.getEmail());
+            helper.setSubject(dropPasswordSubject);
+
+            String htmlContent = loadAndProcessTemplate(user.getFullName(), code,
+                    "templates/reset-password.html");
+            helper.setText(htmlContent, true);
+
+            mailSender.send(message);
+
+            log.info("Email sent to: {}", user.getEmail());
+        } catch (Exception e) {
+            log.error("Failed to send email: {}", e.getMessage());
+        }
+    }
 }

src/main/java/ru/soune/nocopy/service/register/AuthService.java

@@ -17,12 +17,10 @@ import ru.soune.nocopy.entity.tarif.TariffType;
 import ru.soune.nocopy.entity.user.AuthToken;
 import ru.soune.nocopy.entity.user.Permission;
 import ru.soune.nocopy.entity.user.User;
+import ru.soune.nocopy.entity.user.UserNotActive;
 import ru.soune.nocopy.exception.NotFoundAuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.nocopy.repository.CompanyRepository;
-import ru.soune.nocopy.repository.TariffInfoRepository;
-import ru.soune.nocopy.repository.UserRepository;
+import ru.soune.nocopy.repository.*;
 import ru.soune.nocopy.service.file.CheckCounterService;
 import ru.soune.nocopy.service.tariff.TariffInfoService;
 
@@ -48,6 +46,8 @@ public class AuthService {
 
     private final TariffInfoService tariffInfoService;
 
+    private final UserNotActiveRepository userNotActiveRepository;
+
     private final SecureRandom secureRandom = new SecureRandom();
 
     @Transactional
@@ -102,14 +102,30 @@ public class AuthService {
         return authToken.getUser().getId();
     }
 
-
-    @Transactional
     public AuthToken login(LoginRequest request) {
         User user = userRepository.findByEmail(request.getEmail());
 
+        if (!user.isActive()) {
+            throw new NotValidFieldException("User not active", new BaseResponse(20003,
+                    MessageCode.USER_NOT_ACTIVE.getCode(),
+                    MessageCode.USER_NOT_ACTIVE.getDescription(), Map.of("userId", user.getId())));
+        }
+
         if (!passwordEncoder.matches(request.getPassword(), user.getPassword())) {
             LoginAnswer loginAnswer = new LoginAnswer();
             loginAnswer.setFieldErrors(Arrays.asList(Map.of("password", request.getPassword())));
+            loginAnswer.setVerified(user.isEmailVerified());
+            loginAnswer.setActive(user.isActive());
+
+            int attempts = user.getFailedLoginAttempts() + 1;
+            user.setFailedLoginAttempts(attempts);
+
+            if (attempts >= 5) {
+                user.setActive(false);
+                blockUser(user);
+            }
+
+            userRepository.save(user);
 
             throw new NotValidFieldException("Invalid password", new BaseResponse(20003,
                     MessageCode.AUTH_PASSWORD_NOT_MATCHES.getCode(),
@@ -117,6 +133,9 @@ public class AuthService {
         }
 
         user.setLastLoginAt(LocalDateTime.now());
+        user.setFailedLoginAttempts(0);
+        user.setActive(true);
+
         User savedUser = userRepository.save(user);
 
         AuthToken authToken = new AuthToken();
@@ -132,6 +151,7 @@ public class AuthService {
                 .ifPresent(authTokenRepository::delete);
     }
 
+    @Transactional
     public AuthToken generateAuthToken(User user) {
         return authTokenRepository.save(genereateAuthToken(user));
     }
@@ -211,4 +231,19 @@ public class AuthService {
         user.setCompany(company);
         user.grantPermission(Permission.DEFAULT_USER_PERMISSIONS);
     }
+
+    public void blockUser(User user) {
+        Optional<UserNotActive> existing = userNotActiveRepository.findByUserId(user.getId());
+        if (existing.isEmpty()) {
+            LocalDateTime now = LocalDateTime.now();
+
+            UserNotActive notActive = UserNotActive.builder()
+                    .user(user)
+                    .createdAt(now)
+                    .blockedUntil(now.plusMinutes(15))
+                    .build();
+
+            userNotActiveRepository.save(notActive);
+        }
+    }
 }