feat: #11 google, apple config 및 Public Key API 추가

KCY-Fit-a-Pet · Dec 27, 2023 · 7b2ef3f · 7b2ef3f
1 parent ec351b4
commit 7b2ef3f
Show file tree

Hide file tree

Showing 13 changed files with 161 additions and 28 deletions.
diff --git a/src/main/java/com/kcy/fitapet/domain/oauth/service/component/OauthService.java b/src/main/java/com/kcy/fitapet/domain/oauth/service/component/OauthService.java
@@ -29,6 +29,7 @@
 import com.kcy.fitapet.global.common.security.oauth.OauthOIDCHelper;
 import com.kcy.fitapet.global.common.security.oauth.dto.OIDCDecodePayload;
 import com.kcy.fitapet.global.common.security.oauth.dto.OIDCPublicKeyResponse;
+import com.kcy.fitapet.global.common.security.oauth.kakao.KakaoOauthClient;
 import com.kcy.fitapet.global.common.util.sms.SmsProvider;
 import com.kcy.fitapet.global.common.util.sms.dto.SensInfo;
 import com.kcy.fitapet.global.common.util.sms.dto.SmsRes;
@@ -141,7 +142,7 @@ private OIDCDecodePayload getPayload(ProviderType provider, String idToken, Stri
         OIDCPublicKeyResponse oidcPublicKeyResponse = oauthClient.getOIDCPublicKey();
 
         return oauthOIDCHelper.getPayloadFromIdToken(
-                idToken, oauthApplicationConfig.getAuthorizationUri(),
+                idToken, oauthApplicationConfig.getJwksUri(),
                 oauthApplicationConfig.getClientSecret(), nonce, oidcPublicKeyResponse);
     }
 

diff --git a/src/main/java/com/kcy/fitapet/global/common/security/oauth/OauthApplicationConfig.java b/src/main/java/com/kcy/fitapet/global/common/security/oauth/OauthApplicationConfig.java
@@ -3,9 +3,8 @@
 import java.util.List;
 
 public interface OauthApplicationConfig {
-    String getAuthorizationUri();
+    String getJwksUri();
     String getClientId();
     String getClientSecret();
     String getClientName();
-    List<String> getScopes();
 }
