회원가입 및 로그인 기능 추가

build.gradle

@@ -47,6 +47,8 @@ dependencies {
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
 
+
+
     /**
      * (10/11) Intellij 내부적으로 JUnit을 지원해주고 있습니다.
      * 따라서 아래 jupiter를 설정하면, version conflict로 인해 테스트코드가 정상적으로 동작하지 않을 수 있습니다.(MemberService Test 코드 작성 중 발견)
@@ -55,8 +57,6 @@ dependencies {
     // JUnit5의 경우 api, engine을 함께 사용해야 한다.
 //    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
 //    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
-
-    testRuntimeOnly 'com.h2database:h2'
 }
 
 test {

src/main/java/me/naming/onlineshoppingmall/config/RestResponseEntityExceptionHandler.java

@@ -2,9 +2,8 @@
 
 import java.time.LocalDateTime;
 import me.naming.onlineshoppingmall.domain.ResponseData;
-import org.springframework.http.HttpHeaders;
+import me.naming.onlineshoppingmall.exception.MessageException;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -17,18 +16,22 @@
 @ControllerAdvice
 public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionHandler {
 
-  @ExceptionHandler(value = { RuntimeException.class })
-  protected ResponseEntity handleConflict(RuntimeException ex, WebRequest request) {
-    HttpHeaders httpHeaders = new HttpHeaders();
-
-    httpHeaders.setContentType(MediaType.valueOf(MediaType.APPLICATION_JSON_VALUE));
+  @ExceptionHandler(value = { MessageException.class })
+  protected ResponseEntity handleConflict(MessageException messageException, WebRequest request) {
     String path = ((ServletWebRequest)request).getRequest().getRequestURI();
+    int code;
+
+    if(messageException.getStatusCode() != 0) {
+      code = messageException.getStatusCode();
+    } else {
+      code = HttpStatus.INTERNAL_SERVER_ERROR.value();
+    }
 
     ResponseData responseData = ResponseData.builder()
         .localDateTime(LocalDateTime.now())
-        .status(HttpStatus.INTERNAL_SERVER_ERROR)
+        .statusCode(code)
         .path(path)
-        .message(ex.getMessage())
+        .message(messageException.getMessage())
         .build();
 
     return new ResponseEntity<>(responseData, HttpStatus.INTERNAL_SERVER_ERROR);

src/main/java/me/naming/onlineshoppingmall/constant/CommonConstant.java

@@ -4,4 +4,5 @@
 public class CommonConstant {
   private CommonConstant() {};
 
+  public static final String LOGIN_INFO = "loginInfo";
 }

src/main/java/me/naming/onlineshoppingmall/domain/Member.java

@@ -34,16 +34,15 @@ public class Member {
 
   @Column(name = "EMAIL")
   @NotNull
-//  @Pattern(regexp = "^[\\w!#$%&'*+/=?`{|}~^-]+(?:\\.[\\w!#$%&'*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$")
   @Email(message = "이메일 형식에 맞지 않습니다.")
   private String email;
 
   // 영문(소문자, 대문자), 숫자, 특수문자 조합 9~12자리 조합
   @Column(name = "PASSWORD")
   @NotNull
   @Setter
-//  @Pattern(regexp = "^(?=.*\\d)(?=.*[~`!@#$%\\^&*()-])(?=.*[a-z])(?=.*[A-Z]).{9,12}$",
-//      message = "비밀번호는 영문 대,소문자와 숫자, 특수기호가 적어도 1개 이상씩 포함된 9자 ~ 12자의 비밀번호여야 합니다.")
+  @Pattern(regexp = "^(?=.*\\d)(?=.*[~`!@#$%\\^&*()-])(?=.*[a-z])(?=.*[A-Z]).{9,12}$",
+      message = "비밀번호는 영문 대,소문자와 숫자, 특수기호가 적어도 1개 이상씩 포함된 9자 ~ 12자의 비밀번호여야 합니다.")
   private String password;
 
   @Column(name = "NAME", length = 30)

src/main/java/me/naming/onlineshoppingmall/domain/ResponseData.java

@@ -11,13 +11,13 @@
 @Getter
 public class ResponseData {
   private LocalDateTime localDateTime;
-  private HttpStatus status;
+  private int statusCode;
   private String path;
   private String message;
 
-  public ResponseData(LocalDateTime localDateTime, HttpStatus status, String path, String message) {
+  public ResponseData(LocalDateTime localDateTime, int statusCode, String path, String message) {
     this.localDateTime = localDateTime;
-    this.status = status;
+    this.statusCode = statusCode;
     this.path = path;
     this.message = message;
   }

src/main/java/me/naming/onlineshoppingmall/exception/MessageException.java

@@ -0,0 +1,23 @@
+package me.naming.onlineshoppingmall.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class MessageException extends RuntimeException{
+
+  private int statusCode;
+
+  public MessageException(String message) {
+    super(message);
+    this.statusCode = HttpStatus.INTERNAL_SERVER_ERROR.value();
+  }
+
+  public MessageException(String message, int statusCode) {
+    super(message);
+    this.statusCode = statusCode;
+  }
+
+  public int getStatusCode() {
+    return statusCode;
+  }
+
+}

src/main/java/me/naming/onlineshoppingmall/service/AESServiceImpl.java

@@ -2,13 +2,8 @@
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import javax.crypto.BadPaddingException;
+import java.security.GeneralSecurityException;
 import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import org.apache.commons.codec.binary.Base64;
@@ -38,20 +33,10 @@ public String encrypt(String plainText) {
       cipher.init(Cipher.ENCRYPT_MODE, keySpec, new IvParameterSpec(aesKey.substring(0, 16).getBytes()));
       encrypted = cipher.doFinal(plainText.getBytes(StandardCharsets.UTF_8.name()));
 
-    } catch (IllegalBlockSizeException e) {
-      logger.error("** IllegalBlockSizeException : {}", e);
-    } catch (BadPaddingException e) {
-      logger.error("** BadPaddingException : {}", e);
+    } catch (GeneralSecurityException e) {
+      logger.error("** GeneralSecurityException : {}", e);
     } catch (UnsupportedEncodingException e) {
       logger.error("** UnsupportedEncodingException : {}", e);
-    } catch (InvalidKeyException e) {
-      logger.error("** InvalidKeyException : {}", e);
-    } catch (InvalidAlgorithmParameterException e) {
-      logger.error("** InvalidAlgorithmParameterException : {}", e);
-    } catch (NoSuchAlgorithmException e) {
-      logger.error("** NoSuchAlgorithmException : {}", e);
-    } catch (NoSuchPaddingException e) {
-      logger.error("** NoSuchPaddingException : {}", e);
     }
     return new String(Base64.encodeBase64(encrypted));
   }
@@ -68,20 +53,8 @@ public String decrypt(String encryptText) {
       byte[] byteStr = Base64.decodeBase64(encryptText.getBytes());
       aesDecode =  new String(cipher.doFinal(byteStr), StandardCharsets.UTF_8.name());
 
-    } catch (UnsupportedEncodingException e) {
+    } catch (Exception e) {
       logger.error("** Decode UnsupportedEncodingException : {}", e);
-    } catch (IllegalBlockSizeException e) {
-      logger.error("** Decode IllegalBlockSizeException : {}", e);
-    } catch (BadPaddingException e) {
-      logger.error("** Decode BadPaddingException : {}", e);
-    } catch (InvalidKeyException e) {
-      logger.error("** Decode InvalidKeyException : {}", e);
-    } catch (InvalidAlgorithmParameterException e) {
-      logger.error("** Decode InvalidAlgorithmParameterException : {}", e);
-    } catch (NoSuchAlgorithmException e) {
-      logger.error("** Decode NoSuchAlgorithmException : {}", e);
-    } catch (NoSuchPaddingException e) {
-      logger.error("** Decode NoSuchPaddingException : {}", e);
     }
 
     if(StringUtils.isEmpty(aesDecode)) throw new RuntimeException("복호화 에러");

src/main/java/me/naming/onlineshoppingmall/service/MemberService.java

@@ -1,36 +1,33 @@
 package me.naming.onlineshoppingmall.service;
 
+import java.util.concurrent.RejectedExecutionException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import lombok.extern.log4j.Log4j2;
+import me.naming.onlineshoppingmall.constant.CommonConstant;
 import me.naming.onlineshoppingmall.domain.Member;
 import me.naming.onlineshoppingmall.repository.MemberRepository;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+@Log4j2
 @Service
 public class MemberService {
 
   private final MemberRepository memberRepository;
   private final CryptoService shaService;
   private final CryptoService aesService;
 
-  @Autowired
-  public MemberService(SHAServiceImpl shaService, AESServiceImpl aesService,
-      MemberRepository memberRepository) {
+  public MemberService(SHAServiceImpl shaService, AESServiceImpl aesService, MemberRepository memberRepository) {
     this.shaService = shaService;
     this.aesService = aesService;
     this.memberRepository = memberRepository;
   }
 
-  private final Logger logger = LogManager.getLogger(MemberService.class);
-
   public void signUp(Member member) {
 
     if (memberRepository.findByEmail(member.getEmail()) != null) {
-      throw new RuntimeException("이미 가입된 이메일 주소입니다.");
+      throw new RejectedExecutionException("이미 가입된 이메일 주소입니다.");
     }
     member.setMemberStatus(Member.MemberStatus.DEFAULT);
 
@@ -52,13 +49,12 @@ public void doLogin(String email, String password, HttpServletRequest request) {
     Member member = memberRepository.findMemnoAndPasswordByEmail(email);
     String encodePassword = shaService.encrypt(password);
     if(member == null) {
-      throw new RuntimeException("존재하지 않는 이메일 주소 입니다.");
+      throw new NullPointerException("존재하지 않는 이메일 주소 입니다.");
     }
     if(!member.getPassword().equals(encodePassword)) {
-      throw new RuntimeException("비밀번호가 틀렸습니다");
+      throw new IllegalArgumentException("비밀번호가 틀렸습니다");
     }
 
-    String encodeMemNo = aesService.encrypt(String.valueOf(member.getMemNo()));
-    httpSession.setAttribute("loginInfo", encodeMemNo);
+    httpSession.setAttribute(CommonConstant.LOGIN_INFO, member.getMemNo());
   }
 }

src/main/java/me/naming/onlineshoppingmall/service/SHAServiceImpl.java

@@ -3,20 +3,18 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+@Log4j2
 @Service
 public class SHAServiceImpl implements CryptoService {
 
   @Value("${encrypt.shaKey}")
   private String shaKey;
 
-  private static final Logger logger = LogManager.getLogger(SHAServiceImpl.class);
-
   @Override
   public String encrypt(String plainText) {
     String generatedPassword = null;
@@ -30,7 +28,7 @@ public String encrypt(String plainText) {
       }
       generatedPassword = sb.toString();
     } catch (NoSuchAlgorithmException e) {
-      logger.error("** SHA512 NoSuchAlgorithmException : {}", e);
+      log.error("** SHA512 NoSuchAlgorithmException : {}", e);
     }
 
     if(StringUtils.isEmpty(generatedPassword)) {