diff --git a/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginFailureHandler.java b/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginFailureHandler.java index a64b0125..0ca4d129 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginFailureHandler.java +++ b/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginFailureHandler.java @@ -14,7 +14,7 @@ @Component public class Oauth2LoginFailureHandler extends SimpleUrlAuthenticationFailureHandler { - @Value("${spring.login.root-url}") + @Value("${spring.login.app-home-url}") String rootUrl; @Override diff --git a/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginSuccessHandler.java b/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginSuccessHandler.java index 013030e3..06338a87 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginSuccessHandler.java +++ b/src/main/java/kr/co/fastcampus/yanabada/common/security/oauth/Oauth2LoginSuccessHandler.java @@ -29,7 +29,7 @@ public class Oauth2LoginSuccessHandler extends SimpleUrlAuthenticationSuccessHan private final AuthService authService; private final ObjectMapper objectMapper; - @Value("${spring.login.root-url}") + @Value("${spring.login.app-home-url}") String rootUrl; @Value("${spring.login.oauth2-redirect-url}") String oauthRedirectUrl; diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java b/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java index 410a759c..b799c6bc 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java @@ -3,12 +3,9 @@ import static kr.co.fastcampus.yanabada.domain.member.entity.ProviderType.EMAIL; import static kr.co.fastcampus.yanabada.domain.member.entity.RoleType.ROLE_USER; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletResponse; import java.util.Random; import kr.co.fastcampus.yanabada.common.exception.EmailDuplicatedException; -import kr.co.fastcampus.yanabada.common.exception.JsonProcessFailedException; import kr.co.fastcampus.yanabada.common.jwt.dto.TokenIssueResponse; import kr.co.fastcampus.yanabada.common.jwt.dto.TokenRefreshResponse; import kr.co.fastcampus.yanabada.common.jwt.service.TokenService; @@ -19,7 +16,6 @@ import kr.co.fastcampus.yanabada.domain.auth.dto.request.SignUpRequest; import kr.co.fastcampus.yanabada.domain.auth.dto.response.LoginResponse; import kr.co.fastcampus.yanabada.domain.auth.dto.response.SignUpResponse; -import kr.co.fastcampus.yanabada.domain.member.dto.response.MemberDetailResponse; import kr.co.fastcampus.yanabada.domain.member.entity.Member; import kr.co.fastcampus.yanabada.domain.member.entity.ProviderType; import kr.co.fastcampus.yanabada.domain.member.repository.MemberRepository; @@ -48,6 +44,8 @@ public class AuthService { @Value("${spring.login.oauth2-password}") String oauthPassword; + @Value("${spring.cookie.secure}") + boolean secure; private final MemberRepository memberRepository; private final YanoljaPayRepository yanoljaPayRepository; @@ -55,7 +53,6 @@ public class AuthService { private final JwtProvider jwtProvider; private final AuthenticationManagerBuilder authenticationManagerBuilder; private final TokenService tokenService; - private final ObjectMapper objectMapper; @Transactional public SignUpResponse signUp(SignUpRequest signUpRequest) { @@ -168,15 +165,6 @@ private void setValueInCookie( response.addHeader("Set-Cookie", cookie.toString()); } - private String getMemberDtoJsonStr(Member member) { - try { - MemberDetailResponse memberDto = MemberDetailResponse.from(member); - return objectMapper.writeValueAsString(memberDto); - } catch (JsonProcessingException e) { - throw new JsonProcessFailedException(); - } - } - @Transactional public void logout(String refreshToken) { String email = jwtProvider.getEmail(refreshToken); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4d7f8cd7..48afa218 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -48,7 +48,10 @@ spring: login: oauth2-password: oauth2-password oauth2-redirect-url: /signin/3 - root-url: http://localhost:8080 + app-home-url: https://yanabada-fe-1r96.vercel.app + + cookie: + secure: false jwt: secretKey: yanabadaSecretKeyyanabadaSecretKeyyanabadaSecretKey