Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit a62d23a

Browse files
author
Ivan Franchin
committed
Refactor place where password is encoded
1 parent 09d29c2 commit a62d23a

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

‎book-api/src/main/java/com/ivanfranchin/bookapi/rest/AuthController.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package com.ivanfranchin.bookapi.rest;
22

3-
import com.ivanfranchin.bookapi.security.SecurityConfig;
4-
import com.ivanfranchin.bookapi.user.DuplicatedUserInfoException;
5-
import com.ivanfranchin.bookapi.user.User;
63
import com.ivanfranchin.bookapi.rest.dto.AuthResponse;
74
import com.ivanfranchin.bookapi.rest.dto.LoginRequest;
85
import com.ivanfranchin.bookapi.rest.dto.SignUpRequest;
6+
import com.ivanfranchin.bookapi.security.SecurityConfig;
7+
import com.ivanfranchin.bookapi.user.DuplicatedUserInfoException;
8+
import com.ivanfranchin.bookapi.user.User;
99
import com.ivanfranchin.bookapi.user.UserService;
1010
import jakarta.validation.Valid;
1111
import lombok.RequiredArgsConstructor;
1212
import org.springframework.http.HttpStatus;
1313
import org.springframework.http.ResponseEntity;
14+
import org.springframework.security.crypto.password.PasswordEncoder;
1415
import org.springframework.web.bind.annotation.PostMapping;
1516
import org.springframework.web.bind.annotation.RequestBody;
1617
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,6 +26,7 @@
2526
public class AuthController {
2627

2728
private final UserService userService;
29+
private final PasswordEncoder passwordEncoder;
2830

2931
@PostMapping("/authenticate")
3032
public ResponseEntity<AuthResponse> login(@Valid @RequestBody LoginRequest loginRequest) {
@@ -53,7 +55,7 @@ public AuthResponse signUp(@Valid @RequestBody SignUpRequest signUpRequest) {
5355
private User mapSignUpRequestToUser(SignUpRequest signUpRequest) {
5456
User user = new User();
5557
user.setUsername(signUpRequest.username());
56-
user.setPassword(signUpRequest.password());
58+
user.setPassword(passwordEncoder.encode(signUpRequest.password()));
5759
user.setName(signUpRequest.name());
5860
user.setEmail(signUpRequest.email());
5961
user.setRole(SecurityConfig.USER);

‎book-api/src/main/java/com/ivanfranchin/bookapi/runner/DatabaseInitializer.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import lombok.RequiredArgsConstructor;
99
import lombok.extern.slf4j.Slf4j;
1010
import org.springframework.boot.CommandLineRunner;
11+
import org.springframework.security.crypto.password.PasswordEncoder;
1112
import org.springframework.stereotype.Component;
1213

1314
import java.util.Arrays;
@@ -21,13 +22,17 @@ public class DatabaseInitializer implements CommandLineRunner {
2122

2223
private final UserService userService;
2324
private final BookService bookService;
25+
private final PasswordEncoder passwordEncoder;
2426

2527
@Override
2628
public void run(String... args) {
2729
if (!userService.getUsers().isEmpty()) {
2830
return;
2931
}
30-
USERS.forEach(userService::saveUser);
32+
USERS.forEach(user -> {
33+
user.setPassword(passwordEncoder.encode(user.getPassword()));
34+
userService.saveUser(user);
35+
});
3136
getBooks().forEach(bookService::saveBook);
3237
log.info("Database initialized");
3338
}

‎book-api/src/main/java/com/ivanfranchin/bookapi/user/UserServiceImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public User validateAndGetUserByUsername(String username) {
4242

4343
@Override
4444
public User saveUser(User user) {
45-
user.setPassword(passwordEncoder.encode(user.getPassword()));
4645
return userRepository.save(user);
4746
}
4847

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /