경북대 BE_김영인 6주차 과제 (2단계)

.gitignore

@@ -38,3 +38,6 @@ out/
 
 ### Mac OS ###
 .DS_Store
+
+### secret-key 설정
+src/main/resources/application-secret.properties

README.md

@@ -1 +1,44 @@
-# spring-gift-point
+# spring-gift-point
+
+# 0단계
+
+## API 명세서
+https://impossible-repair-22e.notion.site/57ec013f9424421eb2317b11a2b9a29c?v=f3fe7340ebae425bbfa70db78123a663
+
+# 1단계
+
+## 구현할 기능 목록
+- [ ] 작성한 API 문서를 기반으로 팀 내에서 지금까지 만든 API를 검토하고 통일하여 변경 사항을 반영
+  - [x] 일반 회원가입
+  - [x] 일반 로그인
+  - [x] 모든 상품 조회
+  - [x] 특정 제품의 옵션 조회
+  - [x] 특정 카테고리별 상품 목록조회
+  - [x] 모든 카테고리 조회
+  - [x] 위시리스트에 추가
+  - [x] 위시리스트에서 삭제
+  - [x] 로그인한 회원의 위시리스트 조회
+  - [x] 주문 생성
+
+# 2단계
+
+## 구현할 기능 목록
+- [x] API 오류 확인
+  - [x] wish 
+  - [x] product 카테고리별 상품 불러오는 api endpoint 경로 오류 수정
+- [x] 배포 자동화
+  - [x] 배포 스크립트 작성
+    - [x] 웹을 서버에 배포하기 위한 셀 스크립트 작성
+    - [x] 스크립트는 현재 실행 중인 JAR 파일을 종료하고, 새로운 JAR 파일을 복사하여 실행하는 기능을 포함
+    - https://www.notion.so/18cdfba8d1e44daa978eb1c7e7ee03d9
+
+- [x] 보안 문제 
+  - [x] JWT를 사용한 인증에 문제가 없는지 프론트와 연결하면서 테스트
+
+- [x] cors 에러 해결
+  - [x] 전역 CORS 설정 : WebConfig에서 cors에러 해결 
+  - [ ] ~~특정 controller에서 CORS 설정~~
+  - [ ] ~~Spring Security에서 CORS 설정~~
+  - [ ] ~~application에서 CORS 설정 사용~~
+
+- [x] CORS 테스트 구현

build.gradle

@@ -22,8 +22,27 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     runtimeOnly 'com.h2database:h2'
+    runtimeOnly 'com.mysql:mysql-connector-j'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    implementation 'org.springframework.boot:spring-boot-starter-validation:2.7.3'
+
+    // JWT 관련 의존성
+    compileOnly 'io.jsonwebtoken:jjwt-api:0.11.2'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.2'
+
+    // JPA
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+
+    // 보안 관련 의존성
+    //implementation 'org.springframework.boot:spring-boot-starter-security'
+    //implementation 'org.springframework.security:spring-security-test'
+
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+
+    // Json
+    implementation group: 'org.json', name: 'json', version: '20090211'
 }
 
 tasks.named('test') {

src/main/java/gift/Application.java

@@ -2,10 +2,13 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 
 @SpringBootApplication
 public class Application {
     public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
+        new SpringApplicationBuilder(Application.class)
+                .properties("spring.config.location=classpath:/application.properties,classpath:/application-secret.properties")
+                .run(args);
     }
 }

src/main/java/gift/config/JwtConfig.java

@@ -0,0 +1,54 @@
+package gift.config;
+
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.security.Keys;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.springframework.stereotype.Component;
+import gift.constant.Constants;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class JwtConfig {
+
+    public String generateToken(String email) {
+        // Create a claims map
+        Map<String, Object> claims = new HashMap<>();
+        claims.put("email", email);
+
+        // Generate the JWT token
+        return Jwts.builder()
+                .setClaims(claims)
+                .setSubject(email)
+                .setIssuedAt(new Date())
+                .setExpiration(new Date(System.currentTimeMillis() + Constants.ONE_DAY_MILLIS))
+                .signWith(Keys.hmacShaKeyFor(Constants.SECRET_KEY.getBytes()), SignatureAlgorithm.HS256)
+                .compact();
+    }
+
+    public String extractEmail(String token) {
+        if (token.startsWith("Bearer ")) {
+            token = token.substring(7);
+        }
+        return extractAllClaims(token).getSubject();
+    }
+
+    public Claims extractAllClaims(String token) {
+        return Jwts.parser()
+                .setSigningKey(Keys.hmacShaKeyFor(Constants.SECRET_KEY.getBytes()))
+                .parseClaimsJws(token)
+                .getBody();
+    }
+
+    public boolean validateToken(String token, String email) {
+        final String extractedEmail = extractEmail(token);
+        return extractedEmail.equals(email) && !isTokenExpired(token);
+    }
+
+    private boolean isTokenExpired(String token) {
+        return extractAllClaims(token).getExpiration().before(new Date());
+    }
+}

src/main/java/gift/config/WebConfig.java

