Skip to content

Commit 3b6f252

Browse files
authored
[Fix/#351] 로그인 REDIRECT_URI 수정 (#352)
* fix: redirect uri 변경 * fix: deploy workflows
1 parent fad5887 commit 3b6f252

5 files changed

Lines changed: 10 additions & 8 deletions

File tree

.github/workflows/dev-cd.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ jobs:
6363
username: ubuntu
6464
host: ${{ secrets.DEV_EC2_HOST }}
6565
key: ${{ secrets.DEV_EC2_SSH_KEY }}
66-
envs: DOCKERHUB_USERNAME,DEV_MYSQL_HOST,MYSQL_PORT,DB_NAME,DB_USERNAME,DB_PASSWORD,REDIS_HOST,REDIS_PORT,REDIS_PASSWORD,DEV_KAKAO_CLIENT_ID,DEV_KAKAO_CLIENT_SECRET,DEV_APPLE_CLIENT_ID,DEV_APPLE_CLIENT_SECRET,JWT_ACCESS_TOKEN_SECRET,JWT_REFRESH_TOKEN_SECRET,JWT_ACCESS_TOKEN_EXPIRATION_TIME,JWT_REFRESH_TOKEN_EXPIRATION_TIME,JWT_ISSUER,DEV_AWS_ACCESS_KEY_ID,DEV_AWS_SECRET_ACCESS_KEY,AWS_REGION,DEV_S3_BUCKET,DEV_S3_ENDPOINT,SWAGGER_USERNAME,SWAGGER_PASSWORD,FIREBASE_SA_JSON_B64,AI_SERVER_IP,CLOTH_INFERENCE_PATH,STYLE_INFERENCE_PATH,CLOTH_DETECT_PATH,MEILISEARCH_ENDPOINT,MEILISEARCH_KEY
6766
script: |
6867
export DOCKERHUB_NAME=${{ secrets.DOCKERHUB_USERNAME }}
6968
export DOCKER_TAG=dev-app
@@ -80,9 +79,11 @@ jobs:
8079
8180
export KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }}
8281
export KAKAO_CLIENT_SECRET=${{ secrets.DEV_KAKAO_CLIENT_SECRET }}
82+
export KAKAO_REDIRECT_URI=${{ secrets.KAKAO_REDIRECT_URI }}
8383
8484
export APPLE_CLIENT_ID=${{ secrets.APPLE_CLIENT_ID }}
8585
export APPLE_CLIENT_SECRET=${{ secrets.APPLE_CLIENT_SECRET }}
86+
export APPLE_REDIRECT_URI=${{ secrets.APPLE_REDIRECT_URI }}
8687
8788
export JWT_ACCESS_TOKEN_SECRET=${{ secrets.JWT_ACCESS_TOKEN_SECRET }}
8889
export JWT_REFRESH_TOKEN_SECRET=${{ secrets.JWT_REFRESH_TOKEN_SECRET }}

