fix: apple client_secret yml에서 읽게 수정

Central-MakeUs · Feb 12, 2024 · f48d400 · f48d400
1 parent 8acc209
commit f48d400
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java b/core/core-security/src/main/java/com/mm/coresecurity/config/WebSecurityConfig.java
@@ -36,11 +36,12 @@ public class WebSecurityConfig {
     private final OAuth2UserService oAuth2UserService;
     private final OAuth2AuthSuccessHandler oAuth2AuthSuccessHandler;
     private final HttpCookieOAuth2AuthorizationRequestRepository httpCookieOAuth2AuthorizationRequestRepository;
+    private final CustomRequestEntityConverter customRequestEntityConverter;
 
     @Bean
     public OAuth2AccessTokenResponseClient<OAuth2AuthorizationCodeGrantRequest> accessTokenResponseClient() {
         DefaultAuthorizationCodeTokenResponseClient accessTokenResponseClient = new DefaultAuthorizationCodeTokenResponseClient();
-        accessTokenResponseClient.setRequestEntityConverter(new CustomRequestEntityConverter());
+        accessTokenResponseClient.setRequestEntityConverter(customRequestEntityConverter);
 
         return accessTokenResponseClient;
     }

diff --git a/core/core-security/src/main/java/com/mm/coresecurity/oauth/CustomRequestEntityConverter.java b/core/core-security/src/main/java/com/mm/coresecurity/oauth/CustomRequestEntityConverter.java
@@ -9,6 +9,7 @@
 import org.bouncycastle.openssl.PEMParser;
 import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.RequestEntity;
@@ -26,11 +27,12 @@
 
 @Slf4j
 @Component
+@PropertySource("classpath:application-security.yml")
 public class CustomRequestEntityConverter implements Converter<OAuth2AuthorizationCodeGrantRequest, RequestEntity<?>> {
 
     private OAuth2AuthorizationCodeGrantRequestEntityConverter defaultConverter;
-    @Value("${spring.security.oauth2.client.registration.apple.clientSecret}")
-    private String APPLE_CLIENT_SECRET;
+    @Value("${spring.security.oauth2.client.registration.apple.client-secret}")
+    private String appleClientSecret;
 
     public CustomRequestEntityConverter() {
         defaultConverter = new OAuth2AuthorizationCodeGrantRequestEntityConverter();
@@ -44,7 +46,7 @@ public RequestEntity<?> convert(OAuth2AuthorizationCodeGrantRequest req) {
         //Apple일 경우 secret key를 동적으로 세팅
         if (registrationId.contains("apple")) {
             params.set("client_secret",
-                    createAppleClientSecret(params.get("client_id").get(0), APPLE_CLIENT_SECRET));
+                    createAppleClientSecret(params.get("client_id").get(0), appleClientSecret));
         }
         return new RequestEntity<>(params, entity.getHeaders(),
                 entity.getMethod(), entity.getUrl());