Merge pull request #39 from TP-RENTPLACE/feature/add-registration

Kattsyn · web-flow · commit fbf4208f189b · 2025-05-04T18:54:43.000+03:00
Feature/add registration
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/controllers/AuthController.java b/rentplace/src/main/java/kattsyn/dev/rentplace/controllers/AuthController.java
@@ -14,7 +14,7 @@
 @RestController
 @RequestMapping("${api.path}/auth")
 @RequiredArgsConstructor
-@Tag(name = "Аутентификация", description = "Для аутентификации, регистрации, обновлении и запроса токенов и отправки запросов кода на почту.")
+@Tag(name = "Authentication", description = "Для аутентификации, регистрации, обновлении и запроса токенов и отправки запросов кода на почту.")
 public class AuthController {
 
     private final AuthService authService;
@@ -25,9 +25,8 @@ public class AuthController {
             summary = "Запросить код по почте",
             description = "Запрос на получение кода авторизации по почте"
     )
-    public ResponseEntity<JwtResponse> login(@RequestBody CodeRequest codeRequest) {
-        verificationCodeService.generateAndSendCode(codeRequest.getEmail());
-        return ResponseEntity.ok().build();
+    public ResponseEntity<CodeResponse> requestCode(@RequestBody CodeRequest codeRequest) {
+        return ResponseEntity.ok(verificationCodeService.generateAndSendCode(codeRequest.getEmail()));
     }
 
     @Operation(
@@ -68,6 +67,32 @@ public ResponseEntity<JwtResponse> login(@RequestBody JwtRequest authRequest/*,
                 .body(tokens);
     }
 
+    @Operation(
+            summary = "Запрос на регистрацию",
+            description = "Получает email и код с почты, а также имя и фамилию пользователя. Возвращает JWT токены"
+    )
+    @PostMapping("/register")
+    public ResponseEntity<JwtResponse> register(@RequestBody RegisterRequest registerRequest/*,
+                                             HttpServletResponse response*/) throws AuthException {
+        JwtResponse tokens = authService.register(registerRequest);
+
+        return ResponseEntity.ok()
+                .body(tokens);
+    }
+
+    @Operation(
+            summary = "Проверка валидности введенного кода пользователем",
+            description = "Проверяет правильность введенного кода, отправленного на почту. Использовать в случае, если пользователь новый."
+    )
+    @PostMapping("/validate-code")
+    public ResponseEntity<Void> checkCode(@RequestBody JwtRequest authRequest/*,
+                                             HttpServletResponse response*/) throws AuthException {
+        authService.validateCode(authRequest);
+        return ResponseEntity.ok().build();
+    }
+
+
+
     @Operation(
             summary = "Запрос на обновление AccessToken'а",
             description = "Получает RefreshToken, возвращает новый AccessToken"
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/controllers/UserController.java b/rentplace/src/main/java/kattsyn/dev/rentplace/controllers/UserController.java
@@ -121,7 +121,7 @@ public ResponseEntity<UserDTO> createUser(@ModelAttribute @Valid UserCreateEditD
     @PreAuthorize("hasAuthority('ROLE_ADMIN') or hasAuthority('ROLE_USER')" )
     @SecurityRequirement(name = "JWT")
     @PatchMapping(path = "/{id}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseEntity<UserDTO> updateUser(
+    public ResponseEntity<UserDTO> updateUserById(
             @PathVariable
             @Parameter(description = "id пользователя", example = "1") long id,
             @ModelAttribute @Valid UserCreateEditDTO userCreateEditDTO,
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/dtos/CodeResponse.java b/rentplace/src/main/java/kattsyn/dev/rentplace/dtos/CodeResponse.java
@@ -0,0 +1,17 @@
+package kattsyn.dev.rentplace.dtos;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import kattsyn.dev.rentplace.enums.AuthType;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+@AllArgsConstructor
+public class CodeResponse {
+
+    @Schema(description = "Тип аутентификации. AUTH_LOGIN, если пользователь существует, иначе AUTH_REGISTER")
+    private AuthType authType;
+
+}
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/dtos/RegisterRequest.java b/rentplace/src/main/java/kattsyn/dev/rentplace/dtos/RegisterRequest.java
@@ -0,0 +1,24 @@
+package kattsyn.dev.rentplace.dtos;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+public class RegisterRequest {
+
+    @Schema(description = "Почта пользователя", example = "warshard1337@gmail.com")
+    private String email;
+    @Schema(description = "Код, который пользователь получил на почту", example = "12345")
+    private String code;
+    @Schema(description = "Имя нового пользователя")
+    private String name;
+    @Schema(description = "Фамилия нового пользователя")
+    private String surname;
+
+}
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/enums/AuthType.java b/rentplace/src/main/java/kattsyn/dev/rentplace/enums/AuthType.java
@@ -0,0 +1,8 @@
+package kattsyn.dev.rentplace.enums;
+
+public enum AuthType {
+
+    AUTH_LOGIN,
+    AUTH_REGISTER
+
+}
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/mappers/UserMapper.java b/rentplace/src/main/java/kattsyn/dev/rentplace/mappers/UserMapper.java
@@ -1,5 +1,6 @@
 package kattsyn.dev.rentplace.mappers;
 
+import kattsyn.dev.rentplace.dtos.RegisterRequest;
 import kattsyn.dev.rentplace.dtos.UserCreateEditDTO;
 import kattsyn.dev.rentplace.dtos.UserDTO;
 import kattsyn.dev.rentplace.entities.User;
@@ -13,6 +14,7 @@
 public interface UserMapper {
 
 
+    User fromRegisterRequest(RegisterRequest registerRequest);
     User fromDTO(UserDTO userDTO);
     @Mapping(target = "imageDTO", source = "image")
     UserDTO fromUser(User user);
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/repositories/UserRepository.java b/rentplace/src/main/java/kattsyn/dev/rentplace/repositories/UserRepository.java
@@ -8,5 +8,6 @@
 public interface UserRepository extends JpaRepository<User, Long> {
 
     Optional<User> findByEmail(String email);
+    boolean existsByEmail(String email);
 
 }
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/services/AuthService.java b/rentplace/src/main/java/kattsyn/dev/rentplace/services/AuthService.java
@@ -4,12 +4,15 @@
 import kattsyn.dev.rentplace.auth.JwtAuthentication;
 import kattsyn.dev.rentplace.dtos.JwtRequest;
 import kattsyn.dev.rentplace.dtos.JwtResponse;
+import kattsyn.dev.rentplace.dtos.RegisterRequest;
 import kattsyn.dev.rentplace.dtos.UserDTO;
 
 public interface AuthService {
 
     JwtResponse login(JwtRequest authRequest) throws AuthException;
 
+    JwtResponse register(RegisterRequest registerRequest) throws AuthException;
+
     JwtResponse getAccessToken(String refreshToken);
 
     JwtResponse refresh(String refreshToken) throws AuthException;
@@ -18,4 +21,5 @@ public interface AuthService {
 
     UserDTO getUserInfo() throws AuthException;
 
+    boolean validateCode(JwtRequest request) throws AuthException;
 }
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/services/UserService.java b/rentplace/src/main/java/kattsyn/dev/rentplace/services/UserService.java
@@ -1,8 +1,6 @@
 package kattsyn.dev.rentplace.services;
 
-import kattsyn.dev.rentplace.dtos.ImageDTO;
-import kattsyn.dev.rentplace.dtos.UserCreateEditDTO;
-import kattsyn.dev.rentplace.dtos.UserDTO;
+import kattsyn.dev.rentplace.dtos.*;
 import kattsyn.dev.rentplace.entities.User;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -11,15 +9,28 @@
 public interface UserService {
 
     List<UserDTO> findAll();
+
     User getUserByEmail(String email);
+
+    boolean existsByEmail(String email);
+
     UserDTO getUserDTOByEmail(String email);
+
     UserDTO findById(Long id);
+
     User getUserById(Long id);
+
     UserDTO save(UserDTO userDTO);
+
     UserDTO createWithImage(UserCreateEditDTO userCreateEditDTO);
+
     void deleteById(long id);
+
     ImageDTO uploadImage(MultipartFile file, long id);
+
     UserDTO update(long id, UserCreateEditDTO userCreateEditDTO);
 
     boolean allowedToEditUser(long id, String email);
+
+    User createUserWithRegisterRequest(RegisterRequest registerRequest);
 }
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/services/VerificationCodeService.java b/rentplace/src/main/java/kattsyn/dev/rentplace/services/VerificationCodeService.java
@@ -1,9 +1,11 @@
 package kattsyn.dev.rentplace.services;
 
+import kattsyn.dev.rentplace.dtos.CodeResponse;
+
 public interface VerificationCodeService {
     boolean validateCode(String email, String code);
 
-    void generateAndSendCode(String email);
+    CodeResponse generateAndSendCode(String email);
 
     String generateCode();
 
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/AuthServiceImpl.java b/rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/AuthServiceImpl.java
@@ -6,6 +6,7 @@
 import kattsyn.dev.rentplace.auth.JwtAuthentication;
 import kattsyn.dev.rentplace.dtos.JwtRequest;
 import kattsyn.dev.rentplace.dtos.JwtResponse;
+import kattsyn.dev.rentplace.dtos.RegisterRequest;
 import kattsyn.dev.rentplace.dtos.UserDTO;
 import kattsyn.dev.rentplace.entities.User;
 import kattsyn.dev.rentplace.services.AuthService;
@@ -34,10 +35,22 @@ public class AuthServiceImpl implements AuthService {
     private final JwtProvider jwtProvider;
     private final VerificationCodeService verificationCodeService;
 
+    @Override
+    public JwtResponse register(@NonNull RegisterRequest registerRequest) throws AuthException {
+        User user = userService.createUserWithRegisterRequest(registerRequest);
+
+        return getJwtResponse(user, registerRequest.getEmail(), registerRequest.getCode());
+    }
+
+    @Override
     public JwtResponse login(@NonNull JwtRequest authRequest) throws AuthException {
         final User user = userService.getUserByEmail(authRequest.getEmail());
 
-        if (verificationCodeService.validateCode(authRequest.getEmail(), authRequest.getCode())) {
+        return getJwtResponse(user, authRequest.getEmail(), authRequest.getCode());
+    }
+
+    private JwtResponse getJwtResponse(User user, String email, String code) throws AuthException {
+        if (verificationCodeService.validateCode(email, code)) {
             final String accessToken = jwtProvider.generateAccessToken(user);
             final String refreshToken = jwtProvider.generateRefreshToken(user);
             refreshStorage.put(user.getEmail(), refreshToken);
@@ -47,6 +60,11 @@ public JwtResponse login(@NonNull JwtRequest authRequest) throws AuthException {
         }
     }
 
+    @Override
+    public boolean validateCode(JwtRequest request) {
+        return verificationCodeService.validateCode(request.getEmail(), request.getCode());
+    }
+
     public JwtResponse getAccessToken(@NonNull String refreshToken) {
         if (jwtProvider.validateRefreshToken(refreshToken)) {
             final Claims claims = jwtProvider.getRefreshClaims(refreshToken);
@@ -87,6 +105,8 @@ public UserDTO getUserInfo() throws AuthException {
         return userService.getUserDTOByEmail(email);
     }
 
+
+
     public JwtAuthentication getAuthInfo() {
         return (JwtAuthentication) SecurityContextHolder.getContext().getAuthentication();
     }
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/UserServiceImpl.java b/rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/UserServiceImpl.java
@@ -1,9 +1,7 @@
 package kattsyn.dev.rentplace.services.impl;
 
 import jakarta.transaction.Transactional;
-import kattsyn.dev.rentplace.dtos.ImageDTO;
-import kattsyn.dev.rentplace.dtos.UserCreateEditDTO;
-import kattsyn.dev.rentplace.dtos.UserDTO;
+import kattsyn.dev.rentplace.dtos.*;
 import kattsyn.dev.rentplace.entities.Image;
 import kattsyn.dev.rentplace.entities.User;
 import kattsyn.dev.rentplace.enums.ImageType;
@@ -44,6 +42,11 @@ public User getUserByEmail(String email) {
         );
     }
 
+    @Override
+    public boolean existsByEmail(String email) {
+        return userRepository.existsByEmail(email);
+    }
+
     @Override
     public UserDTO getUserDTOByEmail(String email) {
         return userMapper.fromUser(userRepository.findByEmail(email)
@@ -150,6 +153,16 @@ public boolean allowedToEditUser(long id, String email) {
         throw new ForbiddenException(String.format("FORBIDDEN. You are not allowed to edit user email: %s.", email));
     }
 
+
+    @Override
+    public User createUserWithRegisterRequest(RegisterRequest registerRequest) {
+        User user = userMapper.fromRegisterRequest(registerRequest);
+        user.setRegistrationDate(LocalDate.now());
+        user.setRole(Role.ROLE_USER);
+
+        return userRepository.save(user);
+    }
+
     private UserDTO uploadImage(MultipartFile file, User user) {
         String path = PathResolver.resolvePath(ImageType.USER, user.getUserId());
 
diff --git a/rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/VerificationCodeServiceImpl.java b/rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/VerificationCodeServiceImpl.java
@@ -1,9 +1,12 @@
 package kattsyn.dev.rentplace.services.impl;
 
+import kattsyn.dev.rentplace.dtos.CodeResponse;
 import kattsyn.dev.rentplace.entities.VerificationCode;
+import kattsyn.dev.rentplace.enums.AuthType;
 import kattsyn.dev.rentplace.exceptions.NotFoundException;
 import kattsyn.dev.rentplace.repositories.VerificationCodeRepository;
 import kattsyn.dev.rentplace.services.EmailService;
+import kattsyn.dev.rentplace.services.UserService;
 import kattsyn.dev.rentplace.services.VerificationCodeService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,6 +22,7 @@ public class VerificationCodeServiceImpl implements VerificationCodeService {
 
     private final VerificationCodeRepository verificationCodeRepository;
     private final EmailService emailService;
+    private final UserService userService;
 
     @Override
     public boolean validateCode(String email, String code) {
@@ -29,7 +33,7 @@ public boolean validateCode(String email, String code) {
     }
 
     @Override
-    public void generateAndSendCode(String email) {
+    public CodeResponse generateAndSendCode(String email) {
         log.info("Generating verification code for email {}", email);
         String code = generateCode();
 
@@ -41,7 +45,11 @@ public void generateAndSendCode(String email) {
         verificationCodeRepository.save(verificationCode);
         log.info("Generated verification code {}", verificationCode.getCode());
 
+        CodeResponse codeResponse = new CodeResponse(userService.existsByEmail(email) ? AuthType.AUTH_LOGIN : AuthType.AUTH_REGISTER);
+
         emailService.sendVerificationCode(email, code);
+
+        return codeResponse;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@`
`8`	`8`	`public interface UserRepository extends JpaRepository<User, Long> {`
`9`	`9`
`10`	`10`	`Optional<User> findByEmail(String email);`
	`11`	`+ boolean existsByEmail(String email);`
`11`	`12`
`12`	`13`	`}`