🚀 [Depoly] OAUTH 배포

.gitignore

@@ -37,7 +37,6 @@ out/
 .vscode/
 
 ### oauth config ###
-src/main/resources/application-oauth.yml
 src/test/resources/application-oauth.yml
 
 ### environment ###

build.gradle

@@ -67,6 +67,9 @@ dependencies {
     //actuator
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-registry-prometheus'
+
+    //Apache HttpClient 버전 문제 해결
+    implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2'
 }
 
 def generated = 'src/main/generated'

src/main/java/kcs/funding/fundingboost/domain/entity/GiftHubItem.java

@@ -22,12 +22,12 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Table(name = "giftHub_item")
+@Table(name = "gift_hub_item")
 public class GiftHubItem extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = IDENTITY)
-    @Column(name = "giftHub_item_id")
+    @Column(name = "gift_hub_item_id")
     private Long giftHubItemId;
 
     @ColumnDefault("1")

src/main/java/kcs/funding/fundingboost/domain/entity/Item.java

@@ -8,7 +8,6 @@
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-import kcs.funding.fundingboost.domain.entity.common.BaseTimeEntity;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -17,7 +16,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "item")
-public class Item extends BaseTimeEntity {
+public class Item {
     @Id
     @Column(name = "item_id")
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/kcs/funding/fundingboost/domain/security/service/KaKaoLoginService.java

@@ -25,7 +25,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.JdkClientHttpRequestFactory;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
@@ -55,22 +56,30 @@ public class KaKaoLoginService {
      * 카카오 서버에서 인증 토큰을 받아오는 메소드
      */
     public String getAccessTokenFromKakao(String clientId, String code) throws IOException {
+        // 프록시 설정
+        org.apache.hc.core5.http.HttpHost proxy = new org.apache.hc.core5.http.HttpHost(
+                "http", "krmp-proxy.9rum.cc", 3128);
+        org.apache.hc.client5.http.impl.classic.HttpClientBuilder clientBuilder = org.apache.hc.client5.http.impl.classic.HttpClientBuilder.create();
+        clientBuilder.setProxy(proxy);
+        org.apache.hc.client5.http.classic.HttpClient httpClient = clientBuilder.build();
+        ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
+
         // KAKAO 서버에 인증 토큰 발급 요청
         RestClient restClient = RestClient.builder()
-                .requestFactory(new JdkClientHttpRequestFactory())
+                .requestFactory(requestFactory)
                 .messageConverters(convert -> convert.add(new AllEncompassingFormHttpMessageConverter()))
                 .baseUrl("https://kauth.kakao.com/oauth/token")
                 .build();
 
-        //토큰 요청에 들어갈 body
+        // 토큰 요청에 들어갈 body
         MultiValueMap<String, String> objectMaping = new LinkedMultiValueMap<>();
         objectMaping.add("grant_type", "authorization_code");
         objectMaping.add("client_id", clientId);
         objectMaping.add("redirect_uri", redirectUri);
         objectMaping.add("code", code);
         objectMaping.add("client_secret", clientSecret);
 
-        //카카오 서버로 post 토큰요청
+        // 카카오 서버로 post 토큰요청
         ResponseEntity<KakaoOAuthToken> response = restClient.post()
                 .body(objectMaping)
                 .contentType(APPLICATION_FORM_URLENCODED)
@@ -80,21 +89,28 @@ public String getAccessTokenFromKakao(String clientId, String code) throws IOExc
         if (response.getBody() == null) {
             throw new OAuth2AuthenticationException("Invalid authorization code");
         }
-        //토큰 발췌
+        // 토큰 발췌
         String accessToken = response.getBody().access_token();
         String refreshToken = response.getBody().refresh_token();
 
         return accessToken;
-
     }
 
     /**
      * 토큰으로 사용자 정보 요청 후 인증, access token 및 refresh token 발행
      */
     public JwtDto getJwtDto(String accessToken) throws IOException {
+        // 프록시 설정
+        org.apache.hc.core5.http.HttpHost proxy = new org.apache.hc.core5.http.HttpHost(
+                "http", "krmp-proxy.9rum.cc", 3128);
+        org.apache.hc.client5.http.impl.classic.HttpClientBuilder clientBuilder = org.apache.hc.client5.http.impl.classic.HttpClientBuilder.create();
+        clientBuilder.setProxy(proxy);
+        org.apache.hc.client5.http.classic.HttpClient httpClient = clientBuilder.build();
+        ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
+
         // kakao 서버에 access token으로 사용자 정보 요청
         RestClient restClient = RestClient.builder()
-                .requestFactory(new JdkClientHttpRequestFactory())
+                .requestFactory(requestFactory)
                 .messageConverters(convert -> convert.add(new AllEncompassingFormHttpMessageConverter()))
                 .baseUrl("https://kapi.kakao.com/v2/user/me")
                 .build();
@@ -126,20 +142,21 @@ public JwtDto getJwtDto(String accessToken) throws IOException {
      * 개인정보 저장 및 친구목록 업데이트
      */
     private CustomUserDetails processLoginAndRelationships(KakaoOAuth2User kakaoOAuth2User, String accessToken) {
-        String provider = "kakao";
-        String providerId = kakaoOAuth2User.getId();
+//        String provider = "kakao";
+//        String providerId = kakaoOAuth2User.getId();
+//        String password = passwordEncoder.encode(providerId + "_" + providerId);
         String username = kakaoOAuth2User.getName();
-        String password = passwordEncoder.encode(provider + "_" + providerId);
+        String password = passwordEncoder.encode("string");
         String email = kakaoOAuth2User.getEmail();
         String profileImgUrl = kakaoOAuth2User.getImageUrl();
-        String uuid = kakaoOAuth2User.getAttribute("id").toString();
+        String kakao_id = "kakao_" + kakaoOAuth2User.getAttribute("id").toString();
 
         Member findMember = memberRepository.findByEmail(email).orElse(null);
         String friendsList = getFriendsListByKakao(accessToken);
 
         CustomUserDetails customUserDetails;
         if (findMember == null) {
-            Member createMember = Member.createMember(username, email, password, profileImgUrl, uuid);
+            Member createMember = Member.createMember(username, email, password, profileImgUrl, kakao_id);
             customUserDetails = new CustomUserDetails(kakaoOAuth2User.getAttributes(), createMember);
             memberRepository.save(createMember);
             processFirstRelationships(friendsList, createMember);
@@ -220,8 +237,16 @@ private void processFirstRelationships(String friendsList, Member member) {
      * 카카오로부터 친구목록 가져오기
      */
     private static String getFriendsListByKakao(String accessToken) {
+        // 프록시 설정
+        org.apache.hc.core5.http.HttpHost proxy = new org.apache.hc.core5.http.HttpHost(
+                "http", "krmp-proxy.9rum.cc", 3128);
+        org.apache.hc.client5.http.impl.classic.HttpClientBuilder clientBuilder = org.apache.hc.client5.http.impl.classic.HttpClientBuilder.create();
+        clientBuilder.setProxy(proxy);
+        org.apache.hc.client5.http.classic.HttpClient httpClient = clientBuilder.build();
+        ClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
+
         RestClient restClient = RestClient.builder()
-                .requestFactory(new JdkClientHttpRequestFactory())
+                .requestFactory(requestFactory)
                 .messageConverters(converter -> converter.add(new AllEncompassingFormHttpMessageConverter()))
                 .baseUrl("https://kapi.kakao.com/v1/api/talk/friends")
                 .build();