From fa557d6fc42867b38dd201f9697e982f7e5ed438 Mon Sep 17 00:00:00 2001 From: Ssamssamukja <109636635+Ssamssamukja@users.noreply.github.com> Date: Sat, 21 Feb 2026 23:11:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20redirect=20uri=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- clokey-api/src/main/resources/application-dev.yml | 4 ++-- clokey-api/src/main/resources/application-local.yml | 4 ++-- clokey-api/src/main/resources/application-prod.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clokey-api/src/main/resources/application-dev.yml b/clokey-api/src/main/resources/application-dev.yml index 27ff94b4..f857d785 100644 --- a/clokey-api/src/main/resources/application-dev.yml +++ b/clokey-api/src/main/resources/application-dev.yml @@ -37,7 +37,7 @@ spring: kakao: client-id: ${KAKAO_CLIENT_ID} client-secret: ${KAKAO_CLIENT_SECRET} - redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" + redirect-uri: ${KAKAO_REDIRECT_URI} authorization-grant-type: authorization_code client-authentication-method: client_secret_post scope: @@ -46,7 +46,7 @@ spring: apple: client-id: ${APPLE_CLIENT_ID} client-secret: ${APPLE_CLIENT_SECRET} - redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" + redirect-uri: ${APPLE_REDIRECT_URI} authorization-grant-type: authorization_code scope: - openid diff --git a/clokey-api/src/main/resources/application-local.yml b/clokey-api/src/main/resources/application-local.yml index d3a25664..ed35d833 100644 --- a/clokey-api/src/main/resources/application-local.yml +++ b/clokey-api/src/main/resources/application-local.yml @@ -37,7 +37,7 @@ spring: kakao: client-id: ${KAKAO_CLIENT_ID} client-secret: ${KAKAO_CLIENT_SECRET} - redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" + redirect-uri: ${KAKAO_REDIRECT_URI} authorization-grant-type: authorization_code client-authentication-method: client_secret_post scope: @@ -46,7 +46,7 @@ spring: apple: client-id: ${APPLE_CLIENT_ID} client-secret: ${APPLE_CLIENT_SECRET} - redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" + redirect-uri: ${APPLE_REDIRECT_URI} authorization-grant-type: authorization_code scope: - openid diff --git a/clokey-api/src/main/resources/application-prod.yml b/clokey-api/src/main/resources/application-prod.yml index e6a4b270..2b1ec3b2 100644 --- a/clokey-api/src/main/resources/application-prod.yml +++ b/clokey-api/src/main/resources/application-prod.yml @@ -37,7 +37,7 @@ spring: kakao: client-id: ${KAKAO_CLIENT_ID} client-secret: ${KAKAO_CLIENT_SECRET} - redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" + redirect-uri: ${KAKAO_REDIRECT_URI} authorization-grant-type: authorization_code client-authentication-method: client_secret_post scope: @@ -46,7 +46,7 @@ spring: apple: client-id: ${APPLE_CLIENT_ID} client-secret: ${APPLE_CLIENT_SECRET} - redirect-uri: "{baseUrl}/login/oauth2/code/{registrationId}" + redirect-uri: ${APPLE_REDIRECT_URI} authorization-grant-type: authorization_code scope: - openid From b3f554536794256b0f7be7b63bd4c331b20e0b2f Mon Sep 17 00:00:00 2001 From: Ssamssamukja <109636635+Ssamssamukja@users.noreply.github.com> Date: Sat, 21 Feb 2026 23:11:45 +0900 Subject: [PATCH 2/2] fix: deploy workflows --- .github/workflows/dev-cd.yml | 3 ++- .github/workflows/prod-cd.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev-cd.yml b/.github/workflows/dev-cd.yml index 469aceb2..10f3bc9d 100644 --- a/.github/workflows/dev-cd.yml +++ b/.github/workflows/dev-cd.yml @@ -63,7 +63,6 @@ jobs: username: ubuntu host: ${{ secrets.DEV_EC2_HOST }} key: ${{ secrets.DEV_EC2_SSH_KEY }} - 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 script: | export DOCKERHUB_NAME=${{ secrets.DOCKERHUB_USERNAME }} export DOCKER_TAG=dev-app @@ -80,9 +79,11 @@ jobs: export KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }} export KAKAO_CLIENT_SECRET=${{ secrets.DEV_KAKAO_CLIENT_SECRET }} + export KAKAO_REDIRECT_URI=${{ secrets.KAKAO_REDIRECT_URI }} export APPLE_CLIENT_ID=${{ secrets.APPLE_CLIENT_ID }} export APPLE_CLIENT_SECRET=${{ secrets.APPLE_CLIENT_SECRET }} + export APPLE_REDIRECT_URI=${{ secrets.APPLE_REDIRECT_URI }} export JWT_ACCESS_TOKEN_SECRET=${{ secrets.JWT_ACCESS_TOKEN_SECRET }} export JWT_REFRESH_TOKEN_SECRET=${{ secrets.JWT_REFRESH_TOKEN_SECRET }} diff --git a/.github/workflows/prod-cd.yml b/.github/workflows/prod-cd.yml index 8477e942..495b97a3 100644 --- a/.github/workflows/prod-cd.yml +++ b/.github/workflows/prod-cd.yml @@ -73,7 +73,6 @@ jobs: username: ubuntu host: ${{ secrets.PROD_EC2_HOST }} key: ${{ secrets.PROD_EC2_SSH_KEY }} - 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 script: | export DOCKERHUB_NAME=${{ secrets.DOCKERHUB_USERNAME }} export DOCKER_TAG=prod-app @@ -90,9 +89,11 @@ jobs: export KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }} export KAKAO_CLIENT_SECRET=${{ secrets.KAKAO_CLIENT_SECRET }} + export KAKAO_REDIRECT_URI=${{ secrets.KAKAO_REDIRECT_URI }} export APPLE_CLIENT_ID=${{ secrets.APPLE_CLIENT_ID }} export APPLE_CLIENT_SECRET=${{ secrets.APPLE_CLIENT_SECRET }} + export APPLE_REDIRECT_URI=${{ secrets.APPLE_REDIRECT_URI }} export JWT_ACCESS_TOKEN_SECRET=${{ secrets.JWT_ACCESS_TOKEN_SECRET }} export JWT_REFRESH_TOKEN_SECRET=${{ secrets.JWT_REFRESH_TOKEN_SECRET }}