🔀 File Directory Refactor

src/main/java/com/mycom/socket/auth/config/SecurityConfig.java

@@ -1,6 +1,7 @@
 package com.mycom.socket.auth.config;
 
 import com.mycom.socket.auth.jwt.JWTFilter;
+import com.mycom.socket.auth.jwt.JWTProperties;
 import com.mycom.socket.auth.jwt.JWTUtil;
 import com.mycom.socket.auth.service.MemberDetailsService;
 import lombok.RequiredArgsConstructor;
@@ -20,6 +21,7 @@
 public class SecurityConfig{
 
     private final JWTUtil jwtUtil;
+    private final JWTProperties properties;
     private final MemberDetailsService memberDetailsService;
 
     @Bean
@@ -30,7 +32,10 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .httpBasic(AbstractHttpConfigurer::disable)
                 .formLogin(AbstractHttpConfigurer::disable)
 
-                .addFilterBefore(new JWTFilter(jwtUtil, memberDetailsService), UsernamePasswordAuthenticationFilter.class)
+                .addFilterBefore(
+                        new JWTFilter(properties, jwtUtil, memberDetailsService),
+                        UsernamePasswordAuthenticationFilter.class
+                )
 
                 .sessionManagement(session ->
                         session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))

src/main/java/com/mycom/socket/auth/controller/AuthController.java

@@ -1,16 +1,14 @@
 package com.mycom.socket.auth.controller;
 
-import com.mycom.socket.auth.dto.request.EmailRequestDto;
-import com.mycom.socket.auth.dto.request.EmailVerificationRequestDto;
-import com.mycom.socket.auth.dto.request.LoginRequestDto;
-import com.mycom.socket.auth.dto.request.RegisterRequestDto;
-import com.mycom.socket.auth.dto.response.EmailVerificationCheckResponseDto;
-import com.mycom.socket.auth.dto.response.EmailVerificationResponseDto;
-import com.mycom.socket.auth.dto.response.LoginResponseDto;
+import com.mycom.socket.auth.dto.request.EmailRequest;
+import com.mycom.socket.auth.dto.request.EmailVerificationRequest;
+import com.mycom.socket.auth.dto.request.LoginRequest;
+import com.mycom.socket.auth.dto.request.RegisterRequest;
+import com.mycom.socket.auth.dto.response.EmailVerificationResponse;
+import com.mycom.socket.auth.dto.response.LoginResponse;
+import com.mycom.socket.auth.dto.response.RegisterResponse;
 import com.mycom.socket.auth.service.AuthService;
 import com.mycom.socket.auth.service.MailService;
