Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEATUR] GlobalExceptionHandler & 비밀번호 암호화 #25

Merged
merged 2 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class AuthRequest {
private String email;

@NotEmpty(message = "패스워드 입력은 필수 입니다.")
@Size(min = 3, max = 15)
@Size(min = 8)
// @Pattern(등등 추가)
private String password;

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/HookKiller/server/auth/service/AuthService.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;

@Service
Expand All @@ -23,6 +24,7 @@ public class AuthService {

private final JwtTokenProvider jwtTokenProvider;
private final UserRepository userRepository;
private final PasswordEncoder passwordEncoder;

private static final String BEARER = "Bearer ";

Expand Down
18 changes: 18 additions & 0 deletions src/main/java/HookKiller/server/common/dto/ErrorResponse.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package HookKiller.server.common.dto;

import lombok.Getter;

@Getter
public class ErrorResponse {

private final boolean success = false;
private final int statusCode;
private final String errorCode;
private final String reason;

public ErrorResponse(ErrorDetail errorDetail) {
this.statusCode = errorDetail.getStatusCode();
this.errorCode = errorDetail.getErrorCode();
this.reason = errorDetail.getReason();
}
}
82 changes: 82 additions & 0 deletions src/main/java/HookKiller/server/config/GlobalExceptionHandler.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
package HookKiller.server.config;


import HookKiller.server.common.dto.ErrorDetail;
import HookKiller.server.common.dto.ErrorResponse;
import HookKiller.server.common.exception.BaseErrorCode;
import HookKiller.server.common.exception.BaseException;
import HookKiller.server.common.exception.GlobalException;
import HookKiller.server.common.util.UserUtils;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.util.ContentCachingRequestWrapper;
import org.springframework.web.util.UriComponentsBuilder;

import static HookKiller.server.common.exception.GlobalException.METHOD_ARGUMENT_ERROR;

@Slf4j
@RestControllerAdvice
public class GlobalExceptionHandler {

@ExceptionHandler(Exception.class)
protected ResponseEntity<ErrorResponse> internalServerExceptionHandle(
Exception e, HttpServletRequest req) throws Exception {
final ContentCachingRequestWrapper cachingRequest = (ContentCachingRequestWrapper) req;
final Long userId = UserUtils.getCurrentUserId();
String url =
UriComponentsBuilder.fromHttpRequest(new ServletServerHttpRequest(req))
.build()
.toUriString();
log.error(String.valueOf(e));
GlobalException internalServerError = GlobalException.INTERNAL_SERVER_ERRORS;
ErrorResponse errorResponse = new ErrorResponse(internalServerError.getErrorDetail());

return ResponseEntity.status(HttpStatus.valueOf(internalServerError.getStatusCode()))
.body(errorResponse);
}

// TODO : 소셜로그인 구현시 API에 대한 에러 Handling구현

// @ExceptionHandler(OuterServerException.class)
// protected ResponseEntity<ErrorResponse> outerServerExceptionHandle(OuterServerException e) {
// ErrorDetail errorDetail =
// ErrorDetail.of(e.getStatusCode(), e.getErrorCode(), e.getReason());
// ErrorResponse errorResponse = new ErrorResponse(errorDetail);
// return ResponseEntity.status(HttpStatus.valueOf(errorDetail.getStatusCode()))
// .body(errorResponse);
// }

@ExceptionHandler(BaseException.class)
protected ResponseEntity<ErrorResponse> baseExceptionHandle(
BaseException e, HttpServletRequest req) {
BaseErrorCode code = e.getErrorCode();
ErrorDetail errorDetail = code.getErrorDetail();
ErrorResponse errorResponse = new ErrorResponse(errorDetail);
return ResponseEntity.status(HttpStatus.valueOf(errorDetail.getStatusCode()))
.body(errorResponse);
}

@ExceptionHandler(MethodArgumentNotValidException.class)
public ResponseEntity<ErrorResponse> ArgumentNotValidHandle(
MethodArgumentNotValidException exception, HttpServletRequest req) {
ErrorDetail reason =
ErrorDetail.builder()
.statusCode(METHOD_ARGUMENT_ERROR.getStatusCode())
.errorCode(METHOD_ARGUMENT_ERROR.getErrorCode())
.reason(
exception
.getBindingResult()
.getAllErrors()
.get(0)
.getDefaultMessage())
.build();
ErrorResponse errorResponse = new ErrorResponse(reason);
return ResponseEntity.status(errorResponse.getStatusCode()).body(errorResponse);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
.authorizeHttpRequests(authorization -> authorization
.requestMatchers(
"/login",
"/join", "/health").permitAll()
"/register", "/health").permitAll()
.requestMatchers("/user/**").authenticated() // 인증이 되면 들어갈 수 있음
.requestMatchers("/admin/**").hasAuthority("ADMIN") // 관리자 권한만 들어갈 수 있음
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import HookKiller.server.user.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

Expand All @@ -17,6 +18,7 @@ public class UserService {

private final JwtTokenProvider jwtTokenProvider;
private final UserRepository userRepository;
private final PasswordEncoder passwordEncoder;

@Transactional
public ResponseEntity<AuthResponse> registerUser(RegisterRequest request) {
Expand All @@ -26,7 +28,7 @@ public ResponseEntity<AuthResponse> registerUser(RegisterRequest request) {

User user = userRepository.save(User.builder()
.email(request.getEmail())
.password(request.getPassword())
.password(passwordEncoder.encode(request.getPassword()))
.nickName(request.getNickName())
.role(request.getRole())
.build());
Expand Down
8 changes: 3 additions & 5 deletions src/main/resources/data.sql
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
select 1 from dual;

--insert into tbl_user(is_deleted, created_at, id, login_at, update_at, uuid_id, email, login_type, nick_name, password,
-- insert into tbl_user(is_deleted, created_at, id, login_at, update_at, uuid_id, email, login_type, nick_name, password,
-- role, status, thumbnail)
-- values (false, now(), now(), now(), now(), 1, 'bons', 'GOOGLE', 'ddd', 'ddd', 'ADMIN', 'ACTIVE', 'ADFASF');
--
-- insert into tbl_user_login_uuid(expriation_at, id, user_id, uuid_key)
-- values (now(), 1, 1, 'adsfasdf');

insert into tbl_user (email, password, nick_name, role)
values ("[email protected]", "1111", "관리자", "ADMIN");
insert into tbl_user (email, password, nick_name, role) values ("[email protected]", "1111", "관리자", "ADMIN");


insert into tbl_user (email, password, nick_name, role)
values ("[email protected]", "1111", "사용자", "USER");
insert into tbl_user (email, password, nick_name, role) values ("[email protected]", "1111", "사용자", "USER");