-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from sws6641/sws6641
10주자 과제 제출
- Loading branch information
Showing
44 changed files
with
1,033 additions
and
97 deletions.
There are no files selected for viewing
47 changes: 47 additions & 0 deletions
47
src/main/java/kr/megaptera/backendsurvivalweek10/application/auth/LoginService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
package kr.megaptera.backendsurvivalweek10.application.auth; | ||
|
||
import jakarta.transaction.Transactional; | ||
import kr.megaptera.backendsurvivalweek10.dtos.auth.LoginResultDto; | ||
import kr.megaptera.backendsurvivalweek10.infrastructure.UserDetailsDao; | ||
import kr.megaptera.backendsurvivalweek10.util.AccessTokenGenerator; | ||
import org.springframework.security.authentication.BadCredentialsException; | ||
import org.springframework.security.crypto.password.PasswordEncoder; | ||
import org.springframework.stereotype.Service; | ||
|
||
import java.util.stream.Collectors; | ||
|
||
@Service | ||
@Transactional | ||
public class LoginService { | ||
private final AccessTokenGenerator accessTokenGenerator; | ||
|
||
private final PasswordEncoder passwordEncoder; | ||
|
||
private final UserDetailsDao userDetailsDao; | ||
|
||
public LoginService(AccessTokenGenerator accessTokenGenerator, | ||
PasswordEncoder passwordEncoder, | ||
UserDetailsDao userDetailsDao) { | ||
this.accessTokenGenerator = accessTokenGenerator; | ||
this.passwordEncoder = passwordEncoder; | ||
this.userDetailsDao = userDetailsDao; | ||
} | ||
|
||
public LoginResultDto login(String username, String password) { | ||
return userDetailsDao.findByUsername(username) | ||
.filter(userDetails -> passwordEncoder.matches( | ||
password, userDetails.getPassword())) | ||
.map(userDetails -> { | ||
String id = userDetails.getUsername(); | ||
String accessToken = accessTokenGenerator.generate(id); | ||
userDetailsDao.addAccessToken(id, accessToken); | ||
return new LoginResultDto( | ||
accessToken, | ||
userDetails | ||
.getAuthorities() | ||
.stream().map(Object::toString) | ||
.collect(Collectors.toList())); | ||
}) | ||
.orElseThrow(() -> new BadCredentialsException("Login failed")); | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
src/main/java/kr/megaptera/backendsurvivalweek10/application/auth/LogoutService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package kr.megaptera.backendsurvivalweek10.application.auth; | ||
|
||
import jakarta.transaction.Transactional; | ||
import kr.megaptera.backendsurvivalweek10.infrastructure.UserDetailsDao; | ||
import org.springframework.stereotype.Service; | ||
|
||
@Service | ||
@Transactional | ||
public class LogoutService { | ||
private final UserDetailsDao userDetailsDao; | ||
|
||
|
||
public LogoutService(UserDetailsDao userDetailsDao) { | ||
this.userDetailsDao = userDetailsDao; | ||
} | ||
|
||
public void logout(String accessToken) { | ||
userDetailsDao.removeAccessToken(accessToken); | ||
} | ||
} |
41 changes: 41 additions & 0 deletions
41
src/main/java/kr/megaptera/backendsurvivalweek10/application/auth/SignupService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
package kr.megaptera.backendsurvivalweek10.application.auth; | ||
|
||
import io.hypersistence.tsid.TSID; | ||
import jakarta.transaction.Transactional; | ||
import kr.megaptera.backendsurvivalweek10.dtos.auth.SignupResultDto; | ||
import kr.megaptera.backendsurvivalweek10.exceptions.UserAlreadyExistsException; | ||
import kr.megaptera.backendsurvivalweek10.infrastructure.UserDetailsDao; | ||
import kr.megaptera.backendsurvivalweek10.util.AccessTokenGenerator; | ||
import org.springframework.security.crypto.password.PasswordEncoder; | ||
import org.springframework.stereotype.Service; | ||
|
||
@Service | ||
@Transactional | ||
public class SignupService { | ||
private final AccessTokenGenerator accessTokenGenerator; | ||
private final PasswordEncoder passwordEncoder; | ||
private final UserDetailsDao userDetailsDao; | ||
|
||
public SignupService(AccessTokenGenerator accessTokenGenerator, | ||
PasswordEncoder passwordEncoder, | ||
UserDetailsDao userDetailsDao) { | ||
this.accessTokenGenerator = accessTokenGenerator; | ||
this.passwordEncoder = passwordEncoder; | ||
this.userDetailsDao = userDetailsDao; | ||
} | ||
|
||
public SignupResultDto signup(String username, String password) { | ||
if (userDetailsDao.existsByUsername(username)) { | ||
throw new UserAlreadyExistsException(); | ||
} | ||
|
||
String id = TSID.Factory.getTsid().toString(); | ||
String encodedPassword = passwordEncoder.encode(password); | ||
String accessToken = accessTokenGenerator.generate(id); | ||
|
||
userDetailsDao.addUser(id, username, encodedPassword); | ||
userDetailsDao.addAccessToken(id, accessToken); | ||
|
||
return new SignupResultDto(accessToken); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...in/java/kr/megaptera/backendsurvivalweek10/application/product/GetProductListService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
src/main/java/kr/megaptera/backendsurvivalweek10/controllers/SessionController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
package kr.megaptera.backendsurvivalweek10.controllers; | ||
|
||
import jakarta.validation.Valid; | ||
import kr.megaptera.backendsurvivalweek10.application.auth.LoginService; | ||
import kr.megaptera.backendsurvivalweek10.application.auth.LogoutService; | ||
import kr.megaptera.backendsurvivalweek10.dtos.auth.LoginRequestDto; | ||
import kr.megaptera.backendsurvivalweek10.dtos.auth.LoginResultDto; | ||
import org.springframework.http.HttpStatus; | ||
import org.springframework.security.authentication.BadCredentialsException; | ||
import org.springframework.security.core.Authentication; | ||
import org.springframework.web.bind.annotation.DeleteMapping; | ||
import org.springframework.web.bind.annotation.ExceptionHandler; | ||
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.ResponseStatus; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
@RestController | ||
@RequestMapping("/session") | ||
public class SessionController { | ||
|
||
private final LoginService loginService; | ||
private final LogoutService logoutService; | ||
|
||
public SessionController(LoginService loginService, LogoutService logoutService) { | ||
this.loginService = loginService; | ||
this.logoutService = logoutService; | ||
} | ||
|
||
@PostMapping | ||
@ResponseStatus(HttpStatus.CREATED) | ||
public LoginResultDto login( | ||
@Valid @RequestBody LoginRequestDto dto) { | ||
return loginService.login(dto.username(), dto.password()); | ||
} | ||
|
||
@DeleteMapping | ||
@ResponseStatus(HttpStatus.NO_CONTENT) | ||
public String logout(Authentication authentication) { | ||
String accessToken = authentication.getCredentials().toString(); | ||
|
||
logoutService.logout(accessToken); | ||
|
||
return "Logout"; | ||
} | ||
|
||
@ExceptionHandler(BadCredentialsException.class) | ||
@ResponseStatus(HttpStatus.BAD_REQUEST) | ||
public String loginFailed() { | ||
return "Bad Request"; | ||
} | ||
|
||
} |
39 changes: 39 additions & 0 deletions
39
src/main/java/kr/megaptera/backendsurvivalweek10/controllers/UserController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
package kr.megaptera.backendsurvivalweek10.controllers; | ||
|
||
import jakarta.validation.Valid; | ||
import kr.megaptera.backendsurvivalweek10.application.auth.SignupService; | ||
import kr.megaptera.backendsurvivalweek10.dtos.auth.SignupRequestDto; | ||
import kr.megaptera.backendsurvivalweek10.dtos.auth.SignupResultDto; | ||
import kr.megaptera.backendsurvivalweek10.exceptions.UserAlreadyExistsException; | ||
import org.springframework.http.HttpStatus; | ||
import org.springframework.web.bind.annotation.ExceptionHandler; | ||
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.ResponseStatus; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
@RestController | ||
@RequestMapping("/users") | ||
public class UserController { | ||
private final SignupService signupService; | ||
|
||
public UserController(SignupService signupService) { | ||
this.signupService = signupService; | ||
} | ||
|
||
@PostMapping | ||
@ResponseStatus(HttpStatus.CREATED) | ||
public SignupResultDto signup( | ||
@Valid @RequestBody SignupRequestDto signupRequestDto) { | ||
return signupService.signup( | ||
signupRequestDto.username().trim(), | ||
signupRequestDto.password().trim()); | ||
} | ||
|
||
@ExceptionHandler(UserAlreadyExistsException.class) | ||
@ResponseStatus(HttpStatus.BAD_REQUEST) | ||
public String alreadyExists() { | ||
return "User already exists."; | ||
} | ||
} |
25 changes: 25 additions & 0 deletions
25
src/main/java/kr/megaptera/backendsurvivalweek10/controllers/WelcomeController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package kr.megaptera.backendsurvivalweek10.controllers; | ||
|
||
import org.springframework.security.access.annotation.Secured; | ||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.RestController; | ||
|
||
@RestController | ||
public class WelcomeController { | ||
@GetMapping("/") | ||
public String home() { | ||
return "Hello, world!"; | ||
} | ||
|
||
@GetMapping("/admin") | ||
@Secured("ROLE_ADMIN") | ||
public String admin() { | ||
return "Hello, world!"; | ||
} | ||
|
||
@GetMapping("/user") | ||
@Secured({"ROLE_USER", "ROLE_ADMIN"}) | ||
public String user() { | ||
return "Hello, world!"; | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
src/main/java/kr/megaptera/backendsurvivalweek10/dtos/auth/LoginRequestDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
package kr.megaptera.backendsurvivalweek10.dtos.auth; | ||
|
||
public record LoginRequestDto( | ||
String username, | ||
String password | ||
) { | ||
} |
Oops, something went wrong.