-import com.mycom.socket.auth.service.RateLimiter;
-import com.mycom.socket.global.exception.BaseException;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -23,44 +21,31 @@ public class AuthController {
 
     private final AuthService authService;
     private final MailService mailService;
-    private final RateLimiter rateLimiter;
 
     @PostMapping("/login")
-    public LoginResponseDto login(@Valid @RequestBody LoginRequestDto request,
-                                  HttpServletResponse response) {
+    public LoginResponse login(@Valid @RequestBody LoginRequest request,
+                               HttpServletResponse response) {
         return authService.login(request, response);
     }
 
+    @PostMapping("/register")
+    public RegisterResponse register(@Valid @RequestBody RegisterRequest request) {
+        return authService.register(request);
+    }
+
     @PostMapping("/logout")
     public void logout(HttpServletResponse response) {
         authService.logout(response);
     }
 
-    @PostMapping("/register")
-    public Long register(@Valid @RequestBody RegisterRequestDto request) {
-        return authService.register(request);
-    }
-
     @PostMapping("/verification")
-    public EmailVerificationResponseDto mailSend(@Valid @RequestBody EmailRequestDto emailRequestDto) {
-        try {
-            boolean isSuccess = mailService.sendMail(emailRequestDto.email());
-            return isSuccess ? EmailVerificationResponseDto.createSuccessResponse() : EmailVerificationResponseDto.createFailureResponse("이메일 전송에 실패했습니다.");
-        } catch (BaseException e) {
-            return EmailVerificationResponseDto.createFailureResponse(e.getMessage());
-        }
+    public EmailVerificationResponse sendVerificationEmail(@Valid @RequestBody EmailRequest request) {
+        return mailService.sendMail(request.email());
     }
 
     @PostMapping("/email/verify")
-    public EmailVerificationCheckResponseDto mailCheck(@Valid @RequestBody EmailVerificationRequestDto emailRequestDto) {
-        try{
-            rateLimiter.checkRateLimit(emailRequestDto.email());// 시도 횟수 제한
-            boolean isVerified =  mailService.verifyCode(emailRequestDto.email(), emailRequestDto.code());
-            return isVerified ? EmailVerificationCheckResponseDto.createSuccessResponse() :
-                    EmailVerificationCheckResponseDto.createFailureResponse("이메일 인증에 실패했습니다.");
-        }catch (BaseException e){
-            return EmailVerificationCheckResponseDto.createFailureResponse(e.getMessage());
-        }
+    public EmailVerificationResponse verifyEmail(@Valid @RequestBody EmailVerificationRequest request) {
+        return mailService.verifyCode(request.email(), request.code());
     }
 
 }

src/main/java/com/mycom/socket/auth/dto/request/EmailRequestDto.java → src/main/java/com/mycom/socket/auth/dto/request/EmailRequest.java

@@ -3,7 +3,7 @@
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotEmpty;
 
-public record EmailRequestDto(
+public record EmailRequest(
         @NotEmpty(message = "이메일 주소를 입력해주세요.")
         @Email(message = "유효하지 않은 이메일 형식입니다.")
         String email

src/main/java/com/mycom/socket/auth/dto/request/EmailVerificationRequestDto.java → src/main/java/com/mycom/socket/auth/dto/request/EmailVerificationRequest.java

@@ -4,7 +4,7 @@
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.Pattern;
 
-public record EmailVerificationRequestDto(
+public record EmailVerificationRequest(
         @NotEmpty(message = "이메일 주소를 입력해주세요.")
         @Email(message = "유효하지 않은 이메일 형식입니다.")
         String email,

src/main/java/com/mycom/socket/auth/dto/request/LoginRequestDto.java → src/main/java/com/mycom/socket/auth/dto/request/LoginRequest.java

@@ -3,7 +3,7 @@
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 
-public record LoginRequestDto(
+public record LoginRequest(
         @NotBlank(message = "이메일은 필수입니다")
         @Email(message = "올바른 이메일 형식이 아닙니다")
         String email,

src/main/java/com/mycom/socket/auth/dto/request/RegisterRequestDto.java → src/main/java/com/mycom/socket/auth/dto/request/RegisterRequest.java

@@ -4,7 +4,7 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 
-public record RegisterRequestDto(
+public record RegisterRequest(
         @NotBlank(message = "이메일은 필수입니다")
         @Email(message = "올바른 이메일 형식이 아닙니다")
         String email,

src/main/java/com/mycom/socket/auth/dto/response/EmailVerificationResponse.java

@@ -0,0 +1,10 @@
+package com.mycom.socket.auth.dto.response;
+
+public record EmailVerificationResponse(
+        String message
+) {
+    public static EmailVerificationResponse of(String message) {
+        return new EmailVerificationResponse(message);
+    }
+}
+

src/main/java/com/mycom/socket/auth/dto/response/LoginResponse.java

@@ -0,0 +1,10 @@
+package com.mycom.socket.auth.dto.response;
+
+public record LoginResponse(
+        String email,
+        String nickname
+) {
+    public static LoginResponse of(String email, String nickname) {
+        return new LoginResponse(email, nickname);
+    }
+}

src/main/java/com/mycom/socket/auth/dto/response/RegisterResponse.java

@@ -0,0 +1,12 @@
+package com.mycom.socket.auth.dto.response;
+
+public record RegisterResponse(
+        Long memberId,
+        String email,
+        String nickname,
+        String message
+) {
+    public static RegisterResponse of(Long memberId, String email, String nickname) {
+        return new RegisterResponse(memberId, email, nickname, "회원가입이 완료되었습니다.");
+    }
+}

src/main/java/com/mycom/socket/auth/jwt/JWTFilter.java

@@ -7,6 +7,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -15,33 +16,25 @@
 
 import java.io.IOException;
 
+@Slf4j
 @RequiredArgsConstructor
 public class JWTFilter extends OncePerRequestFilter {
 
+    private final JWTProperties jwtProperties;
     private final JWTUtil jwtUtil;
     private final MemberDetailsService memberDetailsService;
 
     @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-            throws ServletException, IOException {
-
-        String token = resolveTokenFromCookie(request);
-
+    protected void doFilterInternal(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    FilterChain filterChain) throws ServletException, IOException {
         try {
+            String token = resolveTokenFromCookie(request);
             if (StringUtils.hasText(token) && jwtUtil.validateToken(token)) {
-                String email = jwtUtil.getEmail(token);
-                UserDetails userDetails = memberDetailsService.loadUserByUsername(email);
-
-                UsernamePasswordAuthenticationToken authentication =
-                        new UsernamePasswordAuthenticationToken(
-                                userDetails,
-                                null,
-                                userDetails.getAuthorities()
-                        );
-
-                SecurityContextHolder.getContext().setAuthentication(authentication);
+                setAuthentication(token);
             }
         } catch (Exception e) {
+            log.warn("인증 처리 실패", e);
             SecurityContextHolder.clearContext();
         }
 
@@ -52,11 +45,25 @@ private String resolveTokenFromCookie(HttpServletRequest request) {
         Cookie[] cookies = request.getCookies();
         if (cookies != null) {
             for (Cookie cookie : cookies) {
-                if ("Authorization".equals(cookie.getName())) {
+                if (jwtProperties.getCookieName().equals(cookie.getName())) {
                     return cookie.getValue();
                 }
             }
         }
         return null;
     }
+
+    private void setAuthentication(String token) {
+        String email = jwtUtil.getEmail(token);
+        UserDetails userDetails = memberDetailsService.loadUserByUsername(email);
+
+        UsernamePasswordAuthenticationToken authentication =
+                new UsernamePasswordAuthenticationToken(
+                        userDetails,
+                        null,
+                        userDetails.getAuthorities()
+                );
+
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+    }
 }

src/main/java/com/mycom/socket/auth/jwt/JWTProperties.java

@@ -0,0 +1,17 @@
+package com.mycom.socket.auth.jwt;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "jwt")
+public class JWTProperties {
+    private String secret;
+    private long accessTokenValidityInSeconds = 1800;
+    private String cookieName = "Authorization";
+    private String issuer = "go_socket";
+    private boolean secureCookie = false;
+}

src/main/java/com/mycom/socket/auth/jwt/JWTUtil.java

@@ -1,11 +1,10 @@
 package com.mycom.socket.auth.jwt;
 
-import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 
 import javax.crypto.SecretKey;
 import java.nio.charset.StandardCharsets;
@@ -16,42 +15,60 @@
 public class JWTUtil {
 
     private final SecretKey secretKey;
+    private final JWTProperties jwtProperties;
 
-    public JWTUtil(@Value("${jwt.secret}") String secret) {
-        this.secretKey = Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8));
+    public JWTUtil(JWTProperties jwtProperties) {
+        this.jwtProperties = jwtProperties;
+        this.secretKey = Keys.hmacShaKeyFor(
+                jwtProperties.getSecret().getBytes(StandardCharsets.UTF_8)
+        );
     }
 
+    /**
+     * JWT 토큰 생성
+     */
     public String createToken(String email) {
-        Claims claims = Jwts.claims().subject(email).build();
         Date now = new Date();
-        // 30분
-        long accessTokenValidityInMilliseconds = 1000 * 60 * 30;
-        Date validity = new Date(now.getTime() + accessTokenValidityInMilliseconds);
+        Date validity = new Date(now.getTime() +
+                (jwtProperties.getAccessTokenValidityInSeconds() * 1000));
 
         return Jwts.builder()
-                .claims(claims)
+                .issuer(jwtProperties.getIssuer())
+                .subject(email)
                 .issuedAt(now)
                 .expiration(validity)
                 .signWith(secretKey)
                 .compact();
     }
 
+    /**
+     * 토큰 유효성 검증
+     */
     public boolean validateToken(String token) {
         try {
+            if (!StringUtils.hasText(token)) {
+                return false;
+            }
+
             Jwts.parser()
                     .verifyWith(secretKey)
+                    .requireIssuer(jwtProperties.getIssuer())
                     .build()
                     .parseSignedClaims(token);
             return true;
         } catch (Exception e) {
-            log.warn("JWT 토큰 검증 중 에러 발생: {}", e.getMessage());
+            log.warn("JWT 토큰 검증 실패", e);
             return false;
         }
     }
 
+    /**
+     * 토큰에서 이메일 추출
+     */
     public String getEmail(String token) {
         return Jwts.parser()
                 .verifyWith(secretKey)
+                .requireIssuer(jwtProperties.getIssuer())
                 .build()
                 .parseSignedClaims(token)
                 .getPayload()