[그리디] 김지우 Spring Core (배포) 7,8,9 단계 제출합니다.

README.md

@@ -0,0 +1,16 @@
+# 🔓 방탈출 예약 서비스
+
+<br>
+<img width="800" height="413" alt="image" src="https://github.com/user-attachments/assets/9ce9fd16-4341-46d0-9f62-750021db4dd6" />
+<img width="800" height="248" alt="image" src="https://github.com/user-attachments/assets/46d1c290-90ad-450c-8a0b-d05cb32ae7af" />
+<br>
+
+## 🚀 주요 기능
+
+1. **로그인**: 가입한 이메일과 비밀번호로 로그인할 수 있습니다.
+
+2. **예약**: '예약' 페이지에서 원하는 날짜, 테마, 시간을 선택하고 '예약하기' 버튼을 누르면 예약이 완료됩니다.
+
+3. **예약 확인 및 취소**: '내 예약' 페이지에서 예약 내역을 확인하거나, 원치 않는 예약을 취소할 수 있습니다.
+
+4. **예약 대기 신청**: 예약 대기를 신청하면, 취소 자리가 생겼을 때 우선적으로 예약할 기회를 드립니다.

src/main/java/auth/JwtUtils.java

@@ -0,0 +1,69 @@
+package auth;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
+import io.jsonwebtoken.JwtException;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+
+import javax.crypto.spec.SecretKeySpec;
+import java.security.Key;
+import java.util.Arrays;
+import java.util.Date;
+
+public class JwtUtils {
+
+    private final Key key;
+
+    public JwtUtils(String secretKey) {
+        this.key = new SecretKeySpec(secretKey.getBytes(), SignatureAlgorithm.HS256.getJcaName());
+    }
+
+    public String createToken(String id, String role) {
+        Claims claims = Jwts.claims().setSubject(id);
+        claims.put("role", role);
+        Date now = new Date();
+        Date validity = new Date(now.getTime() + 3600000);
+
+        return Jwts.builder()
+                .setClaims(claims)
+                .setIssuedAt(now)
+                .setExpiration(validity)
+                .signWith(key, SignatureAlgorithm.HS256)
+                .compact();
+    }
+
+    private Claims getClaims(String token) {
+        try {
+            Jws<Claims> claims = Jwts.parserBuilder()
+                    .setSigningKey(key)
+                    .build()
+                    .parseClaimsJws(token);
+            return claims.getBody();
+        } catch (JwtException | IllegalArgumentException e) {
+            throw new IllegalArgumentException("유효하지 않은 토큰입니다.");
+        }
+    }
+
+    public String getSubject(String token) {
+        return getClaims(token).getSubject();
+    }
+
+    public String getRole(String token) {
+        return getClaims(token).get("role", String.class);
+    }
+
+    public String getTokenFromCookie(HttpServletRequest request) {
+        Cookie[] cookies = request.getCookies();
+        if (cookies == null) {
+            return null;
+        }
+        return Arrays.stream(cookies)
+                .filter(cookie -> "token".equals(cookie.getName()))
+                .findFirst()
+                .map(Cookie::getValue)
+                .orElse(null);
+    }
+}

src/main/java/auth/annotation/Login.java

@@ -0,0 +1,11 @@
+package auth.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.PARAMETER)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Login {
+}

src/main/java/roomescape/ExceptionController.java

