-
Notifications
You must be signed in to change notification settings - Fork 56
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
[Spring Data JPA] 한경준 미션 제출합니다. #53
Open
hkjbrian
wants to merge
22
commits into
next-step:hkjbrian
Choose a base branch
from
hkjbrian:step6
base: hkjbrian
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 17 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
22a3c65
step1 : 쿠키 생성, 응답에 쿠키 포함
10e758b
step1 : 인증 정보 조회 API 구현
96dcea9
step1 : 인증 정보 조회 API 구현
ec00aac
step1 : 예외처리 추가, 객체 이름 변경 , authservice 메서드 중 일부 private으로 변경
676db68
step1 : 예외처리 추가, 객체 이름 변경 , authservice 메서드 중 일부 private으로 변경
c2396a4
step2 : LoginMemberArgumentResolver 추가( @Authentication, @AuthWebConf…
b9837ba
step2 : ReseravtionController에 name이 들어오면 해당 name을 활용하도록 변경
4a649d6
step3 : 미션 추가
5ee087f
step3 : AdminInterceptor 추가
c14f2c2
Merge pull request #1 from hkjbrian/step3
hkjbrian b43760d
step4 : build.gradle 설정 변경, 학습 테스트 추가, getTime 메서드 추가, TimeRepository 생성
4d35bbf
step4 : JPA 관련 설정 추가
713484f
step4 : 엔티티 설정,Repository 생성, Dao 삭제
db11a85
step4 : Dao 활용 부분 Repository 활용으로 수정
8b4bbe4
step4 : requestToDao 추가, SQL 예약어 value -> timeValue 변경
d407a43
step5 : MyReservationsResponse 추가, 예약 조회 기능
20bab7a
step6 : 미션 추가, Waiting 패키지 추가
8c5ea3f
step6 : DB 설정 변경, sql 수정, TIME 메서드 삭제
03ee991
step6 : DB 설정 변경, sql 수정, TIME 메서드 삭제
8688c21
step6 : 예약 대기 생성, JpaRepository 상속하도록 수정
95977d6
step6 : 중복 예약 방지, 예약 목록 조회 구현
e2e05a3
step6 : 예약 대기 상태 확인, 삭제 기능 구현
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package roomescape.auth; | ||
|
||
import jakarta.servlet.http.HttpServletRequest; | ||
import jakarta.servlet.http.HttpServletResponse; | ||
import org.springframework.stereotype.Component; | ||
import org.springframework.web.servlet.HandlerInterceptor; | ||
import roomescape.member.Member; | ||
import roomescape.member.MemberRepository; | ||
import roomescape.member.MemberService; | ||
|
||
@Component | ||
public class AdminInterceptor implements HandlerInterceptor { | ||
private final MemberRepository memberRepository; | ||
private final MemberService memberService; | ||
|
||
public AdminInterceptor(MemberRepository memberRepository, MemberService memberService) { | ||
this.memberRepository = memberRepository; | ||
this.memberService = memberService; | ||
} | ||
|
||
@Override | ||
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { | ||
Long memberId = memberService.checkLogin(request).getId(); | ||
Member member = memberRepository.findById(memberId).get(); | ||
|
||
if (member == null || !member.getRole().equals("ADMIN")) { | ||
response.setStatus(401); | ||
return false; | ||
} | ||
|
||
return true; | ||
} | ||
} |
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,42 @@ | ||
package roomescape.auth; | ||
|
||
import jakarta.servlet.http.Cookie; | ||
import jakarta.servlet.http.HttpServletRequest; | ||
import jakarta.servlet.http.HttpServletResponse; | ||
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.LoginMember; | ||
import roomescape.member.MemberService; | ||
|
||
@Controller | ||
public class AuthController { | ||
MemberService memberService; | ||
|
||
public AuthController(MemberService memberService) { | ||
this.memberService = memberService; | ||
} | ||
|
||
@PostMapping("/login") | ||
public ResponseEntity<Void> tokenLogin(@RequestBody LoginRequest request, HttpServletResponse response) { | ||
|
||
String accessToken = memberService.loginByEmailAndPassword(request); | ||
|
||
Cookie cookie = new Cookie("token", accessToken); | ||
cookie.setHttpOnly(true); | ||
cookie.setPath("/"); | ||
response.addCookie(cookie); | ||
|
||
return ResponseEntity.ok().build(); | ||
} | ||
|
||
@GetMapping("/login/check") | ||
public ResponseEntity<LoginMember> loginCheck(HttpServletRequest request) { | ||
|
||
LoginMember loginMember = memberService.checkLogin(request); | ||
|
||
return ResponseEntity.ok().body(loginMember); | ||
} | ||
} |
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,35 @@ | ||
package roomescape.auth; | ||
|
||
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.member.MemberService; | ||
|
||
import java.util.List; | ||
|
||
@Configuration | ||
public class AuthWebConfiguration implements WebMvcConfigurer { | ||
|
||
private final LoginMemberArgumentResolver loginMemberArgumentResolver; | ||
private final AdminInterceptor adminInterceptor; | ||
|
||
public AuthWebConfiguration( | ||
LoginMemberArgumentResolver loginMemberArgumentResolver, | ||
AdminInterceptor adminInterceptor | ||
) { | ||
this.loginMemberArgumentResolver = loginMemberArgumentResolver; | ||
this.adminInterceptor = adminInterceptor; | ||
} | ||
|
||
@Override | ||
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) { | ||
resolvers.add(loginMemberArgumentResolver); | ||
} | ||
|
||
@Override | ||
public void addInterceptors(InterceptorRegistry registry) { | ||
registry.addInterceptor(adminInterceptor) | ||
.addPathPatterns("/admin"); | ||
} | ||
} |
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,11 @@ | ||
package roomescape.auth; | ||
|
||
import java.lang.annotation.ElementType; | ||
import java.lang.annotation.Retention; | ||
import java.lang.annotation.RetentionPolicy; | ||
import java.lang.annotation.Target; | ||
|
||
@Retention(RetentionPolicy.RUNTIME) | ||
@Target(ElementType.PARAMETER) | ||
public @interface Authentication { | ||
} |
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,30 @@ | ||
package roomescape.auth; | ||
|
||
import io.jsonwebtoken.Jwts; | ||
import io.jsonwebtoken.security.Keys; | ||
import jakarta.servlet.http.Cookie; | ||
import jakarta.servlet.http.HttpServletRequest; | ||
import org.springframework.stereotype.Component; | ||
|
||
@Component | ||
public class Extractor { | ||
|
||
public String extractToken(HttpServletRequest request) { | ||
Cookie[] cookies = request.getCookies(); | ||
|
||
for (Cookie cookie : cookies) { | ||
if (cookie.getName().equals("token")) { | ||
return cookie.getValue(); | ||
} | ||
} | ||
return ""; | ||
} | ||
|
||
public Long extractId(String token) { | ||
return Long.valueOf(Jwts.parserBuilder() | ||
.setSigningKey(Keys.hmacShaKeyFor("Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=".getBytes())) | ||
.build() | ||
.parseClaimsJws(token) | ||
.getBody().getSubject()); | ||
} | ||
} |
38 changes: 38 additions & 0 deletions
38
src/main/java/roomescape/auth/LoginMemberArgumentResolver.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,38 @@ | ||
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; | ||
import roomescape.member.LoginMember; | ||
import roomescape.member.MemberService; | ||
|
||
import java.lang.annotation.Annotation; | ||
|
||
@Component | ||
public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolver { | ||
private MemberService memberService; | ||
|
||
public LoginMemberArgumentResolver(MemberService memberService) { | ||
this.memberService = memberService; | ||
} | ||
|
||
@Override | ||
public boolean supportsParameter(MethodParameter parameter) { | ||
return parameter.hasParameterAnnotation(Annotation.class) | ||
&& parameter.getParameterType().equals(LoginMember.class); | ||
} | ||
|
||
@Override | ||
public Object resolveArgument(MethodParameter parameter, | ||
ModelAndViewContainer mavContainer, | ||
NativeWebRequest webRequest, | ||
WebDataBinderFactory binderFactory) throws Exception { | ||
|
||
HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest(); | ||
return memberService.checkLogin(request); | ||
} | ||
} |
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 roomescape.auth; | ||
|
||
public record LoginRequest( | ||
String email, | ||
String password | ||
) { | ||
} |
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,21 @@ | ||
package roomescape.auth; | ||
|
||
import io.jsonwebtoken.Jwts; | ||
import io.jsonwebtoken.security.Keys; | ||
import org.springframework.stereotype.Component; | ||
import roomescape.member.Member; | ||
|
||
@Component | ||
public class TokenProvider { | ||
private String secretKey = "Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E="; | ||
|
||
public String createToken(Member member) { | ||
String accessToken = Jwts.builder() | ||
.setSubject(member.getId().toString()) | ||
.claim("name", member.getName()) | ||
.claim("role", member.getRole()) | ||
.signWith(Keys.hmacShaKeyFor(secretKey.getBytes())) | ||
.compact(); | ||
return accessToken; | ||
} | ||
} |
8 changes: 6 additions & 2 deletions
8
...ava/roomescape/member/MemberResponse.java → ...n/java/roomescape/member/LoginMember.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
This file was deleted.
Oops, something went wrong.
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,15 @@ | ||
package roomescape.member; | ||
|
||
import org.jetbrains.annotations.NotNull; | ||
import org.springframework.data.repository.CrudRepository; | ||
|
||
import java.util.Optional; | ||
|
||
public interface MemberRepository extends CrudRepository<Member, Long> { | ||
|
||
@Override | ||
public Optional<Member> findById(Long id); | ||
|
||
public Member findByEmailAndPassword(String email, String password); | ||
|
||
} |
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.
공통리뷰에 나온 Optional을 적용하셨네요👍