v1.0.2 (#163)

GDSC-Hongik · Feb 26, 2024 · 54f17b9 · 54f17b9
2 parents e76da7b + eaf02cc
commit 54f17b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/production_build_deploy.yml b/.github/workflows/production_build_deploy.yml
@@ -138,5 +138,5 @@ jobs:
             aws s3 cp ${{ env.S3_COPY_PATH }} docker-compose.yml
             echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
             docker pull ${{ env.IMAGE_FULL_URL }}
-            docker compose up -d
+            docker-compose up -d
             docker image prune -a -f
diff --git a/src/main/java/com/gdschongik/gdsc/global/common/constant/SecurityConstant.java b/src/main/java/com/gdschongik/gdsc/global/common/constant/SecurityConstant.java
@@ -6,6 +6,7 @@ public class SecurityConstant {
     public static final String TOKEN_ROLE_NAME = "role";
     public static final String GITHUB_NAME_ATTR_KEY = "id";
     public static final String ACCESS_TOKEN_HEADER_PREFIX = "Bearer ";
+    public static final String ACCESS_TOKEN_HEADER_NAME = "Authorization";
 
     private SecurityConstant() {}
 }
diff --git a/src/main/java/com/gdschongik/gdsc/global/security/CustomSuccessHandler.java b/src/main/java/com/gdschongik/gdsc/global/security/CustomSuccessHandler.java
@@ -40,8 +40,12 @@ public void onAuthenticationSuccess(
         RefreshTokenDto refreshTokenDto = jwtService.createRefreshToken(oAuth2User.getMemberId());
         cookieUtil.addTokenCookies(response, accessTokenDto.tokenValue(), refreshTokenDto.tokenValue());
 
+        // 임시로 헤더에 엑세스 토큰 추가
+        response.addHeader(ACCESS_TOKEN_HEADER_NAME, ACCESS_TOKEN_HEADER_PREFIX + accessTokenDto.tokenValue());
+
         // 랜딩 상태를 파라미터로 추가하여 리다이렉트
-        String baseUrl = determineTargetUrl(request, response);
+        // String baseUrl = determineTargetUrl(request, response);
+        String baseUrl = PROD_CLIENT_URL + "/";
         String redirectUrl = String.format(
                 SOCIAL_LOGIN_REDIRECT_URL,
                 baseUrl,