diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index fd3d29b..bad75c3 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -85,5 +85,7 @@ jobs: port: 22 timeout: 60s script: | + sudo docker stop studylog_server + sudo docker rm studylog_server sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/studylog_server:latest sudo docker compose -f /home/ubuntu/project/compose.yml up -d diff --git a/src/main/java/org/example/studylog/oauth2/CustomSuccessHandler.java b/src/main/java/org/example/studylog/oauth2/CustomSuccessHandler.java index d8b95c8..a821550 100644 --- a/src/main/java/org/example/studylog/oauth2/CustomSuccessHandler.java +++ b/src/main/java/org/example/studylog/oauth2/CustomSuccessHandler.java @@ -8,6 +8,7 @@ import org.example.studylog.jwt.JWTUtil; import org.example.studylog.service.TokenService; import org.example.studylog.util.CookieUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler; @@ -21,6 +22,9 @@ @Slf4j public class CustomSuccessHandler extends SimpleUrlAuthenticationSuccessHandler { + @Value("${spring.redirectUri}") + private String redirectUri; + private final JWTUtil jwtUtil; private final TokenService tokenService; @@ -51,7 +55,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo response.addCookie(CookieUtil.createCookie("refresh", refresh)); // 회원가입 화면으로 리다이렉션(임시: 프론트 로그인 완료 화면으로 변경 예정) - response.sendRedirect("http://localhost:8080/signup"); + response.sendRedirect(redirectUri); }