Skip to content
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

축제 마지막 배포 #248

Merged
merged 2 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ public class RedisConfig {
@Bean
public RedisConnectionFactory redisConnectionFactory() {

LettuceConnectionFactory lettuceConnectionFactory = new LettuceConnectionFactory(host, port);
log.info("RedisConfig.redisConnectionFactory() called" + lettuceConnectionFactory);
return lettuceConnectionFactory;
return new LettuceConnectionFactory(host, port);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ public enum Progress {
MAKE("MAKE", "음식 제조 중"),
COMPLETE("COMPLETE", "제조 완료"),
PICKUP("PICKUP", "픽업 완료"),
FAIL("FAIL", "주문 실패");
FAIL("FAIL", "주문 실패"),
INTEGRATION("INTEGRATION", "통합 주문");

private final String key;
private final String value;
}

Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
// RefreshToken까지 보낸 것이므로 리프레시 토큰이 DB의 리프레시 토큰과 일치하는지 판단 후,
// 일치한다면 AccessToken을 재발급해준다.
if (refreshToken != null) {
log.info("refreshToken이 존재합니다.");

checkRefreshTokenAndReIssueAccessToken(response, refreshToken);
return; // RefreshToken을 보낸 경우에는 AccessToken을 재발급 하고 인증 처리는 하지 않게 하기위해 바로 return으로 필터 진행 막기
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void sendAccessAndRefreshToken(HttpServletResponse response, String acces
jwtTokenizer.addAccessTokenCookie(response, accessToken);

jwtTokenizer.addRefreshTokenCookie(response, refreshToken);
log.info("Access Token, Refresh Token 헤더 설정 완료");

}

/**
Expand Down Expand Up @@ -104,7 +104,7 @@ public Optional<String> extractEmail(String accessToken) {

return jwtTokenizer.verifyAccessToken(accessToken);
} catch (Exception e) {
log.error("액세스 토큰이 유효하지 않습니다.");

return Optional.empty();
}
}
Expand All @@ -115,7 +115,7 @@ public boolean isTokenValid(String token) {
JWT.require(jwtConfig.getAlgorithm()).build().verify(token);
return true;
} catch (Exception e) {
log.error("유효하지 않은 토큰입니다. {}", e.getMessage());

return false;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public void onAuthenticationFailure(HttpServletRequest request, HttpServletRespo
ServletException {
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
response.getWriter().write("소셜 로그인 실패! 서버 로그를 확인해주세요.");
log.info("소셜 로그인에 실패했습니다. 에러 메시지 : {}", exception.getMessage());

}
}

Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ private String requestToServer(String headerStr, String postData) throws IOExcep
responseCode == 200 ? connectReq.getInputStream() : connectReq.getErrorStream()))) {
String inputLine;
StringBuilder response = new StringBuilder();
log.info("responseCode: {}", responseCode);

while ((inputLine = br.readLine()) != null) {
response.append(inputLine);
}
Expand Down
Loading