diff --git a/src/main/java/sevenstar/marineleisure/member/service/OauthService.java b/src/main/java/sevenstar/marineleisure/member/service/OauthService.java index 82dfe80c..031d8104 100644 --- a/src/main/java/sevenstar/marineleisure/member/service/OauthService.java +++ b/src/main/java/sevenstar/marineleisure/member/service/OauthService.java @@ -18,12 +18,11 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import ch.qos.logback.core.joran.action.ParamAction; import jakarta.servlet.http.HttpServletRequest; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import sevenstar.marineleisure.global.util.PkceUtil; +import sevenstar.marineleisure.global.enums.MemberStatus; import sevenstar.marineleisure.global.util.StateEncryptionUtil; import sevenstar.marineleisure.member.domain.Member; import sevenstar.marineleisure.member.dto.KakaoTokenResponse; @@ -37,7 +36,6 @@ public class OauthService { private final MemberRepository memberRepository; private final WebClient webClient; private final StateEncryptionUtil stateEncryptionUtil; - private final PkceUtil pkceUtil; @Value("${kakao.login.api_key}") private String apiKey; @@ -45,6 +43,9 @@ public class OauthService { @Value("${kakao.login.client_secret}") private String clientSecret; + @Value("${kakao.login.admin_key}") + private String adminKey; + @Value("${kakao.login.uri.base}") private String kakaoBaseUri; @@ -206,6 +207,7 @@ private Member saveOrUpdateKakaoUser(Map memberAttributes) { .longitude(BigDecimal.ZERO) .build()); member.updateNickname(nickname); + member.updateStatus(MemberStatus.ACTIVE); // 재가입 시 상태를 ACTIVE로 변경 return memberRepository.save(member); } @@ -234,7 +236,7 @@ public Long unlinkKakaoAccount(String providerId) { Map response = webClient.post() .uri(unlinkUrl) - .header("Authorization", "KakaoAK " + clientSecret) + .header("Authorization", "KakaoAK " + adminKey) .header("Content-Type", "application/x-www-form-urlencoded;charset=utf-8") .body(BodyInserters.fromFormData(params)) .retrieve() diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 128dc48d..bab7bc62 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -61,6 +61,7 @@ kakao: login: api_key: ${KAKAO_API_KEY} client_secret: ${KAKAO_CLIENT_SECRET} + admin_key: ${KAKAO_ADMIN_KEY} redirect_uri: ${KAKAO_REDIRECT_URI} uri: @@ -70,6 +71,6 @@ kakao: uri: https://dapi.kakao.com/v2/local/geo/coord2regioncode jwt: secret: ${JWT_SECRET} - access-token-validity-in-seconds: 300 + access-token-validity-in-seconds: 3600 refresh-token-validity-in-seconds: 86400 # 24시간 use-cookie: false # 개발 환경에서. 클라이언트 개발 완료 후 쿠키 사용 방식으로 변경. \ No newline at end of file