@@ -0,0 +1,64 @@
+package gift.config;
+
+import gift.resolver.LoginMemberArgumentResolver;
+import gift.service.MemberService;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.filter.CharacterEncodingFilter;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    private final MemberService memberService;
+
+    public WebConfig(MemberService memberService) {
+        this.memberService = memberService;
+    }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
+        resolvers.add(new LoginMemberArgumentResolver(memberService));
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.favorPathExtension(false)
+                .favorParameter(true)
+                .parameterName("mediaType")
+                .ignoreAcceptHeader(false)
+                .useRegisteredExtensionsOnly(false)
+                .defaultContentType(MediaType.APPLICATION_JSON)
+                .mediaType("json", MediaType.APPLICATION_JSON)
+                .mediaType("xml", MediaType.APPLICATION_XML);
+    }
+
+    @Bean
+    public CharacterEncodingFilter characterEncodingFilter() {
+        CharacterEncodingFilter filter = new CharacterEncodingFilter();
+        filter.setEncoding("UTF-8");
+        filter.setForceEncoding(true);
+        return filter;
+    }
+
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        converters.add(new MappingJackson2HttpMessageConverter());
+    }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("http://localhost:3000")
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .allowedHeaders("*")
+                .allowCredentials(true);
+    }
+}

src/main/java/gift/constant/Constants.java

@@ -0,0 +1,8 @@
+package gift.constant;
+
+public class Constants {
+    public static final String SECRET_KEY = "Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=";
+    public static final long ONE_DAY_MILLIS = 86400000;
+    public static final String AUTHENTICATE_HEADER = "Authenticate";
+    public static final String BEARER = "Bearer";
+}

src/main/java/gift/controller/CategoryController.java

@@ -0,0 +1,59 @@
+package gift.controller;
+
+import gift.domain.Category;
+import gift.dto.CategoryListDto;
+import gift.dto.UpdateCategoryDto;
+import gift.service.CategoryService;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/categories")
+public class CategoryController {
+    private final CategoryService categoryService;
+
+    @Autowired
+    public CategoryController(CategoryService categoryService) {
+        this.categoryService = categoryService;
+    }
+
+    @Operation(summary = "모든 카테고리 조회")
+    @GetMapping
+    public ResponseEntity<List<CategoryListDto>> getAllCategories(@RequestParam(defaultValue = "0") int page,
+                                                                  @RequestParam(defaultValue = "10") int size) {
+        Pageable pageable = PageRequest.of(page, size);
+        Page<CategoryListDto> categories = categoryService.findAll(pageable);
+        return ResponseEntity.ok(categories.getContent());
+    }
+
+/*    @GetMapping("/{id}")
+    public ResponseEntity<Category> getCategoryById(@PathVariable Long id) {
+       Category category = categoryService.findById(id);
+       return ResponseEntity.ok(category);
+    }
+
+    @PostMapping
+    public ResponseEntity<Category> createCategory(@RequestParam String name) {
+        Category category = categoryService.addCategory(name);
+        return ResponseEntity.ok(category);
+    }
+
+    @PutMapping("/{id}")
+    public ResponseEntity<Category> updateCategory(@PathVariable Long id, @RequestBody UpdateCategoryDto updateCategoryDto) {
+        Category updatedCategory = categoryService.updateCategory(id, updateCategoryDto);
+        return ResponseEntity.ok(updatedCategory);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteCategory(@PathVariable Long id) {
+        categoryService.deleteCategory(id);
+        return ResponseEntity.noContent().build();
+    }*/
+
+}

src/main/java/gift/controller/KakaoAuthController.java

@@ -0,0 +1,37 @@
+package gift.controller;
+
+import gift.service.KakaoTokenService;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.io.IOException;
+
+@RestController("api/kakao")
+public class KakaoAuthController {
+    /*@Value("${kakao.app.key}")
+    private String appKey;
+
+    private final KakaoTokenService kakaoTokenService;
+
+    public KakaoAuthController(KakaoTokenService kakaoTokenService) {
+        this.kakaoTokenService = kakaoTokenService;
+    }
+
+    @GetMapping("/login")
+    public void redirectToKakao(HttpServletResponse response) throws IOException {
+        String redirectUri = "http://localhost:8080/callback"; // 리디렉션 URI
+        String kakaoAuthUrl = String.format("https://kauth.kakao.com/oauth/authorize?scope=talk_message&response_type=code&redirect_uri=%s&client_id=%s", redirectUri, appKey);
+        response.sendRedirect(kakaoAuthUrl); // 카카오 인가 페이지로 리다이렉트
+    }
+
+    @GetMapping("/callback")
+    public String getKakaoAuthorizationCode(@RequestParam("code") String authorizationCode) {
+        String accessToken = kakaoTokenService.getAccessToken(authorizationCode);
+        System.out.println("Access Token: " + accessToken);
+        return accessToken;
+    }*/
+}

src/main/java/gift/controller/MemberController.java

@@ -0,0 +1,42 @@
+package gift.controller;
+
+import gift.constant.Constants;
+import gift.dto.LoginRequest;
+import gift.dto.LoginResponse;
+import gift.dto.MemberRequest;
+import gift.dto.JoinResponse;
+import gift.service.MemberService;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("api/members")
+public class MemberController {
+
+    private final MemberService memberService;
+
+    public MemberController(MemberService memberService) {
+        this.memberService = memberService;
+    }
+
+    @Operation(summary = "일반 회원가입")
+    @PostMapping("/register")
+    public ResponseEntity<JoinResponse> registerMember(@RequestBody MemberRequest requestDto) {
+        JoinResponse responseDto = memberService.registerMember(requestDto);
+        return ResponseEntity.status(HttpStatus.CREATED).body(responseDto);
+    }
+
+    @Operation(summary = "일반 로그인")
+    @PostMapping("/login")
+    public ResponseEntity<LoginResponse> login(@RequestBody LoginRequest loginRequest) {
+        LoginResponse loginResponse = memberService.login(loginRequest);
+        return ResponseEntity.status(loginResponse.getAccess_token() != null ? HttpStatus.OK : HttpStatus.UNAUTHORIZED)
+                .header(Constants.AUTHENTICATE_HEADER, Constants.BEARER)
+                .body(loginResponse);
+    }
+}