Skip to content

Commit e02def2

Browse files
committed
feat[OAuth]: 실행구성 변경 및 환경변수 추가
1 parent 9abab3f commit e02def2

File tree

4 files changed

+58
-15
lines changed

4 files changed

+58
-15
lines changed

backend/.env.default

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
11
SPRING_PROFILES_ACTIVE=NEED_TO_SET
2-
32
SPRING_JPA_HIBERNATE_DDL_AUTO=NEED_TO_SET
43

5-
SPRING__SECURITY__OAUTH2__CLIENT__REGISTRATION__KAKAO__CLIENT_ID=NEED_TO_SET
6-
SPRING__SECURITY__OAUTH2__CLIENT__REGISTRATION__KAKAO__CLIENT_SECRET=NEED_TO_SET
7-
SPRING__SECURITY__OAUTH2__CLIENT__REGISTRATION__NAVER__CLIENT_ID=NEED_TO_SET
8-
SPRING__SECURITY__OAUTH2__CLIENT__REGISTRATION__NAVER__CLIENT_SECRET=NEED_TO_SET
4+
SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_KAKAO_CLIENT_ID=NEED_TO_SET
5+
SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_KAKAO_CLIENT_SECRET=NEED_TO_SET
6+
SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_NAVER_CLIENT_ID=NEED_TO_SET
7+
SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_NAVER_CLIENT_SECRET=NEED_TO_SET
98

109
CUSTOM_JWT_SECRET_KEY=NEED_TO_SET
1110
CUSTOM_JWT_ACCESS_TOKEN_EXPIRATION_SECONDS=NEED_TO_SET
1211

12+
# Email
13+
SEND_EMAIL_ADDRESS=NEED_TO_SET
14+
SEND_EMAIL_PASSWORD=NEED_TO_SET
15+
16+
# PROD
17+
PROD_URL=NEED_TO_SET
18+
PROD_FRONTEND_URL=NEED_TO_SET
19+
PROD_CORS_ALLOWED_ORIGINS=NEED_TO_SET
20+
PROD_OAUTH2_KAKAO_REDIRECT_URI=NEED_TO_SET
21+
PROD_OAUTH2_NAVER_REDIRECT_URI=NEED_TO_SET
22+
PROD_OAUTH2_SUCCESS_REDIRECT_URL=NEED_TO_SET
23+
PROD_OAUTH2_FAILURE_REDIRECT_URL=NEED_TO_SET
1324
PROD_DATASOURCE_URL=NEED_TO_SET
1425
PROD_DATASOURCE_DRIVER=NEED_TO_SET
1526
PROD_DATASOURCE_USERNAME=NEED_TO_SET
@@ -19,16 +30,27 @@ PROD_REDIS_HOST=NEED_TO_SET
1930
PROD_REDIS_PORT=NEED_TO_SET
2031
PROD_REDIS_PASSWORD=NEED_TO_SET
2132

33+
# DEV
34+
DEV_URL=NEED_TO_SET
35+
DEV_FRONTEND_URL=NEED_TO_SET
36+
DEV_CORS_ALLOWED_ORIGINS=NEED_TO_SET
37+
DEV_OAUTH2_KAKAO_REDIRECT_URI=NEED_TO_SET
38+
DEV_OAUTH2_NAVER_REDIRECT_URI=NEED_TO_SET
39+
DEV_OAUTH2_SUCCESS_REDIRECT_URL=NEED_TO_SET
40+
DEV_OAUTH2_FAILURE_REDIRECT_URL=NEED_TO_SET
2241
DEV_DATASOURCE_URL=NEED_TO_SET
2342
DEV_DATASOURCE_USERNAME=NEED_TO_SET
2443
DEV_DATASOURCE_PASSWORD=NEED_TO_SET
2544
DEV_DATASOURCE_DRIVER=NEED_TO_SET
2645
DEV_JPA_HIBERNATE_DDL_AUTO=NEED_TO_SET
46+
DEV_DATASOURCE_PORT=NEED_TO_SET
47+
DEV_DB_ROOT_PASSWORD=NEED_TO_SET
2748

2849
DEV_REDIS_HOST=NEED_TO_SET
2950
DEV_REDIS_PORT=NEED_TO_SET
3051
DEV_REDIS_PASSWORD=NEED_TO_SET
3152

53+
# TEST
3254
TEST_DATASOURCE_URL=NEED_TO_SET
3355
TEST_DATASOURCE_USERNAME=NEED_TO_SET
3456
TEST_DATASOURCE_PASSWORD=NEED_TO_SET
@@ -37,4 +59,7 @@ TEST_JPA_HIBERNATE_DDL_AUTO=NEED_TO_SET
3759

