Merge pull request #4 from KAKAO-TOUR-API-CONTEST/develop

FEAT : add a headerInterceptor

build.gradle

@@ -37,15 +37,16 @@ dependencies {
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
 
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	//implementation 'org.springframework.boot:spring-boot-starter-security'
+
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-tomcat'
 	//JWT 의존성 추가
 	implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
 	implementation 'io.jsonwebtoken:jjwt-impl:0.11.2'
 	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.2'
+    //implementation 'org.springframework.boot:spring-boot-starter-security'
 
-	compileOnly 'org.projectlombok:lombok'
+    compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'

src/main/java/com/example/ai_jeju/config/AppConfig.java

@@ -11,4 +11,6 @@ public class AppConfig {
     public RestTemplate restTemplate() {
         return new RestTemplate();
     }
+
+
 }

src/main/java/com/example/ai_jeju/config/HeaderCheckInterceptor.java

@@ -0,0 +1,50 @@
+package com.example.ai_jeju.config;
+
+import com.example.ai_jeju.jwt.TokenProvider;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+@Component
+public class HeaderCheckInterceptor implements HandlerInterceptor {
+
+    private final static String HEADER_AUTHORIZATION = "Authorization";
+    private final static String TOKEN_PREFIX = "Bearer ";
+    @Autowired
+    private TokenProvider tokenProvider;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        // 예시로 "X-Custom-Header"라는 헤더를 확인
+        String headerValue = request.getHeader("access-token");
+
+        String authorizationHeader = request.getHeader(HEADER_AUTHORIZATION);
+
+        // 가져온 값에서 접두사 제거
+        String token = getAccesToken(authorizationHeader);
+
+        // 가져온 토큰이 유효한지 확인하고, 유효한 때는 인증정보 설정한다.
+        System.out.println("토큰 유효성 검사"+tokenProvider.validToken(token));
+
+
+        // 헤더가 올바르면 요청을 진행
+        return true;
+    }
+
+    private String getAccesToken(String authorizationHeader){
+        System.out.println("get Access Token 실행");
+
+        if(authorizationHeader != null && authorizationHeader.startsWith(TOKEN_PREFIX)){
+
+            System.out.println("get Access Token : " + authorizationHeader.substring(TOKEN_PREFIX.length()));
+
+            return authorizationHeader.substring(TOKEN_PREFIX.length());
+        }
+        else{
+            System.out.println("Access Token 없음");
+        }
+        return null;
+    }
+}

src/main/java/com/example/ai_jeju/config/WebConfig.java

@@ -0,0 +1,19 @@
+package com.example.ai_jeju.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private HeaderCheckInterceptor headerCheckInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 모든 경로에 대해 인터셉터를 적용 (필요에 따라 경로를 지정할 수 있음)
+        registry.addInterceptor(headerCheckInterceptor).addPathPatterns("/**");
+    }
+}

src/main/java/com/example/ai_jeju/controller/MainViewController.java

@@ -1,6 +1,5 @@
 package com.example.ai_jeju.controller;
 
-
 import com.example.ai_jeju.domain.Restaurant;
 import com.example.ai_jeju.domain.Stay;
 import com.example.ai_jeju.service.MainVIewService;
@@ -14,30 +13,21 @@ public class MainViewController {
     @Autowired
     private MainVIewService mainViewService;
 
-    /*
-    @GetMapping("/mainList")
-    public ResponseEntity<String> signOut(@RequestBody WithdrawRequest withdrawRequest) {
-        String response = userService.withDraw(withdrawRequest);
-
-        return ResponseEntity.ok(response);
-    }*/
-
-    /*
-    @GetMapping("/mainList")
-    public User getUserById(@PathVariable Long id) {
-        return userService.getUserById(id);
-    }
-    */
-
     @GetMapping("/restaurant/detailList")
     public Restaurant getUserById(@RequestParam int restaurantId) {
         return mainViewService.getRestaurantList(restaurantId);
     }
 
 
-    @GetMapping("/stay/detailList")
-    public Stay getStayById(@RequestParam int stayId) {
-        return mainViewService.getStayList(stayId);
-    }
+//    @GetMapping("/stay/detailList")
+//    public Stay getStayById(@RequestParam int stayId) {
+//        return mainViewService.getStayList(stayId);
+//    }
+//
+//
+//    @GetMapping("/play/detailList")
+//    public Stay getStayById(@RequestParam int stayId) {
+//        return mainViewService.getStayList(stayId);
+//    }
 
 }

src/main/java/com/example/ai_jeju/controller/MyPageController.java

@@ -32,22 +32,13 @@ public ResponseEntity<User> getUserById(@RequestParam Long userId) {
         }
     }
 