@@ -1,14 +1,33 @@
 package roomescape;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import roomescape.auth.exception.UnauthenticatedException;
 
 @ControllerAdvice
 public class ExceptionController {
+
+    private static final Logger log = LoggerFactory.getLogger(ExceptionController.class);
+
     @ExceptionHandler(Exception.class)
-    public ResponseEntity<Void> handleRuntimeException(Exception e) {
-        e.printStackTrace();
-        return ResponseEntity.badRequest().build();
+    public ResponseEntity<String> handleRuntimeException(Exception e) {
+        log.error("예상치 못한 예외가 발생했습니다.", e);
+        return ResponseEntity.internalServerError().body("서버 내부 오류가 발생했습니다.");
+    }
+
+    @ExceptionHandler(UnauthenticatedException.class)
+    public ResponseEntity<String> handleUnauthenticatedException(UnauthenticatedException e) {
+        log.error("인증되지 않은 요청입니다.", e);
+        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(e.getMessage());
+    }
+
+    @ExceptionHandler(IllegalArgumentException.class)
+    public ResponseEntity<String> handleIllegalArgumentException(IllegalArgumentException e) {
+        log.error("잘못된 요청: {}", e.getMessage(), e);
+        return ResponseEntity.badRequest().body(e.getMessage());
     }
 }

src/main/java/roomescape/RoomescapeApplication.java

@@ -3,7 +3,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"roomescape", "auth"})
 public class RoomescapeApplication {
     public static void main(String[] args) {
         SpringApplication.run(RoomescapeApplication.class, args);

src/main/java/roomescape/auth/AdminInterceptor.java

@@ -1,35 +1,33 @@
 package roomescape.auth;
 
-import jakarta.servlet.http.Cookie;
+import auth.JwtUtils;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import java.util.Arrays;
-import java.util.Optional;
-
 @Component
 public class AdminInterceptor implements HandlerInterceptor {
 
-    private final JwtTokenProvider jwtTokenProvider;
+    private final JwtUtils jwtUtils;
 
-    public AdminInterceptor(JwtTokenProvider jwtTokenProvider) {
-        this.jwtTokenProvider = jwtTokenProvider;
+    public AdminInterceptor(JwtUtils jwtUtils) {
+        this.jwtUtils = jwtUtils;
     }
 
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        Optional<Cookie> tokenCookie = findTokenCookie(request.getCookies());
+    public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, @NotNull Object handler) throws Exception {
+        String token = jwtUtils.getTokenFromCookie(request);
 
-        if (tokenCookie.isEmpty()) {
+        if (token == null) {
             response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
             return false;
         }
 
         try {
-            String token = tokenCookie.get().getValue();
-            String role = jwtTokenProvider.getRole(token);
+            String role = jwtUtils.getRole(token);
+
             if (!"ADMIN".equals(role)) {
                 response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
                 return false;
@@ -41,13 +39,4 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 
         return true;
     }
-
-    private Optional<Cookie> findTokenCookie(Cookie[] cookies) {
-        if (cookies == null) {
-            return Optional.empty();
-        }
-        return Arrays.stream(cookies)
-                .filter(cookie -> "token".equals(cookie.getName()))
-                .findFirst();
-    }
 }

src/main/java/roomescape/auth/LoginController.java

@@ -1,5 +1,8 @@
 package roomescape.auth;
 
+import auth.JwtUtils;
+import auth.annotation.Login;
+import roomescape.auth.dto.LoginMember;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.http.ResponseEntity;
@@ -8,22 +11,26 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import roomescape.auth.dto.LoginCheckResponse;
-import roomescape.auth.dto.LoginMember;
 import roomescape.auth.dto.LoginRequest;
+import roomescape.member.Member;
 import roomescape.member.MemberService;
 
 @RestController
 public class LoginController {
 
     private final MemberService memberService;
+    private final JwtUtils jwtUtils;
 
-    public LoginController(MemberService memberService) {
+    public LoginController(MemberService memberService, JwtUtils jwtUtils) {
         this.memberService = memberService;
+        this.jwtUtils = jwtUtils;
     }
 
     @PostMapping("/login")
     public ResponseEntity<Void> login(@RequestBody LoginRequest request, HttpServletResponse response) {
-        String token = memberService.login(request);
+        Member member = memberService.login(request);
+
+        String token = jwtUtils.createToken(String.valueOf(member.getId()), member.getRole());
 
         Cookie cookie = new Cookie("token", token);
         cookie.setHttpOnly(true);
@@ -45,10 +52,7 @@ public ResponseEntity<Void> logout(HttpServletResponse response) {
     }
 
     @GetMapping("/login/check")
-    public ResponseEntity<LoginCheckResponse> checkLogin(LoginMember loginMember) {
-        if (loginMember == null) {
-            return ResponseEntity.status(401).build();
-        }
+    public ResponseEntity<LoginCheckResponse> checkLogin(@Login LoginMember loginMember) {
         return ResponseEntity.ok(new LoginCheckResponse(loginMember.getName()));
     }
 }