3860
TEST_REDIS_HOST=NEED_TO_SET
3961
TEST_REDIS_PORT=NEED_TO_SET
40-
TEST_REDIS_PASSWORD=NEED_TO_SET
62+
TEST_REDIS_PASSWORD=NEED_TO_SET
63+
64+
# AI
65+
OPENAI_API_KEY=NEED_TO_SET

backend/src/main/resources/application-dev.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,15 @@ spring:
2121
client:
2222
registration:
2323
kakao:
24-
redirect-uri: "${DEV_URL}/login/oauth2/code/{registrationId}"
24+
redirect-uri: ${DEV_OAUTH2_KAKAO_REDIRECT_URI}
2525
naver:
26-
redirect-uri: "${DEV_URL}/login/oauth2/code/{registrationId}"
26+
redirect-uri: ${DEV_OAUTH2_NAVER_REDIRECT_URI}
2727

2828
custom:
29+
cors:
30+
allowed-origins: ${DEV_CORS_ALLOWED_ORIGINS}
2931
oauth2:
30-
redirect-url: ${DEV_OAUTH2_REDIRECT_URI}
32+
redirect-url: ${DEV_OAUTH2_SUCCESS_REDIRECT_URL}
33+
failure-url: ${DEV_OAUTH2_FAILURE_REDIRECT_URL}
34+
frontend:
35+
url: ${DEV_FRONTEND_URL}

backend/src/main/resources/application-prod.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
spring:
2-
autoconfigure:
3-
exclude:
42
datasource:
53
url: ${PROD_DATASOURCE_URL}
64
driver-class-name: ${PROD_DATASOURCE_DRIVER}
@@ -34,9 +32,9 @@ spring:
3432
client:
3533
registration:
3634
kakao:
37-
redirect-uri: "${PROD_URL}/login/oauth2/code/{registrationId}"
35+
redirect-uri: ${PROD_OAUTH2_KAKAO_REDIRECT_URI}
3836
naver:
39-
redirect-uri: "${PROD_URL}/login/oauth2/code/{registrationId}"
37+
redirect-uri: ${PROD_OAUTH2_NAVER_REDIRECT_URI}
4038
ai:
4139
vectorstore:
4240
qdrant:
@@ -45,8 +43,13 @@ spring:
4543
collection-name: legal_cases
4644
vector-size: 1536
4745
custom:
46+
cors:
47+
allowed-origins: ${PROD_CORS_ALLOWED_ORIGINS}
4848
oauth2:
49-
redirect-url: ${PROD_OAUTH2_REDIRECT_URI}
49+
redirect-url: ${PROD_OAUTH2_SUCCESS_REDIRECT_URL}
50+
failure-url: ${PROD_OAUTH2_FAILURE_REDIRECT_URL}
51+
frontend:
52+
url: ${PROD_FRONTEND_URL}
5053

5154
sentry:
5255
dsn: ${PROD_SENTRY_DSN}

backend/src/main/resources/application.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ spring:
8989
client-id: ${SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_KAKAO_CLIENT_ID}
9090
client-secret: ${SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_KAKAO_CLIENT_SECRET}
9191
client-name: Kakao
92+
redirect-uri: http://localhost:8080/login/oauth2/code/kakao
9293
authorization-grant-type: authorization_code
94+
client-authentication-method: client_secret_post
9395
scope:
9496
- account_email
9597
- name
@@ -99,6 +101,7 @@ spring:
99101
client-id: ${SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_NAVER_CLIENT_ID}
100102
client-secret: ${SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_NAVER_CLIENT_SECRET}
101103
client-name: Naver
104+
redirect-uri: http://localhost:8080/login/oauth2/code/naver
102105
authorization-grant-type: authorization_code
103106
scope:
104107
- email
@@ -140,7 +143,14 @@ management:
140143
show-details: never # 프로브 용도면 never 권장(민감정보 차단)
141144

142145
custom:
146+
cors:
147+
allowed-origins: http://localhost:3000
143148
jwt:
144149
secretKey: ${CUSTOM_JWT_SECRET_KEY}
145150
accessToken:
146-
expirationSeconds: ${CUSTOM_JWT_ACCESS_TOKEN_EXPIRATION_SECONDS}
151+
expirationSeconds: ${CUSTOM_JWT_ACCESS_TOKEN_EXPIRATION_SECONDS}
152+
oauth2:
153+
redirect-url: http://localhost:3000/oauth/callback
154+
failure-url: http://localhost:3000/oauth/callback?error=true
155+
frontend:
156+
url: http://localhost:3000

0 commit comments

Comments
 (0)