-
     @PutMapping("/mypage/nickname")
     public ResponseEntity<String> updateNickname(@RequestParam Long userId, @RequestBody Map<String, String> request) {
         String nickname = request.get("nickname");
         myPageService.updateNickname(userId, nickname);
         return ResponseEntity.ok("Nickname changed");
     }
 
-    //sns프로필 사용하기로 했었나? 사용하면 user쪽에 entity변수 하나 추가해서 해야함
-    /*
-    @PutMapping("/mypage/snsprofile")
-    public ResponseEntity<String> updateSnsProfile(@RequestParam Long userId, @RequestBody Map<String, String> request) {
-        String snsprofile = request.get("snsprofile");
-        myPageService.updateSnsProfile(id, snsprofile);
-        return ResponseEntity.ok("snsprofile change");
-    }*/
 
     //프로필 이미지 변경
     @PutMapping("/mypage/profileimg")

src/main/java/com/example/ai_jeju/controller/UserController.java

@@ -2,7 +2,10 @@
 
 import com.example.ai_jeju.dto.SignUpRequest;
 import com.example.ai_jeju.dto.WithdrawRequest;
+import com.example.ai_jeju.handler.SignUpHandler;
 import com.example.ai_jeju.service.UserService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -17,13 +20,15 @@ public class UserController {
     @Autowired
     private UserService userService;
 
+
+
     //회원가입
     /*여기 확인해보자*/
     @PostMapping("/signup")
-    public ResponseEntity<String> signUp(@RequestBody SignUpRequest signUpRequest) throws IOException {
-        String response = userService.signUp(signUpRequest);
+    public void signUp(@RequestBody SignUpRequest signUpRequest, HttpServletRequest request, HttpServletResponse response) throws IOException {
+        //String response = userService.signUp(signUpRequest);
         //System.out.println(response);
-        return ResponseEntity.ok(response);
+        userService.signUp(signUpRequest,request,response);
     }
 
 

src/main/java/com/example/ai_jeju/domain/Child.java

@@ -22,7 +22,7 @@ public class Child {
     private Long userId;
 
     @Column
-    private Date birthDate;
+    private String birthDate;
 
     @Column
     private String childName;

src/main/java/com/example/ai_jeju/domain/Play.java

@@ -0,0 +1,40 @@
+package com.example.ai_jeju.domain;
+
+
+import jakarta.persistence.*;
+import lombok.*;
+
+@Table(name="play")
+@NoArgsConstructor(access= AccessLevel.PROTECTED) //기본생성자
+@Getter
+@Entity
+@AllArgsConstructor // 모든 필드를 초기화하는 생성자
+@Builder // 빌더 패턴
+public class Play {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "playId", updatable = false, unique = true)
+    int playId;
+
+    @Column(name = "playName", updatable = false)
+    String playName;
+
+    @Column(name = "latitude", updatable = false)
+    double latitude;
+
+    @Column(name = "longitude", updatable = false)
+    double longitude;
+
+    @Column(name = "addr", updatable = false)
+    String address;
+
+    @Column(name = "dc", updatable = false)
+    int chair;
+
+    @Column(name = "nokidsZone", updatable = false)
+    Boolean nokidsZone;
+
+    @Column(name = "operation_time", updatable = false)
+    int operationTime;
+}

src/main/java/com/example/ai_jeju/domain/RefreshToken.java

@@ -36,4 +36,6 @@ public RefreshToken update(String newRefreshToken){
     }
 
 
+
+
 }

src/main/java/com/example/ai_jeju/domain/User.java

@@ -25,15 +25,13 @@ public class User {
 
     @Column(name="email", nullable = false, unique = true)
     private String email;
-
     //실명
     @Column(name = "name")
     private String name;
 
     @Column(name = "nickname")
     private String nickname;
 
-
     @Column(name = "provider")
     private String provider;
 

src/main/java/com/example/ai_jeju/filter/HeaderCheckFilter.java

@@ -0,0 +1,29 @@
+package com.example.ai_jeju.filter;
+
+import java.io.IOException;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+public class HeaderCheckFilter extends OncePerRequestFilter {
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+
+        // 예시로 "X-Custom-Header"라는 헤더를 확인
+        String headerValue = request.getHeader("X-Custom-Header");
+
+        if (headerValue == null || !headerValue.equals("ExpectedValue")) {
+            // 헤더가 없거나 예상된 값이 아닐 경우 요청을 차단
+            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+            response.getWriter().write("Missing or Invalid Header");
+            return;
+        }
+
+        // 헤더가 올바르면 다음 필터로 진행
+        filterChain.doFilter(request, response);
+    }
+}