[그리디] 황혜림 Spring Core (배포) 7,8,9 단계 제출합니다.

src/main/java/jwt/AuthConfig.java

@@ -0,0 +1,16 @@
+package jwt;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AuthConfig {
+
+    @Bean
+    public JwtUtils jwtUtils(
+            @Value("${roomescape.auth.jwt.secret}") String secretKey,
+            @Value("${roomescape.auth.jwt.expiration}") long expirationTime) {
+        return new JwtUtils(secretKey, expirationTime);
+    }
+}

src/main/java/roomescape/auth/JwtTokenProvider.java → src/main/java/jwt/JwtUtils.java

@@ -1,21 +1,20 @@
-package roomescape.auth;
+package jwt;
 
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import roomescape.domain.member.Member;
 
-@Component
-public class JwtTokenProvider {
+public class JwtUtils {
 
-    @Value("${roomescape.auth.jwt.secret}")
-    private String secretKey;
-    @Value("${roomescape.auth.jwt.expiration}")
-    private long expirationTime;
+    private final String secretKey;
+    private final long expirationTime;
 
+    public JwtUtils(String secretKey, long expirationTime) {
+        this.secretKey = secretKey;
+        this.expirationTime = expirationTime;
+    }
     public String createToken(Member member) {
         return Jwts.builder()
                 .setSubject(member.getId().toString())

src/main/java/roomescape/DataLoader.java

@@ -0,0 +1,23 @@
+package roomescape;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import roomescape.domain.member.Member;
+import roomescape.domain.member.MemberRepository;
+
+@Component
+@Profile("prod")
+@RequiredArgsConstructor
+public class DataLoader implements CommandLineRunner {
+
+    private final MemberRepository memberRepository;
+
+
+    @Override
+    public void run(String... args) throws Exception {
+        memberRepository.save(new Member("어드민", "[email protected]", "password", "ADMIN"));
+        memberRepository.save(new Member("브라운", "[email protected]", "password", "USER"));
+    }
+}

src/main/java/roomescape/RoomescapeApplication.java

@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
+@ComponentScan(basePackages = {"roomescape", "jwt"})
 public class RoomescapeApplication {
     public static void main(String[] args) {
         SpringApplication.run(RoomescapeApplication.class, args);

src/main/java/roomescape/TestDataLoader.java

@@ -0,0 +1,48 @@
+package roomescape;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import roomescape.domain.member.MemberRepository;
+import roomescape.domain.reservation.Reservation;
+import roomescape.domain.reservation.ReservationRepository;
+import roomescape.domain.theme.ThemeRepository;
+import roomescape.domain.time.Time;
+import roomescape.domain.member.Member;
+import roomescape.domain.theme.Theme;
+import roomescape.domain.time.TimeRepository;
+
+
+@Component
+@Profile("test")
+@RequiredArgsConstructor
+public class TestDataLoader implements CommandLineRunner {
+
+    private final MemberRepository memberRepository;
+    private final ThemeRepository themeRepository;
+    private final TimeRepository timeRepository;
+    private final ReservationRepository reservationRepository;
+
+    @Override
+    public void run(String... args) throws Exception {
+        Member admin = memberRepository.save(new Member("어드민", "[email protected]", "password", "ADMIN"));
+        Member user = memberRepository.save(new Member("브라운", "[email protected]", "password", "USER"));
+
+        Theme theme1 = themeRepository.save(new Theme("테마1", "테마1입니다."));
+        Theme theme2 = themeRepository.save(new Theme("테마2", "테마2입니다."));
+        Theme theme3 = themeRepository.save(new Theme("테마3", "테마3입니다."));
+
+        Time time1 = timeRepository.save(new Time("10:00"));
+        Time time2 = timeRepository.save(new Time("12:00"));
+        Time time3 = timeRepository.save(new Time("14:00"));
+        Time time4 = timeRepository.save(new Time("16:00"));
+        Time time5 = timeRepository.save(new Time("18:00"));
+        Time time6 = timeRepository.save(new Time("20:00"));
+
+        reservationRepository.save(new Reservation("", "2024-03-01", time1, theme1, admin));
+        reservationRepository.save(new Reservation("", "2024-03-01", time2, theme2, admin));
+        reservationRepository.save(new Reservation("", "2024-03-01", time3, theme3, admin));
+        reservationRepository.save(new Reservation("브라운", "2024-03-01", time1, theme2));
+    }
+}

src/main/java/roomescape/auth/AdminAuthInterceptor.java

@@ -11,20 +11,18 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
-import roomescape.domain.member.Member;
-import roomescape.domain.member.MemberService;
 import roomescape.exception.CustomException;
 
 @Component
 @RequiredArgsConstructor
 public class AdminAuthInterceptor implements HandlerInterceptor {
 
-    private final CookieUtil cookieUtil;
+    private final CookieUtils cookieUtils;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         Cookie[] cookies = request.getCookies();
-        String token = cookieUtil.extractTokenFromCookies(cookies);
+        String token = cookieUtils.extractTokenFromCookies(cookies);
 
         if (StringUtils.isBlank(token)) {
             throw new CustomException(EMPTY_TOKEN);

src/main/java/roomescape/auth/AuthController.java

@@ -16,13 +16,13 @@
 public class AuthController {
 
     private final AuthService authService;
-    private final CookieUtil cookieUtil;
+    private final CookieUtils cookieUtils;
 
     @PostMapping("/login")
     public ResponseEntity<Void> login(@Valid @RequestBody LoginRequest loginRequest,
             HttpServletResponse response) {
         String token = authService.login(loginRequest);
-        response.addCookie(cookieUtil.createTokenCookie(token));
+        response.addCookie(cookieUtils.createTokenCookie(token));
         return ResponseEntity.ok().build();
     }
 
@@ -39,7 +39,7 @@ public ResponseEntity<MemberResponse> checkLogin(HttpServletRequest request,
 
     @PostMapping("/logout")
     public ResponseEntity logout(HttpServletResponse response) {
-        response.addCookie(cookieUtil.createLogoutCookie());
+        response.addCookie(cookieUtils.createLogoutCookie());
         return ResponseEntity.ok().build();
     }
 }

src/main/java/roomescape/auth/AuthInterceptor.java

@@ -7,6 +7,7 @@
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import jwt.JwtUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -19,20 +20,20 @@
 public class AuthInterceptor implements HandlerInterceptor {
 
     private final MemberService memberService;
-    private final JwtTokenProvider jwtTokenProvider;
-    private final CookieUtil cookieUtil;
+    private final JwtUtils jwtUtils;
+    private final CookieUtils cookieUtils;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
             throws Exception {
         Cookie[] cookies = request.getCookies();
-        String token = cookieUtil.extractTokenFromCookies(cookies);
+        String token = cookieUtils.extractTokenFromCookies(cookies);
 
         if (StringUtils.isBlank(token)) {
             throw new CustomException(EMPTY_TOKEN);
         }
 
-        Long memberId = jwtTokenProvider.extractMemberId(token);
+        Long memberId = jwtUtils.extractMemberId(token);
         Member member = memberService.getMemberById(memberId)
                 .orElseThrow(() -> new CustomException(INVALID_TOKEN));
 

src/main/java/roomescape/auth/AuthService.java

@@ -2,6 +2,7 @@
 
 import static roomescape.exception.ErrorCode.INVALID_EMAILPASSWORD;
 
+import jwt.JwtUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import roomescape.domain.member.Member;
@@ -13,11 +14,11 @@
 public class AuthService {
 
     private final MemberRepository memberRepository;
-    private final JwtTokenProvider jwtTokenProvider;
+    private final JwtUtils jwtUtils;
 
     public String login(LoginRequest loginRequest) {
         Member member = memberRepository.findByEmailAndPassword(loginRequest.email(), loginRequest.password())
                 .orElseThrow(() -> new CustomException(INVALID_EMAILPASSWORD));
-        return jwtTokenProvider.createToken(member);
+        return jwtUtils.createToken(member);
     }
 }

src/main/java/roomescape/auth/CookieUtil.java → src/main/java/roomescape/auth/CookieUtils.java

@@ -5,11 +5,11 @@
 import org.springframework.stereotype.Component;
 
 @Component
-public class CookieUtil {
+public class CookieUtils {
 
     private final String cookieName;
 
-    public CookieUtil(@Value("${roomescape.auth.cookie.name:token}") String cookieName) {
+    public CookieUtils(@Value("${roomescape.auth.cookie.name:token}") String cookieName) {
         this.cookieName = cookieName;
     }
 

src/main/resources/application.properties

@@ -13,3 +13,5 @@ roomescape.auth.jwt.secret= Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=
 #Access Token expiration (1h = 3600000ms)
 roomescape.auth.jwt.expiration=3600000
 roomescape.auth.cookie.name=token
+
+spring.profiles.active=prod

src/test/java/roomescape/JpaTest.java

@@ -8,13 +8,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import roomescape.domain.member.MemberRepository;
 import roomescape.domain.reservation.ReservationRepository;
 import roomescape.domain.theme.ThemeRepository;
 import roomescape.domain.time.Time;
 import roomescape.domain.time.TimeRepository;
 
+@ActiveProfiles("test")
 @DataJpaTest
 @ContextConfiguration(classes = {TimeRepository.class, ReservationRepository.class, MemberRepository.class,
         ThemeRepository.class, RoomescapeApplication.class})

src/test/java/roomescape/MissionStepTest.java

@@ -6,25 +6,33 @@
 import io.restassured.response.Response;
 import jakarta.transaction.Transactional;
 import java.util.List;
+import jwt.JwtUtils;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.stereotype.Component;
 import org.springframework.test.annotation.DirtiesContext;
 
 import java.util.HashMap;
 import java.util.Map;
+import org.springframework.test.context.ActiveProfiles;
 import roomescape.domain.reservation.dto.MyReservationResponse;
 import roomescape.domain.waiting.dto.WaitingResponse;
 import roomescape.auth.LoginRequest;
 import roomescape.domain.reservation.dto.ReservationResponse;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 @Transactional
 public class MissionStepTest {
 
+    @Value("${roomescape.auth.jwt.secret}")
+    private String secretKey;
+
     @Test
     @DisplayName("로그인 성공 시 토큰이 포함된 쿠키를 반환한다")
     void 일단계() {
@@ -60,12 +68,17 @@ public class MissionStepTest {
         String token = createToken("[email protected]", "password");  // 일단계에서 토큰을 추출하는 로직을 메서드로 따로 만들어서 활용하세요.
 
         Map<String, String> params = new HashMap<>();
-        params.put("date", "2024-03-01");
+        params.put("date", "2024-01-01");
         params.put("time", "1");
         params.put("theme", "1");
-
         params.put("name", "어드민");
 
+        Map<String, String> params2 = new HashMap<>();
+        params2.put("date", "2024-02-01");
+        params2.put("time", "1");
+        params2.put("theme", "1");
+        params2.put("name", "브라운");
+
         ExtractableResponse<Response> response = RestAssured.given().log().all()
                 .body(params)
                 .cookie("token", token)
@@ -77,10 +90,8 @@ public class MissionStepTest {
         assertThat(response.statusCode()).isEqualTo(201);
         assertThat(response.as(ReservationResponse.class).name()).isEqualTo("어드민");
 
-        params.put("name", "브라운");
-
         ExtractableResponse<Response> adminResponse = RestAssured.given().log().all()
-                .body(params)
+                .body(params2)
                 .cookie("token", token)
                 .contentType(ContentType.JSON)
                 .post("/reservations")
@@ -178,6 +189,18 @@ private String createToken(String email, String password) {
 
         assertThat(status).isEqualTo("1번째 예약대기");
     }
+
+    @Test
+    @DisplayName("@Component 없이 JwtUtils가 빈으로 등록되는지 확인한다.")
+    void 칠단계() {
+        Component componentAnnotation = JwtUtils.class.getAnnotation(Component.class);
+        assertThat(componentAnnotation).isNull();
+    }
+
+    @Test
+    void 팔단계() {
+        assertThat(secretKey).isNotBlank();
+    }
 }