deploy: 휴면 스케줄러, GitHub OAuth, 예외 처리 리팩토링, 테스트 코드 dev-deploy 반영

Dockerfile

@@ -10,6 +10,8 @@ RUN mvn clean package -DskipTests -B
 
 FROM eclipse-temurin:21-jre
 
+ENV TZ=Asia/Seoul
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends curl \
     && rm -rf /var/lib/apt/lists/*

pom.xml

@@ -126,12 +126,35 @@
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
 
+        <!--    openfeign    -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-circuitbreaker-resilience4j</artifactId>
+        </dependency>
+
         <!--    Prometheus    -->
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
 
+        <!--    redisson    -->
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>3.52.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-config-client</artifactId>

src/main/java/com/nhnacademy/insightonauth/InsightonAuthApplication.java

@@ -3,9 +3,13 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableDiscoveryClient
+@EnableFeignClients
+@EnableScheduling
 public class InsightonAuthApplication {
 
     public static void main(String[] args) {

src/main/java/com/nhnacademy/insightonauth/client/CoreClient.java

@@ -0,0 +1,13 @@
+package com.nhnacademy.insightonauth.client;
+
+import com.nhnacademy.insightonauth.dto.core.ManagerGroupExistsResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+@FeignClient(name = "insighton-core")
+public interface CoreClient {
+
+    @GetMapping("/internal/v1/users/{userId}/manager-groups/exists")
+    ManagerGroupExistsResponse existsManagerGroup(@PathVariable Long userId);
+}

src/main/java/com/nhnacademy/insightonauth/client/OauthClient.java

@@ -1,65 +1,8 @@
 package com.nhnacademy.insightonauth.client;
 
 import com.nhnacademy.insightonauth.dto.oauth.OauthUserInfo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestClient;
 
-import java.util.Map;
+public interface OauthClient {
 
-@Component
-@RequiredArgsConstructor
-public class OauthClient {
-
-    @Value("${oauth.google.client-id}")
-    private String clientId;
-
-    @Value("${oauth.google.client-secret}")
-    private String clientSecret;
-
-    @Value("${oauth.google.redirect-uri}")
-    private String redirectUri;
-
-    private final RestClient restClient = RestClient.create();
-
-    public OauthUserInfo getUserInfo(String provider, String code) {
-        String accessToken = requestAccessToken(code);
-        return requestUserInfo(accessToken);
-    }
-
-    private String requestAccessToken(String code) {
-        MultiValueMap<String, String> body = new LinkedMultiValueMap<>();
-        body.add("code", code);
-        body.add("client_id", clientId);
-        body.add("client_secret", clientSecret);
-        body.add("redirect_uri", redirectUri);
-        body.add("grant_type", "authorization_code");
-
-        Map<String, Object> response = restClient.post()
-                .uri("https://oauth2.googleapis.com/token")
-                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                .body(body)
-                .retrieve()
-                .body(Map.class);
-
-        return (String) response.get("access_token");
-    }
-
-    private OauthUserInfo requestUserInfo(String accessToken) {
-        Map<String, Object> userInfo = restClient.get()
-                .uri("https://www.googleapis.com/oauth2/v3/userinfo")
-                .header("Authorization", "Bearer " + accessToken)
-                .retrieve()
-                .body(Map.class);
-
-        return new OauthUserInfo(
-                (String) userInfo.get("email"),
-                (String) userInfo.get("name"),
-                (String) userInfo.get("sub")
-        );
-    }
+    OauthUserInfo getUserInfo(String code);
 }

src/main/java/com/nhnacademy/insightonauth/client/OauthClientResolver.java

@@ -0,0 +1,22 @@
+package com.nhnacademy.insightonauth.client;
+
+import com.nhnacademy.insightonauth.exception.UnsupportedOAuthProviderException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
+@RequiredArgsConstructor
+public class OauthClientResolver {
+    // 스프링이 bean 객체를 가져다줌
+    private final Map<String, OauthClient> clients;
+
+    public OauthClient resolve(String provider) {
+        OauthClient client = clients.get(provider + "OauthClient");
+        if (client == null) {
+            throw new UnsupportedOAuthProviderException(provider);
+        }
+        return client;
+    }
+}

src/main/java/com/nhnacademy/insightonauth/client/impl/GithubOauthClient.java

@@ -0,0 +1,103 @@
+package com.nhnacademy.insightonauth.client.impl;
+
+import com.nhnacademy.insightonauth.client.OauthClient;
+import com.nhnacademy.insightonauth.dto.oauth.OauthUserInfo;
+import com.nhnacademy.insightonauth.exception.EmailNotFoundException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
+import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestClient;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+
+@Component("githubOauthClient")
+@RequiredArgsConstructor
+public class GithubOauthClient implements OauthClient {
+
+    @Value("${oauth.github.client-id}")
+    private String clientId;
+
+    @Value("${oauth.github.client-secret}")
+    private String clientSecret;
+
+    @Value("${oauth.redirect-uri}")
+    private String redirectUri;
+
+    private final RestClient restClient = RestClient.builder()
+            .requestFactory(ClientHttpRequestFactoryBuilder.detect()
+                    .build(ClientHttpRequestFactorySettings.defaults()
+                            .withConnectTimeout(Duration.ofSeconds(3))
+                            .withReadTimeout(Duration.ofSeconds(5))))
+            .build();
+
+    @Override
+    public OauthUserInfo getUserInfo(String code) {
+        String accessToken = requestAccessToken(code);
+        return requestUserInfo(accessToken);
+    }
+
+    private String requestAccessToken(String code) {
+        MultiValueMap<String, String> body = new LinkedMultiValueMap<>();
+        body.add("code", code);
+        body.add("client_id", clientId);
+        body.add("client_secret", clientSecret);
+        body.add("redirect_uri", redirectUri);
+
+        Map<String, Object> response = restClient.post()
+                .uri("https://github.com/login/oauth/access_token")   // GitHub URL로 수정
+                .header("Accept", "application/json")                  // JSON 응답 요청 (필수)
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                .body(body)
+                .retrieve()
+                .body(Map.class);
+
+        return (String) response.get("access_token");
+    }
+
+    private OauthUserInfo requestUserInfo(String accessToken) {
+        Map<String, Object> userInfo = restClient.get()
+                .uri("https://api.github.com/user")   // GitHub URL로 수정
+                .header("Authorization", "Bearer " + accessToken)
+                .retrieve()
+                .body(Map.class);
+
+        String email = requestPrimaryEmail(accessToken);
+
+        String name = (String) userInfo.get("name");
+        if (name == null || name.isBlank()) {
+            name = (String) userInfo.get("login");   // name이 없으면 login(아이디)으로 대체
+        }
+
+        Object id = userInfo.get("id");   // GitHub은 sub가 아니라 id (숫자)
+
+        return new OauthUserInfo(
+                email,
+                name,
+                String.valueOf(id)
+        );
+    }
+
+    // 이메일 열람 불가의 경우 api를 통해서 가져와야함
+    private String requestPrimaryEmail(String accessToken) {
+        List<Map<String, Object>> emails = restClient.get()
+                .uri("https://api.github.com/user/emails")
+                .header("Authorization", "Bearer " + accessToken)
+                .retrieve()
+                .body(List.class);
+
+        // primary git에서 대표로 지정된 이메일 가져옴, verified 그 중에 인증된거 가져옴
+        return emails.stream()
+                .filter(e ->
+                        Boolean.TRUE.equals(e.get("primary")) && Boolean.TRUE.equals(e.get("verified")))
+                .map(e -> (String) e.get("email"))
+                .findFirst()
+                .orElseThrow(() -> new EmailNotFoundException("GitHub 계정에서 이메일을 찾을 수 없습니다."));
+    }
+}

src/main/java/com/nhnacademy/insightonauth/client/impl/GoogleOauthClient.java

@@ -0,0 +1,76 @@
+package com.nhnacademy.insightonauth.client.impl;
+
+import com.nhnacademy.insightonauth.client.OauthClient;
+import com.nhnacademy.insightonauth.dto.oauth.OauthUserInfo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
+import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestClient;
+
+import java.time.Duration;
+import java.util.Map;
+
+@Component("googleOauthClient")
+@RequiredArgsConstructor
+public class GoogleOauthClient implements OauthClient {
+
+    @Value("${oauth.google.client-id}")
+    private String clientId;
+
+    @Value("${oauth.google.client-secret}")
+    private String clientSecret;
+
+    @Value("${oauth.redirect-uri}")
+    private String redirectUri;
+
+    private final RestClient restClient =  RestClient.builder()
+            .requestFactory(ClientHttpRequestFactoryBuilder.detect()
+                    .build(ClientHttpRequestFactorySettings.defaults()
+                            .withConnectTimeout(Duration.ofSeconds(3))
+                            .withReadTimeout(Duration.ofSeconds(5))))
+            .build();
+
+    @Override
+    public OauthUserInfo getUserInfo(String code) {
+        String accessToken = requestAccessToken(code);
+        return requestUserInfo(accessToken);
+    }
+
+    private String requestAccessToken(String code) {
+//        FormHttpMessageConverter
+        MultiValueMap<String, String> body = new LinkedMultiValueMap<>();
+        body.add("code", code);
+        body.add("client_id", clientId);
+        body.add("client_secret", clientSecret);
+        body.add("redirect_uri", redirectUri);
+        body.add("grant_type", "authorization_code");
+
+        Map<String, Object> response = restClient.post()
+                .uri("https://oauth2.googleapis.com/token")
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                .body(body)
+                .retrieve()
+                .body(Map.class);
+
+        return (String) response.get("access_token");
+    }
+
+    private OauthUserInfo requestUserInfo(String accessToken) {
+        Map<String, Object> userInfo = restClient.get()
+                .uri("https://www.googleapis.com/oauth2/v3/userinfo")
+                .header("Authorization", "Bearer " + accessToken)
+                .retrieve()
+                .body(Map.class);
+
+        return new OauthUserInfo(
+                (String) userInfo.get("email"),
+                (String) userInfo.get("name"),
+                (String) userInfo.get("sub")
+        );
+    }
+}