Added a verification email on registration

pom.xml

@@ -121,6 +121,11 @@
             <version>2.17.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/pl/simpleascoding/tutoringplatform/TutoringPlatformApplication.java

@@ -6,8 +6,10 @@
 import org.apache.logging.log4j.MarkerManager;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling
 public class TutoringPlatformApplication {
 
 

src/main/java/pl/simpleascoding/tutoringplatform/api/publicResource/UserController.java

@@ -3,14 +3,13 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import pl.simpleascoding.tutoringplatform.dto.ChangeUserPasswordDTO;
 import pl.simpleascoding.tutoringplatform.dto.CreateUserDTO;
 import pl.simpleascoding.tutoringplatform.service.user.UserFacade;
 
+import javax.servlet.http.HttpServletRequest;
+
 import java.security.Principal;
 
 @RestController
@@ -21,8 +20,13 @@ class UserController {
     private final UserFacade userFacade;
 
     @PostMapping
-    ResponseEntity<String> createUser(@RequestBody CreateUserDTO dto) {
-        return new ResponseEntity<>(userFacade.createUser(dto), HttpStatus.OK);
+    ResponseEntity<String> createUser(@RequestBody CreateUserDTO dto, HttpServletRequest request) {
+        return new ResponseEntity<>(userFacade.createUser(dto, request.getRequestURL().toString()), HttpStatus.OK);
+    }
+
+    @GetMapping("/confirm-registration")
+    ResponseEntity<String> confirmRegistration(@RequestParam String tokenValue) {
+        return new ResponseEntity<>(userFacade.confirmUserRegistration(tokenValue), HttpStatus.OK);
     }
 
     @PostMapping("/change-password")

src/main/java/pl/simpleascoding/tutoringplatform/domain/token/Token.java

@@ -0,0 +1,40 @@
+package pl.simpleascoding.tutoringplatform.domain.token;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import pl.simpleascoding.tutoringplatform.domain.user.User;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+@Data
+@Entity
+@Table(name = "token")
+@NoArgsConstructor
+public class Token {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private TokenType type;
+
+    private String value = UUID.randomUUID().toString();
+
+    @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+    private User user;
+
+    private LocalDateTime createdAt = LocalDateTime.now();
+    private LocalDateTime expiresAt = createdAt.plusMinutes(15);
+    private LocalDateTime confirmedAt;
+
+    public Token(TokenType type) {
+        this.type = type;
+    }
+
+    public void confirm() {
+        this.confirmedAt = LocalDateTime.now();
+    }
+
+}

src/main/java/pl/simpleascoding/tutoringplatform/domain/token/TokenType.java

@@ -0,0 +1,5 @@
+package pl.simpleascoding.tutoringplatform.domain.token;
+
+public enum TokenType {
+    REGISTER, PASSWORD, EMAIL
+}

src/main/java/pl/simpleascoding/tutoringplatform/domain/user/User.java

@@ -5,6 +5,7 @@
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
+import pl.simpleascoding.tutoringplatform.domain.token.Token;
 
 import javax.persistence.*;
 import java.util.ArrayList;
@@ -24,16 +25,25 @@ public class User implements UserDetails {
 
     private String name;
     private String surname;
+    private String email;
 
-    @OneToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.EAGER)
+    private boolean enabled = false;
+    private boolean locked = false;
+
+    @OneToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE}, fetch = FetchType.EAGER)
     @JoinColumn(name = "user_id")
     private List<Role> roles = new ArrayList<>();
 
-    public User(String username, String password, String name, String surname) {
+    @OneToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+    @JoinColumn(name = "user_id")
+    private List<Token> tokens = new ArrayList<>();
+
+    public User(String username, String password, String name, String surname, String email) {
         this.username = username;
         this.password = password;
         this.name = name;
         this.surname = surname;
+        this.email = email;
     }
 
     @Override
@@ -48,16 +58,12 @@ public boolean isAccountNonExpired() {
 
     @Override
     public boolean isAccountNonLocked() {
-        return true;
+        return !locked;
     }
 
     @Override
     public boolean isCredentialsNonExpired() {
         return true;
     }
 
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
 }

src/main/java/pl/simpleascoding/tutoringplatform/dto/CreateUserDTO.java

@@ -3,5 +3,5 @@
 import org.hibernate.annotations.Immutable;
 
 @Immutable
-public record CreateUserDTO(String username, String password, String name, String surname) {
+public record CreateUserDTO(String username, String password, String name, String surname, String email) {
 }

src/main/java/pl/simpleascoding/tutoringplatform/exception/EmailTakenException.java

@@ -0,0 +1,7 @@
+package pl.simpleascoding.tutoringplatform.exception;
+
+public class EmailTakenException extends RuntimeException {
+    public EmailTakenException(String email) {
+        super("Email \"" + email + "\" is already in use");
+    }
+}

src/main/java/pl/simpleascoding/tutoringplatform/exception/TokenAlreadyConfirmedException.java

@@ -0,0 +1,7 @@
+package pl.simpleascoding.tutoringplatform.exception;
+
+public class TokenAlreadyConfirmedException extends RuntimeException {
+    public TokenAlreadyConfirmedException() {
+        super("Token already confirmed");
+    }
+}

src/main/java/pl/simpleascoding/tutoringplatform/exception/TokenNotFoundException.java

@@ -0,0 +1,7 @@
+package pl.simpleascoding.tutoringplatform.exception;
+
+public class TokenNotFoundException extends RuntimeException {
+    public TokenNotFoundException() {
+        super("Token not found");
+    }
+}

src/main/java/pl/simpleascoding/tutoringplatform/exception/UserAlreadyEnabledException.java

@@ -0,0 +1,7 @@
+package pl.simpleascoding.tutoringplatform.exception;
+
+public class UserAlreadyEnabledException extends RuntimeException {
+    public UserAlreadyEnabledException(String username) {
+        super("User \"" + username + "\" is already enabled");
+    }
+}

src/main/java/pl/simpleascoding/tutoringplatform/repository/TokenRepository.java

@@ -0,0 +1,14 @@
+package pl.simpleascoding.tutoringplatform.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import pl.simpleascoding.tutoringplatform.domain.token.Token;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+public interface TokenRepository extends JpaRepository<Token, Long> {
+    Optional<Token> findTokenByValue(String value);
+
+    List<Token> findTokensByExpiresAtBefore(LocalDateTime localDateTime);
+}

src/main/java/pl/simpleascoding/tutoringplatform/repository/UserRepository.java

@@ -6,5 +6,7 @@
 import java.util.Optional;
 
 public interface UserRepository extends JpaRepository<User, Long> {
-    Optional<User> findByUsername(String username);
+    Optional<User> findUserByUsername(String username);
+
+    Optional<User> findUserByEmail(String email);
 }

src/main/java/pl/simpleascoding/tutoringplatform/service/token/ExpiredTokensCleanerService.java

@@ -0,0 +1,5 @@
+package pl.simpleascoding.tutoringplatform.service.token;
+
+public interface ExpiredTokensCleanerService {
+    void cleanExpiredTokens();
+}

src/main/java/pl/simpleascoding/tutoringplatform/service/token/ExpiredTokensCleanerServiceImpl.java

@@ -0,0 +1,40 @@
+package pl.simpleascoding.tutoringplatform.service.token;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import pl.simpleascoding.tutoringplatform.domain.token.Token;
+import pl.simpleascoding.tutoringplatform.domain.token.TokenType;
+import pl.simpleascoding.tutoringplatform.domain.user.User;
+import pl.simpleascoding.tutoringplatform.repository.TokenRepository;
+import pl.simpleascoding.tutoringplatform.repository.UserRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class ExpiredTokensCleanerServiceImpl implements ExpiredTokensCleanerService {
+
+    private final TokenRepository tokenRepository;
+    private final UserRepository userRepository;
+
+    @Override
+    @Scheduled(cron = "0 0 * ? * *")
+    public void cleanExpiredTokens() {
+        List<Token> expiredTokens = tokenRepository.findTokensByExpiresAtBefore(LocalDateTime.now());
+        List<User> inactiveUsers = expiredTokens
+                .stream()
+                .filter(token -> TokenType.REGISTER.equals(token.getType()) && Optional.ofNullable(token.getConfirmedAt()).isEmpty())
+                .map(Token::getUser)
+                .toList();
+
+        tokenRepository.deleteAll(expiredTokens);
+        log.info("Deleted expired tokens from the database.");
+        userRepository.deleteAll(inactiveUsers);
+        inactiveUsers.forEach(user -> log.info("Deleted user \"" + user.getUsername() + "\". Reason: Account has not been been activated."));
+    }
+}

src/main/java/pl/simpleascoding/tutoringplatform/service/user/UserFacade.java

@@ -9,17 +9,23 @@
 @RequiredArgsConstructor
 public class UserFacade {
 
-    private final UserServiceImpl userServiceImpl;
+    private final UserService userService;
 
-    public String createUser(CreateUserDTO dto) {
+    public String createUser(CreateUserDTO dto, String rootUrl) {
 
-        return userServiceImpl.createUser(dto);
+        return userService.createUser(dto, rootUrl);
+
+    }
+
+    public String confirmUserRegistration(String tokenValue) {
+
+        return userService.confirmUserRegistration(tokenValue);
 
     }
 
     public String changeUserPassword(ChangeUserPasswordDTO dto, String username) {
 
-        return userServiceImpl.changeUserPassword(dto, username);
+        return userService.changeUserPassword(dto, username);
 
     }
 

src/main/java/pl/simpleascoding/tutoringplatform/service/user/UserService.java

@@ -7,7 +7,9 @@
 @Service
 interface UserService {
 
-    String createUser(CreateUserDTO dto);
+    String createUser(CreateUserDTO dto, String rootUrl);
+
+    String confirmUserRegistration(String token);
 
     String changeUserPassword(ChangeUserPasswordDTO dto, String username);