Skip to content

Commit

Permalink
Merge pull request #138 from HandTris/#136
Browse files Browse the repository at this point in the history
ํ† ํฐ ์žฌ๋ฐœ๊ธ‰์‹œ username ์‚ญ์ œ๋กœ ์ธํ•œ ๊ด€๋ จ ์ฝ”๋“œ ๋ณ€๊ฒฝ
  • Loading branch information
thun0514 authored Jul 16, 2024
2 parents 23147a9 + 9693790 commit fa6edc8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import jungle.HandTris.application.service.ReissueService;
import jungle.HandTris.domain.Member;
import jungle.HandTris.domain.exception.InvalidTokenFormatException;
import jungle.HandTris.domain.exception.MemberNotFoundException;
import jungle.HandTris.domain.exception.RefreshTokenExpiredException;
import jungle.HandTris.domain.exception.UnauthorizedAccessException;
import jungle.HandTris.domain.repo.MemberRepository;
Expand All @@ -19,7 +20,7 @@ public class ReissueServiceImpl implements ReissueService {
private final JWTUtil jwtUtil;
private final MemberRepository memberRepository;

public ReissueTokenRes reissue (HttpServletRequest request, String requestUsername) {
public ReissueTokenRes reissue (HttpServletRequest request) {
String refreshToken = jwtUtil.resolveRefreshToken(request);

//ํ† ํฐ ์†Œ๋ฉธ ์‹œ๊ฐ„ ๊ฒ€์ฆ
Expand All @@ -34,7 +35,8 @@ public ReissueTokenRes reissue (HttpServletRequest request, String requestUserna
}

String nickname = jwtUtil.getNickname(refreshToken);
Member member = memberRepository.findByUsername(requestUsername);
Member member = memberRepository.findByNickname(nickname).
orElseThrow(MemberNotFoundException::new);

if(!member.getRefreshToken().equals(refreshToken)) {
throw new UnauthorizedAccessException();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
import jungle.HandTris.presentation.dto.response.ReissueTokenRes;

public interface ReissueService {
ReissueTokenRes reissue (HttpServletRequest request, String requestUsername);
ReissueTokenRes reissue (HttpServletRequest request);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

import jungle.HandTris.application.service.CustomOAuth2MemberService;
import jungle.HandTris.global.filter.JWTFilter;
import jungle.HandTris.global.handler.JWTAccessDeniedHandler;
import jungle.HandTris.global.handler.JWTAuthenticateDeniedHandler;
import jungle.HandTris.global.handler.OAuth2FailureHandler;
import jungle.HandTris.global.handler.OAuth2SuccessHandler;
import jungle.HandTris.global.handler.*;
import jungle.HandTris.global.jwt.JWTUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -47,7 +44,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
.httpBasic((auth) -> auth.disable()
)
.authorizeHttpRequests((auth) -> auth
.requestMatchers("/", "/auth/signin", "/auth/signup", "/reissue/**", "/oauth2/loginSuccess", "ws/**").permitAll()
.requestMatchers("/", "/auth/signin", "/auth/signup",
"/reissue", "/oauth2/loginSuccess", "ws/**", "/actuator/prometheus").permitAll()
.anyRequest().authenticated()
)
.cors(Customizer.withDefaults()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ public class ReissueController {

private final ReissueService reissueService;

@PostMapping("/reissue/{username}")
public ResponseEnvelope<ReissueTokenRes> reissue (HttpServletRequest request, @PathVariable("username") String requestUsername) {
ReissueTokenRes token = reissueService.reissue(request, requestUsername);
@PostMapping("/reissue")
public ResponseEnvelope<ReissueTokenRes> reissue (HttpServletRequest request) {
ReissueTokenRes token = reissueService.reissue(request);

return ResponseEnvelope.of(token);
}
Expand Down

0 comments on commit fa6edc8

Please sign in to comment.