Skip to content

Commit 50cc81f

Browse files
authored
Merge pull request #37 from prgrms-web-devcourse-final-project/QUZ-93-user-fix
[QUZ-93][HOTFIX] dev 환경에서 로그인이 안되는 이슈 수정
2 parents deb67aa + 62bef2e commit 50cc81f

File tree

5 files changed

+16
-7
lines changed

5 files changed

+16
-7
lines changed

gateway-service/src/main/kotlin/com/grepp/quizy/global/AuthGlobalFilter.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ class RouteValidator {
107107
"/oauth2",
108108
"/api/quiz/feed",
109109
"/api/quiz/search",
110-
"/api/user/info/"
110+
"/api/user/info/",
111+
"/login/oauth2/code"
111112
)
112113

113114
fun isUnsecured(request: ServerHttpRequest): Boolean {

gateway-service/src/main/resources/application.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ spring:
6262
uri: http://localhost:8085
6363
predicates:
6464
- Path=/api/auth/**
65+
- id: login
66+
uri: http://localhost:8085
67+
predicates:
68+
- Path=/login/**
6569
- id: websocket
6670
uri: ws://localhost:8081
6771
predicates:
@@ -138,6 +142,10 @@ spring:
138142
uri: http://dev-user-service:8080
139143
predicates:
140144
- Path=/api/auth/**
145+
- id: login
146+
uri: http://dev-user-service:8080
147+
predicates:
148+
- Path=/login/**
141149
- id: websocket
142150
uri: ws://dev-game-service:8080
143151
predicates:

user-service/user-application/app-api/src/main/resources/application.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spring:
2525
scope:
2626
- email
2727
- profile
28-
redirect-uri: http://localhost:8085/login/oauth2/code/google
28+
redirect-uri: http://localhost:8080/login/oauth2/code/google
2929
kakao:
3030
client-id: ${KAKAO_CLIENT_ID}
3131
client-secret: ${KAKAO_CLIENT_SECRET}
@@ -36,7 +36,7 @@ spring:
3636
- profile_image
3737
- account_email
3838
client-name: Kakao
39-
redirect-uri: http://localhost:8085/login/oauth2/code/kakao
39+
redirect-uri: http://localhost:8080/login/oauth2/code/kakao
4040

4141
provider:
4242
kakao:
@@ -79,7 +79,7 @@ spring:
7979
scope:
8080
- email
8181
- profile
82-
redirect-uri: http://localhost:8080/api/v1/auth/oauth2/code/google
82+
redirect-uri: https://quizy.n-e.kr/login/oauth2/code/google
8383
kakao:
8484
client-id: ${KAKAO_CLIENT_ID}
8585
client-secret: ${KAKAO_CLIENT_SECRET}
@@ -90,7 +90,7 @@ spring:
9090
- profile_image
9191
- account_email
9292
client-name: Kakao
93-
redirect-uri: http://localhost:8080/api/v1/auth/oauth2/code/kakao
93+
redirect-uri: https://quizy.n-e.kr/login/oauth2/code/kakao
9494

9595
provider:
9696
kakao:

user-service/user-infra/src/main/kotlin/com/grepp/quizy/user/infra/user/messaging/listener/UserKafkaListener.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class UserKafkaListener(
1515

1616
@KafkaListener(
1717
id = "\${kafka.topic.user}",
18-
topics = ["\${kafka.consumer-group.quiz}"]
18+
topics = ["\${kafka.consumer-group.onboarding}"]
1919
)
2020
override fun receive(
2121
records: List<ConsumerRecord<Long, InterestOnboardingEvent>>

user-service/user-infra/src/main/resources/application-infra.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ kafka:
4343
consumer-group:
4444
user: user
4545
game: game
46-
quiz: quiz
46+
onboarding: onboarding
4747

4848
kafka-config:
4949
bootstrap-servers: localhost:19092, localhost:29092, localhost:39092

0 commit comments

Comments
 (0)