From 3890239528bdfb2022cbfad129436571bb52f362 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Fri, 21 Feb 2025 00:26:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?script=20=EC=B6=94=EA=B0=80=20(#171)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index b1cfc53..65ac328 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -15,6 +15,7 @@ jobs: S3_BUCKET: ${{ secrets.S3_BUCKET }} JWT_SECRET: ${{ secrets.JWT_SECRET }} SQS_QUEUE_NAME: ${{ secrets.SQS_QUEUE_NAME }} + FRONTEND_URL: ${{ secrets.FRONTEND_URL }} # GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} # GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} # GOOGLE_REDIRECT_URI: ${{ secrets.GOOGLE_REDIRECT_URI }} From 117dc6bdf41ef882da3fd6508ed82067783abad2 Mon Sep 17 00:00:00 2001 From: Minhyung Kim Date: Fri, 21 Feb 2025 00:27:51 +0900 Subject: [PATCH 2/2] Fix fronturltoenv (#170) * Authorization feature * Authentication feature implemented * bug fix * refresh token * minor issues fixed * google login * kakao added * pre merge * name attribute deleted * minor fix * final fix * realfinalfix --------- Co-authored-by: Kiara <80676180+2020147542@users.noreply.github.com> --- src/main/java/umc/codeplay/controller/OAuthController.java | 6 ++++-- src/main/resources/application-prod.yml | 4 ++++ src/main/resources/application.yml | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/umc/codeplay/controller/OAuthController.java b/src/main/java/umc/codeplay/controller/OAuthController.java index 5968cc1..6b6dc5b 100644 --- a/src/main/java/umc/codeplay/controller/OAuthController.java +++ b/src/main/java/umc/codeplay/controller/OAuthController.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Map; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.*; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.util.LinkedMultiValueMap; @@ -34,6 +35,9 @@ @Tag(name = "oauth-controller", description = "외부 소셜 로그인 서비스 연동 API, JWT 토큰 헤더 포함을 필요로 하지 않습니다.") public class OAuthController { + @Value("${frontend.url}") + private String targetOrigin; + private final JwtUtil jwtUtil; private final RestTemplate restTemplate = new RestTemplate(); private final GoogleOAuthProperties googleOAuthProperties; @@ -121,8 +125,6 @@ public ResponseEntity OAuthCallback( // .build()); } - String targetOrigin = "https://code-play-fe.vercel.app"; - private String getString(String serviceAccessToken, String serviceRefreshToken, String email) { String jsonData = String.format( diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index bd0ceff..b80f523 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -49,6 +49,10 @@ spring: starttls: enable: true +frontend: + url: + ${FRONTEND_URL} + s3: bucket: ${S3_BUCKET} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 90d1a7d..511e165 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -49,6 +49,10 @@ spring: access-key: ${AWS_ACCESS_KEY_ID} secret-key: ${AWS_SECRET_ACCESS_KEY} +frontend: + url: + ${FRONTEND_URL} + s3: bucket: ${S3_BUCKET}