Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 로컬에서도 idsnucse로 연결 #174

Merged
merged 6 commits into from
Jan 27, 2024
Merged

fix: 로컬에서도 idsnucse로 연결 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
233949d
fix: 로컬에서도 idsnucse 바라보게끔 변경
leeeryboy Jan 6, 2024
72a9d3d
Merge branch 'develop' into fix/id-dev
leeeryboy Jan 6, 2024
cf52645
fix: test에서 idsnucse 접근 x
leeeryboy Jan 13, 2024
73fb813
Revert "fix: test에서 idsnucse 접근 x"
leeeryboy Jan 13, 2024
8840919
Fix: move local security settings to local, not global.
huGgW Jan 25, 2024
440319d
Fix: Disable SecurityConfig on "test" profile
huGgW Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/kotlin/com/wafflestudio/csereal/common/config/SecurityConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Value
import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Profile
import org.springframework.security.config.annotation.web.builders.HttpSecurity
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
import org.springframework.security.core.Authentication
Expand All @@ -18,6 +19,7 @@ import org.springframework.web.cors.CorsConfiguration
import org.springframework.web.cors.CorsConfigurationSource
import org.springframework.web.cors.UrlBasedCorsConfigurationSource

@Profile("!test")
@Configuration
@EnableWebSecurity
@EnableConfigurationProperties(EndpointProperties::class)
Expand Down
28 changes: 14 additions & 14 deletions src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,6 @@ spring:
active: local
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
security:
oauth2:
client:
registration:
idsnucse:
client-id: waffle-dev-local-testing
client-secret: ${OIDC_CLIENT_SECRET_DEV}
authorization-grant-type: authorization_code
scope: openid, profile, email
redirect-uri: http://localhost:8080/api/v1/login/oauth2/code/idsnucse
provider:
idsnucse:
issuer-uri: https://id-dev.bacchus.io/o
jwk-set-uri: https://id-dev.bacchus.io/o/jwks
servlet:
multipart:
enabled: true
Expand Down Expand Up @@ -64,6 +50,20 @@ spring:
properties:
hibernate:
dialect: com.wafflestudio.csereal.common.config.MySQLDialectCustom
security:
oauth2:
client:
registration:
idsnucse:
client-id: cse-waffle-dev
client-secret: ${OIDC_CLIENT_SECRET}
authorization-grant-type: authorization_code
scope: openid, profile, email
redirect-uri: http://localhost:8080/api/v1/login/oauth2/code/idsnucse
provider:
idsnucse:
issuer-uri: https://id.snucse.org/o
jwk-set-uri: https://id.snucse.org/o/jwks

logging.level:
default: INFO
Expand Down
Loading