diff --git a/src/main/java/com/example/oneul/domain/user/command/UserCommandService.java b/src/main/java/com/example/oneul/domain/user/service/UserService.java similarity index 65% rename from src/main/java/com/example/oneul/domain/user/command/UserCommandService.java rename to src/main/java/com/example/oneul/domain/user/service/UserService.java index 3aebf90..fc08e5b 100644 --- a/src/main/java/com/example/oneul/domain/user/command/UserCommandService.java +++ b/src/main/java/com/example/oneul/domain/user/service/UserService.java @@ -1,4 +1,4 @@ -package com.example.oneul.domain.user.command; +package com.example.oneul.domain.user.service; import javax.servlet.http.HttpSession; @@ -7,8 +7,8 @@ import com.example.oneul.domain.user.domain.UserEntity; import org.springframework.stereotype.Service; @Service -public interface UserCommandService { +public interface UserService { UserEntity signUp(UserEntity userEntity, HttpSession httpSession); UserEntity login(UserEntity userEntity , HttpSession httpSession); - UserEntity logout(UserEntity userEntity, HttpSession httpSession); + void logout(UserEntity userEntity, HttpSession httpSession); } diff --git a/src/main/java/com/example/oneul/domain/user/command/UserCommandServiceImpl.java b/src/main/java/com/example/oneul/domain/user/service/UserServiceImpl.java similarity index 79% rename from src/main/java/com/example/oneul/domain/user/command/UserCommandServiceImpl.java rename to src/main/java/com/example/oneul/domain/user/service/UserServiceImpl.java index 187a5d6..fed7bbd 100644 --- a/src/main/java/com/example/oneul/domain/user/command/UserCommandServiceImpl.java +++ b/src/main/java/com/example/oneul/domain/user/service/UserServiceImpl.java @@ -1,4 +1,4 @@ -package com.example.oneul.domain.user.command; +package com.example.oneul.domain.user.service; import javax.servlet.http.HttpSession; @@ -15,12 +15,12 @@ import org.springframework.transaction.annotation.Transactional; @Service @Transactional -public class UserCommandServiceImpl implements UserCommandService { +public class UserServiceImpl implements UserService { private final UserRepository userRepository; - private final Logger log = LoggerFactory.getLogger(UserCommandServiceImpl.class); + private final Logger log = LoggerFactory.getLogger(UserServiceImpl.class); private final PasswordEncoder passwordEncoder; - public UserCommandServiceImpl(UserRepository userRepository, PasswordEncoder passwordEncoder){ + public UserServiceImpl(UserRepository userRepository, PasswordEncoder passwordEncoder){ this.userRepository = userRepository; this.passwordEncoder = passwordEncoder; } @@ -51,8 +51,10 @@ public class UserCommandServiceImpl implements UserCommandService { } @Override - public UserEntity logout(UserEntity userEntity, HttpSession httpSession){ - return new UserEntity(); + public void logout(UserEntity userEntity, HttpSession httpSession){ + UserEntity user = (UserEntity) httpSession.getAttribute("user"); + if(user == null) return ; + httpSession.removeAttribute("user"); } } diff --git a/src/main/java/com/example/oneul/global/util/LoginCheckInterceptor.java b/src/main/java/com/example/oneul/global/util/LoginCheckInterceptor.java index e6a369a..97adbad 100644 --- a/src/main/java/com/example/oneul/global/util/LoginCheckInterceptor.java +++ b/src/main/java/com/example/oneul/global/util/LoginCheckInterceptor.java @@ -6,21 +6,25 @@ import javax.servlet.http.HttpSession; import com.example.oneul.domain.user.domain.UserEntity; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.servlet.HandlerInterceptor; public class LoginCheckInterceptor implements HandlerInterceptor{ + @Value("${login-page}") + private String loginPage; + @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { HttpSession httpSession = request.getSession(false); if(httpSession == null){ - response.sendRedirect("www.naver.com"); + response.sendRedirect(loginPage); return false; } UserEntity userEntity = (UserEntity) httpSession.getAttribute("user"); if(userEntity == null){ - response.sendRedirect("www.google.com"); + response.sendRedirect(loginPage); return false; } return true; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b223d5b..7f89a1a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -27,3 +27,4 @@ logging: hibernate: SQL: DEBUG +log-in-page: www.naver.com \ No newline at end of file