Skip to content

Commit 82c86ac

Browse files
authored
SecurityConfig 수정 (#130)
* SecurityConfig 수정 * work * work2 * work
1 parent 67769fa commit 82c86ac

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/main/kotlin/com/back/koreaTravelGuide/common/security/SecurityConfig.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package com.back.koreaTravelGuide.common.config
1+
package com.back.koreaTravelGuide.common.security
22

3-
import com.back.koreaTravelGuide.common.security.CustomOAuth2LoginSuccessHandler
4-
import com.back.koreaTravelGuide.common.security.CustomOAuth2UserService
5-
import com.back.koreaTravelGuide.common.security.JwtAuthenticationFilter
3+
import com.back.koreaTravelGuide.common.config.AppConfig
64
import org.springframework.context.annotation.Bean
75
import org.springframework.context.annotation.Configuration
86
import org.springframework.core.env.Environment
7+
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
98
import org.springframework.security.config.annotation.web.builders.HttpSecurity
109
import org.springframework.security.config.annotation.web.invoke
1110
import org.springframework.security.config.http.SessionCreationPolicy
@@ -16,17 +15,19 @@ import org.springframework.web.cors.CorsConfigurationSource
1615
import org.springframework.web.cors.UrlBasedCorsConfigurationSource
1716

1817
@Configuration
18+
@EnableMethodSecurity
1919
class SecurityConfig(
2020
private val customOAuth2UserService: CustomOAuth2UserService,
2121
private val customOAuth2LoginSuccessHandler: CustomOAuth2LoginSuccessHandler,
2222
private val jwtAuthenticationFilter: JwtAuthenticationFilter,
2323
private val environment: Environment,
24+
private val appConfig: AppConfig,
2425
) {
2526
@Bean
2627
fun filterChain(http: HttpSecurity): SecurityFilterChain {
27-
val isDev =
28-
environment.getProperty("spring.profiles.active")?.contains("dev") == true ||
29-
environment.activeProfiles.contains("dev")
28+
val activeProfiles = environment.activeProfiles
29+
val defaultProfiles = environment.defaultProfiles
30+
val isDev = activeProfiles.contains("dev") || (activeProfiles.isEmpty() && defaultProfiles.contains("dev"))
3031

3132
http {
3233
csrf { disable() }
@@ -76,7 +77,6 @@ class SecurityConfig(
7677
authorize(anyRequest, authenticated)
7778
}
7879
}
79-
8080
if (!isDev) {
8181
addFilterBefore<UsernamePasswordAuthenticationFilter>(jwtAuthenticationFilter)
8282
}
@@ -95,7 +95,7 @@ class SecurityConfig(
9595
listOf(
9696
"http://localhost:3000",
9797
"http://localhost:63342",
98-
// 배포주소
98+
AppConfig.siteFrontUrl,
9999
)
100100
allowedMethods = listOf("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")
101101
allowedHeaders = listOf("*")

src/test/kotlin/com/back/koreaTravelGuide/domain/ai/tour/service/TourParamsParserTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.back.koreaTravelGuide.domain.ai.tour.service
22

3-
import kotlin.test.assertEquals
4-
import kotlin.test.assertNull
53
import org.junit.jupiter.api.DisplayName
64
import org.junit.jupiter.api.Test
5+
import kotlin.test.assertEquals
6+
import kotlin.test.assertNull
77

88
class TourParamsParserTest {
99
private val parser = TourParamsParser()

0 commit comments

Comments
 (0)