diff --git a/src/main/java/com/kcy/fitapet/global/common/security/oauth/OauthOIDCProviderImpl.java b/src/main/java/com/kcy/fitapet/global/common/security/oauth/OauthOIDCProviderImpl.java
@@ -30,7 +30,6 @@ public String getKidFromUnsignedTokenHeader(String token, String iss, String aud
     @Override
     public OIDCDecodePayload getOIDCTokenBody(String token, String modulus, String exponent) {
         Claims body = getOIDCTokenJws(token, modulus, exponent).getBody();
-        log.info("body : {}", body);
 
         return new OIDCDecodePayload(
                 body.getIssuer(),

diff --git a/src/main/java/com/kcy/fitapet/global/common/security/oauth/apple/AppleApplicationConfig.java b/src/main/java/com/kcy/fitapet/global/common/security/oauth/apple/AppleApplicationConfig.java
@@ -0,0 +1,27 @@
+package com.kcy.fitapet.global.common.security.oauth.apple;
+
+import com.kcy.fitapet.global.common.security.oauth.OauthApplicationConfig;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.annotation.Validated;
+
+@Getter
+@Setter
+@Validated
+@Component
+@ConfigurationProperties(prefix = "oauth2.client.provider.apple")
+@ConfigurationPropertiesBinding
+public class AppleApplicationConfig implements OauthApplicationConfig {
+    @NotEmpty
+    private String jwksUri;
+    @NotEmpty
+    private String clientId;
+    @NotEmpty
+    private String clientSecret;
+    @NotEmpty
+    private String clientName;
+}
diff --git a/src/main/java/com/kcy/fitapet/global/common/security/oauth/apple/AppleOauthClient.java b/src/main/java/com/kcy/fitapet/global/common/security/oauth/apple/AppleOauthClient.java
@@ -0,0 +1,20 @@
+package com.kcy.fitapet.global.common.security.oauth.apple;
+
+import com.kcy.fitapet.global.common.security.oauth.OauthClient;
+import com.kcy.fitapet.global.common.security.oauth.dto.OIDCPublicKeyResponse;
+import com.kcy.fitapet.global.config.feign.AppleOauthConfig;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(
+        name = "AppleOauthClient",
+        url = "${oauth2.client.provider.apple.jwks-uri}",
+        configuration = AppleOauthConfig.class
+)
+public interface AppleOauthClient extends OauthClient {
+    @Override
+    @Cacheable(value = "AppleOauth", cacheManager = "oidcCacheManger")
+    @GetMapping("/auth/keys")
+    OIDCPublicKeyResponse getOIDCPublicKey();
+}
diff --git a/...ain/java/com/kcy/fitapet/global/common/security/oauth/google/GoogleApplicationConfig.java b/...ain/java/com/kcy/fitapet/global/common/security/oauth/google/GoogleApplicationConfig.java
@@ -0,0 +1,27 @@
+package com.kcy.fitapet.global.common.security.oauth.google;
+
+import com.kcy.fitapet.global.common.security.oauth.OauthApplicationConfig;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.annotation.Validated;
+
+@Getter
+@Setter
+@Validated
+@Component
+@ConfigurationProperties(prefix = "oauth2.client.provider.google")
+@ConfigurationPropertiesBinding
+public class GoogleApplicationConfig implements OauthApplicationConfig {
+    @NotEmpty
+    private String jwksUri;
+    @NotEmpty
+    private String clientId;
+    @NotEmpty
+    private String clientSecret;
+    @NotEmpty
+    private String clientName;
+}
diff --git a/src/main/java/com/kcy/fitapet/global/common/security/oauth/google/GoogleOauthClient.java b/src/main/java/com/kcy/fitapet/global/common/security/oauth/google/GoogleOauthClient.java
@@ -0,0 +1,20 @@
+package com.kcy.fitapet.global.common.security.oauth.google;
+
+import com.kcy.fitapet.global.common.security.oauth.OauthClient;
+import com.kcy.fitapet.global.common.security.oauth.dto.OIDCPublicKeyResponse;
+import com.kcy.fitapet.global.config.feign.GoogleOauthConfig;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(
+        name = "GoogleOauthClient",
+        url = "${oauth2.client.provider.google.jwks-uri}",
+        configuration = GoogleOauthConfig.class
+)
+public interface GoogleOauthClient extends OauthClient {
+    @Override
+    @Cacheable(value = "GoogleOauth", cacheManager = "oidcCacheManger")
+    @GetMapping("/oauth2/v3/certs")
+    OIDCPublicKeyResponse getOIDCPublicKey();
+}
diff --git a/src/main/java/com/kcy/fitapet/global/common/security/oauth/kakao/KakaoApplicationConfig.java b/src/main/java/com/kcy/fitapet/global/common/security/oauth/kakao/KakaoApplicationConfig.java
@@ -3,6 +3,7 @@
 import com.kcy.fitapet.global.common.security.oauth.OauthApplicationConfig;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
@@ -19,12 +20,11 @@
 @ConfigurationPropertiesBinding
 public class KakaoApplicationConfig implements OauthApplicationConfig {
     @NotEmpty
-    private String authorizationUri;
+    private String jwksUri;
     @NotEmpty
     private String clientId;
     @NotEmpty
     private String clientSecret;
     @NotEmpty
     private String clientName;
-    private List<String> scopes;
 }
diff --git a/src/main/java/com/kcy/fitapet/global/common/security/oauth/kakao/KakaoOauthClient.java b/src/main/java/com/kcy/fitapet/global/common/security/oauth/kakao/KakaoOauthClient.java
@@ -9,7 +9,7 @@
 
 @FeignClient(
         name = "KakaoOauthClient",
-        url = "${oauth2.client.provider.kakao.authorization-uri}",
+        url = "${oauth2.client.provider.kakao.jwks-uri}",
         configuration = KakaoOauthConfig.class
 )
 public interface KakaoOauthClient extends OauthClient {

diff --git a/src/main/java/com/kcy/fitapet/global/config/feign/AppleOauthConfig.java b/src/main/java/com/kcy/fitapet/global/config/feign/AppleOauthConfig.java
@@ -0,0 +1,12 @@
+package com.kcy.fitapet.global.config.feign;
+
+import feign.codec.Encoder;
+import feign.form.FormEncoder;
+import org.springframework.context.annotation.Bean;
+
+public class AppleOauthConfig {
+    @Bean
+    Encoder formEncoder() {
+        return new FormEncoder();
+    }
+}
diff --git a/src/main/java/com/kcy/fitapet/global/config/feign/GoogleOauthConfig.java b/src/main/java/com/kcy/fitapet/global/config/feign/GoogleOauthConfig.java
@@ -0,0 +1,12 @@
+package com.kcy.fitapet.global.config.feign;
+
+import feign.codec.Encoder;
+import feign.form.FormEncoder;
+import org.springframework.context.annotation.Bean;
+
+public class GoogleOauthConfig {
+    @Bean
+    Encoder formEncoder() {
+        return new FormEncoder();
+    }
+}
diff --git a/src/main/java/com/kcy/fitapet/global/config/feign/KakaoOauthConfig.java b/src/main/java/com/kcy/fitapet/global/config/feign/KakaoOauthConfig.java
@@ -7,10 +7,10 @@
 import org.springframework.context.annotation.Bean;
 
 public class KakaoOauthConfig {
-//    @Bean
-//    public OkHttpClient client() {
-//        return new OkHttpClient();
-//    }
+    @Bean
+    public OkHttpClient client() {
+        return new OkHttpClient();
+    }
 
     @Bean
     Encoder formEncoder() {

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -38,30 +38,35 @@ spring:
     resources:
       add-mappings: false
 
+  cloud:
+    openfeign:
+      okhttp:
+        enabled: true
+      client:
+        config:
+          default:
+            connectTimeout: 5000
+            readTimeout: 10000
+            loggerLevel: full
+
 oauth2:
   client:
     provider:
       kakao:
-        authorization-uri: ${KAKAO_AUTH_URI}
+        jwks-uri: ${KAKAO_JWKS_URI}
         client-id: ${KAKAO_CLIENT_ID}
         client-secret: ${KAKAO_CLIENT_SECRET}
         client-name: Kakao
-        scope:
-          - profile_nickname
-          - profile_image
-          - account_email
-
-feign:
-  okhttp:
-    enabled: true
-  client:
-    config:
-        default:
-            connectTimeout: 5000
-            readTimeout: 10000
-            loggerLevel: full
-  httpclient:
-    max-connections: 1000
+      google:
+        jwks-uri: ${GOOGLE_JWKS_URI}
+        client-id: "client-id"
+        client-secret: "client-secret"
+        client-name: Google
+      apple:
+        jwks-uri: ${APPLE_JWKS_URI}
+        client-id: "client-id"
+        client-secret: "client-secret"
+        client-name: Apple
 
 springdoc:
   default-consumes-media-type: application/json;charset=UTF-8
@@ -137,6 +142,17 @@ spring:
     resources:
       add-mappings: false
 
+  cloud:
+    openfeign:
+      okhttp:
+        enabled: true
+      client:
+        config:
+          default:
+            connectTimeout: 5000
+            readTimeout: 10000
+            loggerLevel: full
+
 springdoc:
   default-consumes-media-type: application/json;charset=UTF-8
   default-produces-media-type: application/json;charset=UTF-8