.github/workflows/prod-cd.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ jobs:
7373
username: ubuntu
7474
host: ${{ secrets.PROD_EC2_HOST }}
7575
key: ${{ secrets.PROD_EC2_SSH_KEY }}
76-
envs: DOCKERHUB_USERNAME,SPRING_PROFILES_ACTIVE,PROD_MYSQL_HOST,MYSQL_PORT,DB_NAME,DB_USERNAME,DB_PASSWORD,REDIS_HOST,REDIS_PORT,REDIS_PASSWORD,PROD_KAKAO_CLIENT_ID,PROD_KAKAO_CLIENT_SECRET,PROD_APPLE_CLIENT_ID,PROD_APPLE_CLIENT_SECRET,JWT_ACCESS_TOKEN_SECRET,JWT_REFRESH_TOKEN_SECRET,JWT_ACCESS_TOKEN_EXPIRATION_TIME,JWT_REFRESH_TOKEN_EXPIRATION_TIME,JWT_ISSUER,PROD_AWS_ACCESS_KEY_ID,PROD_AWS_SECRET_ACCESS_KEY,AWS_REGION,PROD_S3_BUCKET,PROD_S3_ENDPOINT,SWAGGER_USERNAME,SWAGGER_PASSWORD,FIREBASE_SA_JSON_B64,AI_SERVER_IP,CLOTH_INFERENCE_PATH,STYLE_INFERENCE_PATH,CLOTH_DETECT_PATH,MEILISEARCH_ENDPOINT,MEILISEARCH_KEY
7776
script: |
7877
export DOCKERHUB_NAME=${{ secrets.DOCKERHUB_USERNAME }}
7978
export DOCKER_TAG=prod-app
@@ -90,9 +89,11 @@ jobs:
9089
9190
export KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }}
9291
export KAKAO_CLIENT_SECRET=${{ secrets.KAKAO_CLIENT_SECRET }}
92+
export KAKAO_REDIRECT_URI=${{ secrets.KAKAO_REDIRECT_URI }}
9393
9494
export APPLE_CLIENT_ID=${{ secrets.APPLE_CLIENT_ID }}
9595
export APPLE_CLIENT_SECRET=${{ secrets.APPLE_CLIENT_SECRET }}
96+
export APPLE_REDIRECT_URI=${{ secrets.APPLE_REDIRECT_URI }}
9697
9798
export JWT_ACCESS_TOKEN_SECRET=${{ secrets.JWT_ACCESS_TOKEN_SECRET }}
9899
export JWT_REFRESH_TOKEN_SECRET=${{ secrets.JWT_REFRESH_TOKEN_SECRET }}

clokey-api/src/main/resources/application-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spring:
3737
kakao:
3838
client-id: ${KAKAO_CLIENT_ID}
3939
client-secret: ${KAKAO_CLIENT_SECRET}
40-
redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
40+
redirect-uri: ${KAKAO_REDIRECT_URI}
4141
authorization-grant-type: authorization_code
4242
client-authentication-method: client_secret_post
4343
scope:
@@ -46,7 +46,7 @@ spring:
4646
apple:
4747
client-id: ${APPLE_CLIENT_ID}
4848
client-secret: ${APPLE_CLIENT_SECRET}
49-
redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
49+
redirect-uri: ${APPLE_REDIRECT_URI}
5050
authorization-grant-type: authorization_code
5151
scope:
5252
- openid

clokey-api/src/main/resources/application-local.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spring:
3737
kakao:
3838
client-id: ${KAKAO_CLIENT_ID}
3939
client-secret: ${KAKAO_CLIENT_SECRET}
40-
redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
40+
redirect-uri: ${KAKAO_REDIRECT_URI}
4141
authorization-grant-type: authorization_code
4242
client-authentication-method: client_secret_post
4343
scope:
@@ -46,7 +46,7 @@ spring:
4646
apple:
4747
client-id: ${APPLE_CLIENT_ID}
4848
client-secret: ${APPLE_CLIENT_SECRET}
49-
redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
49+
redirect-uri: ${APPLE_REDIRECT_URI}
5050
authorization-grant-type: authorization_code
5151
scope:
5252
- openid

clokey-api/src/main/resources/application-prod.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spring:
3737
kakao:
3838
client-id: ${KAKAO_CLIENT_ID}
3939
client-secret: ${KAKAO_CLIENT_SECRET}
40-
redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
40+
redirect-uri: ${KAKAO_REDIRECT_URI}
4141
authorization-grant-type: authorization_code
4242
client-authentication-method: client_secret_post
4343
scope:
@@ -46,7 +46,7 @@ spring:
4646
apple:
4747
client-id: ${APPLE_CLIENT_ID}
4848
client-secret: ${APPLE_CLIENT_SECRET}
49-
redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}"
49+
redirect-uri: ${APPLE_REDIRECT_URI}
5050
authorization-grant-type: authorization_code
5151
scope:
5252
- openid

0 commit comments

Comments
 (0)