관리자 관리수정, 에러코드 공통 추가

src/main/java/com/kamco/cd/kamcoback/config/SecurityConfig.java

@@ -6,12 +6,14 @@ import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -40,21 +42,21 @@ public class SecurityConfig {
         customAuthenticationProvider) // 로그인 패스워드 비교방식 스프링 기본 Provider 사용안함 커스텀 사용
       .authorizeHttpRequests(
         auth ->
-          auth.anyRequest().permitAll());
-//                  requestMatchers(HttpMethod.OPTIONS, "/**")
-//                    .permitAll() // preflight 허용
-//                    .requestMatchers(
-//                        "/api/auth/signin",
-//                        "/api/auth/refresh",
-//                        "/swagger-ui/**",
-//                        "/v3/api-docs/**")
-//                    .permitAll()
-//                    .anyRequest()
-//                    .authenticated())
-//        .addFilterBefore(
-//            jwtAuthenticationFilter,
-//            UsernamePasswordAuthenticationFilter
-//                .class) // 요청 들어오면 먼저 JWT 토큰 검사 후 security context 에 사용자 정보 저장.
+          auth.requestMatchers(HttpMethod.OPTIONS, "/**")
+            .permitAll() // preflight 허용
+            .requestMatchers(
+              "/api/auth/signin",
+              "/api/auth/refresh",
+              "/swagger-ui/**",
+              "/api/members/{memberId}/password",
+              "/v3/api-docs/**")
+            .permitAll()
+            .anyRequest()
+            .authenticated())
+      .addFilterBefore(
+        jwtAuthenticationFilter,
+        UsernamePasswordAuthenticationFilter
+          .class) // 요청 들어오면 먼저 JWT 토큰 검사 후 security context 에 사용자 정보 저장.
     ;
 
     return http.build();

src/main/java/com/kamco/cd/kamcoback/config/api/ApiResponseDto.java

@@ -20,9 +20,11 @@ public class ApiResponseDto<T> {
   @JsonInclude(JsonInclude.Include.NON_NULL)
   private T errorData;
 
-  @JsonIgnore private HttpStatus httpStatus;
+  @JsonIgnore
+  private HttpStatus httpStatus;
 
-  @JsonIgnore private Long errorLogUid;
+  @JsonIgnore
+  private Long errorLogUid;
 
   public ApiResponseDto(T data) {
     this.data = data;
@@ -47,7 +49,7 @@ public class ApiResponseDto<T> {
   }
 
   public ApiResponseDto(
-      ApiResponseCode code, String message, HttpStatus httpStatus, Long errorLogUid) {
+    ApiResponseCode code, String message, HttpStatus httpStatus, Long errorLogUid) {
     this.error = new Error(code.getId(), message);
     this.httpStatus = httpStatus;
     this.errorLogUid = errorLogUid;
@@ -88,17 +90,17 @@ public class ApiResponseDto<T> {
   }
 
   public static ApiResponseDto<String> createException(
-      ApiResponseCode code, String message, HttpStatus httpStatus) {
+    ApiResponseCode code, String message, HttpStatus httpStatus) {
     return new ApiResponseDto<>(code, message, httpStatus);
   }
 
   public static ApiResponseDto<String> createException(
-      ApiResponseCode code, String message, HttpStatus httpStatus, Long errorLogUid) {
+    ApiResponseCode code, String message, HttpStatus httpStatus, Long errorLogUid) {
     return new ApiResponseDto<>(code, message, httpStatus, errorLogUid);
   }
 
   public static <T> ApiResponseDto<T> createException(
-      ApiResponseCode code, String message, T data) {
+    ApiResponseCode code, String message, T data) {
     return new ApiResponseDto<>(code, message, data);
   }
 
@@ -114,7 +116,9 @@ public class ApiResponseDto<T> {
     }
   }
 
-  /** Error가 아닌 Business상 성공이거나 실패인 경우, 메세지 함께 전달하기 위한 object */
+  /**
+   * Error가 아닌 Business상 성공이거나 실패인 경우, 메세지 함께 전달하기 위한 object
+   */
   @Getter
   public static class ResponseObj {
 
@@ -164,6 +168,9 @@ public class ApiResponseDto<T> {
     NOT_FOUND_USER_FOR_EMAIL("이메일로 유저를 찾을 수 없습니다."),
     NOT_FOUND_USER("사용자를 찾을 수 없습니다."),
     UNPROCESSABLE_ENTITY("이 데이터는 삭제할 수 없습니다."),
+    LOGIN_ID_NOT_FOUND("아이디를 잘못 입력하셨습니다."),
+    LOGIN_PASSWORD_MISMATCH("비밀번호를 잘못 입력하셨습니다."),
+    LOGIN_PASSWORD_EXCEEDED("비밀번호 오류 횟수를 초과하여 이용하실 수 없습니다.\n로그인 오류에 대해 관리자에게 문의하시기 바랍니다."),
     INVALID_EMAIL_TOKEN(
         "You can only reset your password within 24 hours from when the email was sent.\n"
             + "To reset your password again, please submit a new request through \"Forgot"

src/main/java/com/kamco/cd/kamcoback/config/enums/EnumType.java

@@ -5,4 +5,17 @@ public interface EnumType {
   String getId();
 
   String getText();
+
+  // code로 text
+  static <E extends Enum<E> & EnumType> E fromId(Class<E> enumClass, String id) {
+    if (id == null) {
+      return null;
+    }
+    for (E e : enumClass.getEnumConstants()) {
+      if (id.equalsIgnoreCase(e.getId())) {
+        return e;
+      }
+    }
+    return null; // 못 찾으면 null
+  }
 }