fix : (#29) cors !!!!

EntryDSM · Feb 12, 2025 · 27e9b2d · 27e9b2d
1 parent 77557d5
commit 27e9b2d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/kotlin/entry/dsm/gitauth/equusgithubauth/global/config/SecurityConfig.kt b/src/main/kotlin/entry/dsm/gitauth/equusgithubauth/global/config/SecurityConfig.kt
@@ -17,15 +17,15 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource
 @EnableWebSecurity
 class SecurityConfig(
     private val githubOAuth2LoginConfig: GithubOAuth2LoginConfig,
+    private val corsConfig: CorsConfig
 ) {
     @Bean
     fun securityFilterChain(
         http: HttpSecurity,
         clientRegistrationRepository: ClientRegistrationRepository,
-        corsConfigurationSource: CorsConfigurationSource
     ): SecurityFilterChain {
         http
-            .cors { it.configurationSource(corsConfigurationSource) }
+            .cors { it.configurationSource(corsConfig.corsConfigurationSource()) }
             .csrf { it.disable() }
             .headers { it.frameOptions { frame -> frame.sameOrigin() } }
             .sessionManagement { it.sessionCreationPolicy(SessionCreationPolicy.STATELESS) }
@@ -36,7 +36,7 @@ class SecurityConfig(
                     .anyRequest().authenticated()
             }
 
-        githubOAuth2LoginConfig.configure(http, clientRegistrationRepository, corsConfigurationSource)
+        githubOAuth2LoginConfig.configure(http, clientRegistrationRepository)
 
         return http.build()
     }

diff --git a/src/main/kotlin/entry/dsm/gitauth/equusgithubauth/global/oauth/GithubOAuth2LoginConfig.kt b/src/main/kotlin/entry/dsm/gitauth/equusgithubauth/global/oauth/GithubOAuth2LoginConfig.kt
@@ -1,5 +1,6 @@
 package entry.dsm.gitauth.equusgithubauth.global.oauth
 
+import entry.dsm.gitauth.equusgithubauth.global.config.CorsConfig
 import entry.dsm.gitauth.equusgithubauth.global.oauth.handler.GithubAuthenticationFailureHandler
 import entry.dsm.gitauth.equusgithubauth.global.oauth.handler.GithubAuthenticationSuccessHandler
 import org.springframework.context.annotation.Bean
@@ -12,7 +13,9 @@ import org.springframework.web.cors.CorsConfigurationSource
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource
 
 @Configuration
-class GithubOAuth2LoginConfig {
+class GithubOAuth2LoginConfig(
+    private val corsConfig: CorsConfig
+) {
     @Bean
     fun githubAuthenticationSuccessHandler() = GithubAuthenticationSuccessHandler()
 
@@ -22,10 +25,9 @@ class GithubOAuth2LoginConfig {
     fun configure(
         http: HttpSecurity,
         clientRegistrationRepository: ClientRegistrationRepository,
-        corsConfigurationSource: CorsConfigurationSource
     ) {
         http
-            .cors { it.configurationSource(corsConfigurationSource) }
+            .cors { it.configurationSource(corsConfig.corsConfigurationSource()) }
             .oauth2Login { oauth ->
                 oauth
                     .successHandler(githubAuthenticationSuccessHandler())