-
Notifications
You must be signed in to change notification settings - Fork 78
[Sping MVC(인증)] 김예진 미션 제출합니다. #160
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
dPwls0125
wants to merge
5
commits into
next-step:dpwls0125
Choose a base branch
from
dPwls0125:mvc
base: dpwls0125
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
43 changes: 43 additions & 0 deletions
43
src/main/java/roomescape/auth/AdminRoleCheckInterceptor.java
This file contains hidden or 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,43 @@ | ||
package roomescape.auth; | ||
|
||
import jakarta.servlet.http.Cookie; | ||
import jakarta.servlet.http.HttpServletRequest; | ||
import jakarta.servlet.http.HttpServletResponse; | ||
import org.springframework.stereotype.Component; | ||
import org.springframework.web.servlet.HandlerInterceptor; | ||
|
||
import java.util.Arrays; | ||
|
||
@Component | ||
public class AdminRoleCheckInterceptor implements HandlerInterceptor { | ||
private final AuthService authService; | ||
|
||
public AdminRoleCheckInterceptor(AuthService authService) { | ||
this.authService = authService; | ||
} | ||
|
||
@Override | ||
public boolean preHandle(final HttpServletRequest request, final HttpServletResponse response, final Object handler) throws Exception { | ||
Cookie[] cookies = request.getCookies(); | ||
|
||
if (cookies == null) { | ||
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); | ||
return false; | ||
} | ||
|
||
String token = Arrays.stream(cookies) | ||
.filter(cookie -> "token".equals(cookie.getName())) | ||
.map(Cookie::getValue) | ||
.findFirst() | ||
.orElse(null); | ||
|
||
LoginMember member = authService.parseMemberInfo(token); | ||
|
||
if (member == null || !member.getRole().equals("ADMIN")) { | ||
response.setStatus(401); | ||
return false; | ||
} | ||
return true; | ||
} | ||
|
||
} |
This file contains hidden or 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,56 @@ | ||
package roomescape.auth; | ||
|
||
|
||
import jakarta.servlet.http.Cookie; | ||
import jakarta.servlet.http.HttpServletResponse; | ||
import org.springframework.http.HttpHeaders; | ||
import org.springframework.http.ResponseCookie; | ||
import org.springframework.http.ResponseEntity; | ||
import org.springframework.stereotype.Controller; | ||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.PostMapping; | ||
import org.springframework.web.bind.annotation.RequestBody; | ||
import roomescape.member.MemberResponse; | ||
import roomescape.token.TokenResponse; | ||
|
||
@Controller | ||
public class AuthController { | ||
|
||
private final AuthService authService; | ||
|
||
public AuthController(AuthService authService) { | ||
this.authService = authService; | ||
} | ||
|
||
@PostMapping("/logout") | ||
public ResponseEntity logout(HttpServletResponse response) { | ||
Cookie cookie = new Cookie("token", ""); | ||
cookie.setHttpOnly(true); | ||
cookie.setPath("/"); | ||
cookie.setMaxAge(0); | ||
response.addCookie(cookie); | ||
return ResponseEntity.ok().build(); | ||
} | ||
|
||
@GetMapping("/login/check") | ||
public ResponseEntity<MemberResponse> loginCheck(LoginMember loginMember) { | ||
if (loginMember == null) { | ||
return ResponseEntity.status(401).build(); | ||
} | ||
MemberResponse response = new MemberResponse(loginMember.getId(), loginMember.getName(), loginMember.getEmail()); | ||
return ResponseEntity.ok().body(response); | ||
} | ||
|
||
@PostMapping("/login") | ||
public ResponseEntity<Void> login(@RequestBody LoginRequest loginRequest) { | ||
TokenResponse token = authService.createToken(loginRequest.email(), loginRequest.password()); | ||
ResponseCookie cookie = ResponseCookie.from("token", token.getAccessToken()) | ||
.httpOnly(true) | ||
.path("/") | ||
.build(); | ||
|
||
return ResponseEntity.ok() | ||
.header(HttpHeaders.SET_COOKIE, cookie.toString()) | ||
.build(); | ||
} | ||
} |
This file contains hidden or 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,37 @@ | ||
package roomescape.auth; | ||
|
||
import org.springframework.stereotype.Service; | ||
import roomescape.member.Member; | ||
import roomescape.member.MemberDao; | ||
import roomescape.token.TokenParser; | ||
import roomescape.token.TokenProvider; | ||
import roomescape.token.TokenResponse; | ||
|
||
@Service | ||
public class AuthService { | ||
private final MemberDao memberDao; | ||
private final TokenProvider tokenProvider; | ||
private final TokenParser tokenParser; | ||
|
||
public AuthService(MemberDao memberDao, TokenProvider tokenProvider, TokenParser tokenParser) { | ||
this.memberDao = memberDao; | ||
this.tokenProvider = tokenProvider; | ||
this.tokenParser = tokenParser; | ||
} | ||
|
||
public TokenResponse createToken(String email, String password) { | ||
Member member = memberDao.findByEmailAndPassword(email, password); | ||
if (member == null) { | ||
throw new IllegalArgumentException("등록 되지 않은 사용자입니다."); | ||
} | ||
String token = tokenProvider.createAccessToken(member); | ||
return new TokenResponse(token); | ||
} | ||
|
||
public LoginMember parseMemberInfo(String token) { | ||
if (token == null || token.isBlank()) { | ||
throw new IllegalArgumentException("로그인 하지 않은 사용자입니다."); | ||
} | ||
return tokenParser.parseMemberInfo(token); | ||
} | ||
} |
This file contains hidden or 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,32 @@ | ||
package roomescape.auth; | ||
|
||
public class LoginMember { | ||
|
||
private Long id; | ||
private String name; | ||
private String email; | ||
private String role; | ||
|
||
public LoginMember(final Long id, final String name, final String email, final String role) { | ||
this.id = id; | ||
this.name = name; | ||
this.email = email; | ||
this.role = role; | ||
} | ||
|
||
public Long getId() { | ||
return id; | ||
} | ||
|
||
public String getName() { | ||
return name; | ||
} | ||
|
||
public String getEmail() { | ||
return email; | ||
} | ||
|
||
public String getRole() { | ||
return role; | ||
} | ||
} |
27 changes: 27 additions & 0 deletions
27
src/main/java/roomescape/auth/LoginMemberArgumentResolver.java
This file contains hidden or 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,27 @@ | ||
package roomescape.auth; | ||
|
||
import jakarta.servlet.http.HttpServletRequest; | ||
import org.springframework.core.MethodParameter; | ||
import org.springframework.stereotype.Component; | ||
import org.springframework.web.bind.support.WebDataBinderFactory; | ||
import org.springframework.web.context.request.NativeWebRequest; | ||
import org.springframework.web.method.support.HandlerMethodArgumentResolver; | ||
import org.springframework.web.method.support.ModelAndViewContainer; | ||
|
||
@Component | ||
public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolver { | ||
|
||
@Override | ||
public boolean supportsParameter(final MethodParameter parameter) { | ||
return parameter.getParameterType().equals(LoginMember.class); | ||
} | ||
|
||
@Override | ||
public Object resolveArgument(final MethodParameter parameter, final ModelAndViewContainer mavContainer, final NativeWebRequest webRequest, final WebDataBinderFactory binderFactory) throws Exception { | ||
HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest(); | ||
LoginMember loginMember = (LoginMember) request.getAttribute("loginMember"); | ||
return loginMember; | ||
} | ||
|
||
|
||
} |
This file contains hidden or 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,4 @@ | ||
package roomescape.auth; | ||
|
||
public record LoginRequest(String email, String password) { | ||
} |
This file contains hidden or 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 roomescape.auth; | ||
|
||
import jakarta.servlet.http.Cookie; | ||
import jakarta.servlet.http.HttpServletRequest; | ||
import jakarta.servlet.http.HttpServletResponse; | ||
import org.springframework.stereotype.Component; | ||
import org.springframework.web.servlet.HandlerInterceptor; | ||
|
||
import java.util.Arrays; | ||
|
||
@Component | ||
public class TokenInterceptor implements HandlerInterceptor { | ||
|
||
private final AuthService authService; | ||
|
||
public TokenInterceptor(AuthService authService) { | ||
this.authService = authService; | ||
} | ||
|
||
@Override | ||
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { | ||
Cookie[] cookies = request.getCookies(); | ||
|
||
if (cookies == null) { | ||
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); | ||
return false; | ||
} | ||
|
||
String token = Arrays.stream(cookies) | ||
.filter(cookie -> "token".equals(cookie.getName())) | ||
.map(Cookie::getValue) | ||
.findFirst() | ||
.orElse(null); | ||
|
||
LoginMember loginMember = authService.parseMemberInfo(token); | ||
request.setAttribute("loginMember", loginMember); | ||
return HandlerInterceptor.super.preHandle(request, response, handler); | ||
} | ||
} |
This file contains hidden or 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,49 @@ | ||
package roomescape.config; | ||
|
||
import org.springframework.context.annotation.Configuration; | ||
import org.springframework.web.method.support.HandlerMethodArgumentResolver; | ||
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; | ||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; | ||
import roomescape.auth.AdminRoleCheckInterceptor; | ||
import roomescape.auth.LoginMemberArgumentResolver; | ||
import roomescape.auth.TokenInterceptor; | ||
|
||
import java.util.List; | ||
|
||
@Configuration | ||
public class WebConfig implements WebMvcConfigurer { | ||
|
||
private final LoginMemberArgumentResolver loginMemberArgumentResolver; | ||
private final AdminRoleCheckInterceptor adminRoleCheckInterceptor; | ||
private final TokenInterceptor tokenInterceptor; | ||
|
||
public WebConfig(LoginMemberArgumentResolver loginMemberArgumentResolver, AdminRoleCheckInterceptor adminRoleCheckInterceptor, TokenInterceptor tokenInterceptor) { | ||
this.loginMemberArgumentResolver = loginMemberArgumentResolver; | ||
this.adminRoleCheckInterceptor = adminRoleCheckInterceptor; | ||
this.tokenInterceptor = tokenInterceptor; | ||
} | ||
|
||
@Override | ||
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) { | ||
resolvers.add(loginMemberArgumentResolver); | ||
} | ||
|
||
@Override | ||
public void addInterceptors(final InterceptorRegistry registry) { | ||
registry.addInterceptor(adminRoleCheckInterceptor) | ||
.addPathPatterns("/admin/**"); | ||
|
||
registry.addInterceptor(tokenInterceptor) | ||
.addPathPatterns("/**") | ||
.excludePathPatterns( | ||
"/", | ||
"/signup", | ||
"/signup/**", | ||
"/login", | ||
"/logout", | ||
"/error" | ||
); | ||
|
||
|
||
} | ||
} |
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
role은 enum인 것이 더 관리되기 쉽지 않을까요?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
네 User, Admin과 같이 허용 된 역할만 명시적으로 관리하고 잘못된 값이 들어가는 것을 방지하기 위해서 ENUM을 사용하는 것이 좋을 것 같습니다!