Skip to content

Commit b835e46

Browse files
committed
Merge branch 'deploy/#97' into develop
2 parents 3c3968f + d7953cd commit b835e46

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

src/main/kotlin/site/billilge/api/backend/global/security/oauth2/OAuth2AuthenticationSuccessHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class OAuth2AuthenticationSuccessHandler(
2323

2424
private val memberRepository: MemberRepository,
2525

26-
@Value("\${login.redirect.url}") private val redirectUrl: String,
26+
@Value("\${login.redirect-url}") private val redirectUrl: String,
2727
) : SimpleUrlAuthenticationSuccessHandler() {
2828
override fun onAuthenticationSuccess(
2929
request: HttpServletRequest?, response: HttpServletResponse?, authentication: Authentication?

src/main/resources/application-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ spring:
1616
google:
1717
client-id: ${DEV_OAUTH2_GOOGLE_CLIENT_ID}
1818
client-secret: ${DEV_OAUTH2_GOOGLE_CLIENT_SECRET}
19+
redirect-uri: ${DEV_SWAGGER_SERVER_BASE_URL}/login/oauth2/code/google
1920
scope:
2021
- email
2122
- profile
@@ -42,8 +43,7 @@ jwt:
4243

4344
login:
4445
admin-password: ${DEV_LOGIN_ADMIN_PASSWORD}
45-
redirect:
46-
url: ${DEV_LOGIN_REDIRECT_URL}
46+
redirect-url: ${DEV_LOGIN_REDIRECT_URL}
4747

4848
cors:
4949
allowed-origins: ${DEV_CORS_ALLOWED_ORIGINS}

src/main/resources/application-prod.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ jwt:
4242

4343
login:
4444
admin-password: ${LOGIN_ADMIN_PASSWORD}
45-
redirect:
46-
url: ${LOGIN_REDIRECT_URL}
45+
redirect-url: ${LOGIN_REDIRECT_URL}
4746

4847
cors:
4948
allowed-origins: ${CORS_ALLOWED_ORIGINS}

src/main/resources/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ springdoc:
1515
show-actuator: true # Spring Actuator의 endpoint까지 보여줄 것인지?
1616
default-consumes-media-type: application/json # request media type 의 기본 값
1717
default-produces-media-type: application/json # response media type 의 기본 값
18-
paths-to-match: /** # 해당 패턴에 매칭되는 controller만 swagger-ui에 노출한다.
18+
paths-to-match: /** # 해당 패턴에 매칭되는 controller만 swagger-ui에 노출한다.

0 commit comments

Comments
 (0)