Feat/#22

build.gradle

@@ -47,6 +47,9 @@ dependencies {
 
     // OAuth2 login
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+
+    // WebFlux
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
 }
 
 tasks.named('test') {

src/main/java/com/example/umc7th/domain/member/controller/MemberController.java

@@ -4,17 +4,17 @@
 import com.example.umc7th.domain.member.dto.MemberRequestDTO;
 import com.example.umc7th.domain.member.dto.MemberResponseDTO;
 import com.example.umc7th.domain.member.service.command.MemberCommandService;
+import com.example.umc7th.domain.member.service.command.OAuth2Service;
 import com.example.umc7th.global.apiPayload.CustomResponse;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
 public class MemberController {
 
     private final MemberCommandService memberCommandService;
+    private final OAuth2Service oAuth2Service;
 
     @PostMapping("/login")
     public CustomResponse<MemberResponseDTO.MemberTokenDTO> login(@RequestBody MemberRequestDTO.MemberLoginDTO dto) {
@@ -26,5 +26,10 @@ public CustomResponse<MemberResponseDTO.MemberTokenDTO> signup(@RequestBody Memb
         return CustomResponse.onSuccess(memberCommandService.signUp(dto));
     }
 
+    // 이건 카카오 서버에서 호출함
+    @GetMapping("/oauth2/callback/kakao")
+    public CustomResponse<MemberResponseDTO.MemberTokenDTO> loginWithKakao(@RequestParam("code") String code) {
+        return CustomResponse.onSuccess(oAuth2Service.login("kakao", code));
+    }
 
 }

src/main/java/com/example/umc7th/domain/member/dto/MemberResponseDTO.java

@@ -13,7 +13,10 @@ public class MemberResponseDTO {
     @AllArgsConstructor
     @NoArgsConstructor
     public static class MemberTokenDTO {
-        String accessToken;
-        String refreshToken;
+        //클라이언트가 두 토큰을 가지고 있다가 전송 시에는 유효시간이 짧은 accessToken만 전송하여 탈취시 피해범위 최소화
+        //토큰은 한번 발급하면 유효시간을 수정할 수 없기 때문
+        //보통 토큰은 안전한 쿠키에 담아 전송
+        String accessToken; // 실제 인증할 때마다 사용하는 토큰, 유효시간을 작게 하여 refreshToken으로 재발급
+        String refreshToken;// accessToken이 만료되면 재발급하는 토큰, (로그아웃 시 삭제)
     }
 }

src/main/java/com/example/umc7th/global/oauth/dto/OAuth2DTO.java → src/main/java/com/example/umc7th/domain/member/dto/OAuth2DTO.java

@@ -1,4 +1,4 @@
-package com.example.umc7th.global.oauth.dto;
+package com.example.umc7th.domain.member.dto;
 
 import lombok.Getter;
 

src/main/java/com/example/umc7th/domain/member/enums/SocialType.java

@@ -0,0 +1,5 @@
+package com.example.umc7th.domain.member.enums;
+
+public enum SocialType {
+    KAKAO, GOOGLE, NAVER;
+}

src/main/java/com/example/umc7th/domain/member/exception/MemberErrorCode.java

@@ -13,8 +13,10 @@ public enum MemberErrorCode implements BaseErrorCode {
     NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER404", "사용자를 찾을 수 없습니다."),
     ALREADY_EXIST(HttpStatus.BAD_REQUEST, "MEMBER400", "이미 존재하는 사용자입니다."),
     INCORRECT_PASSWORD(HttpStatus.UNAUTHORIZED, "MEMBER401", "비밀번호가 틀립니다."),
-    OAUTH_TOKEN_FAIL(HttpStatus.UNAUTHORIZED, "MEMBER401", "비밀번호가 틀립니다."),
-    OAUTH_USER_INFO_FAIL(HttpStatus.UNAUTHORIZED, "MEMBER401", "비밀번호가 틀립니다."),
+
+    OAUTH_TOKEN_FAIL(HttpStatus.UNAUTHORIZED, "MEMBER401", "인가코드로 토큰을 가져오는데 실패했습니다."),
+    OAUTH_USER_INFO_FAIL(HttpStatus.UNAUTHORIZED, "MEMBER401", "토큰으로 사용자 정보를 가져오는 데 실패했습니다."),
+    UNSUPPORTED_OAUTH_TYPE(HttpStatus.BAD_REQUEST, "MEMBER400", "지원하지 않는 소셜 로그인입니다."),
     ;
 
     private final HttpStatus status;

src/main/java/com/example/umc7th/domain/member/principal/PrincipalDetailsService.java

@@ -23,7 +23,6 @@ public class PrincipalDetailsService implements UserDetailsService {
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         Member member = memberRepository.findByEmail(username).orElseThrow(() ->
                 new MemberException(MemberErrorCode.NOT_FOUND));
-        // MemberException과 MemberErrorCode도 한 번 작성해주세요.
         return new PrincipalDetails(member);
     }
 }

src/main/java/com/example/umc7th/domain/member/service/command/OAuth2Service.java

@@ -0,0 +1,7 @@
+package com.example.umc7th.domain.member.service.command;
+
+import com.example.umc7th.domain.member.dto.MemberResponseDTO;
+
+public interface OAuth2Service {
+    MemberResponseDTO.MemberTokenDTO login(String provider, String code);
+}

src/main/java/com/example/umc7th/domain/member/service/command/OAuth2ServiceImpl.java

@@ -0,0 +1,144 @@
+package com.example.umc7th.domain.member.service.command;
+
+import com.example.umc7th.domain.member.dto.MemberResponseDTO;
+import com.example.umc7th.domain.member.dto.OAuth2DTO;
+import com.example.umc7th.domain.member.entity.Member;
+import com.example.umc7th.domain.member.enums.SocialType;
+import com.example.umc7th.domain.member.exception.MemberErrorCode;
+import com.example.umc7th.domain.member.exception.MemberException;
+import com.example.umc7th.domain.member.repository.MemberRepository;
+import com.example.umc7th.global.jwt.JwtProvider;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class OAuth2ServiceImpl implements OAuth2Service {
+
+    @Value("${spring.security.oauth2.client.provider.kakao.token-uri}")
+    private String tokenURI; // Resource Server에 토큰 요청시 사용할 URI
+
+    @Value("${spring.security.oauth2.client.provider.kakao.user-info-uri}")
+    private String userInfoURI;// 사용자 정보 가져올 때 사용할 URI
+
+    @Value("${spring.security.oauth2.client.registration.kakao.client-id}")
+    private String clientId;// API KEY
+
+    @Value("${spring.security.oauth2.client.registration.kakao.redirect-uri}")
+    private String redirectURI;// 설정한 Redirect uri
+
+    private final MemberRepository memberRepository;
+    private final JwtProvider jwtProvider;
+
+    @Override
+    public MemberResponseDTO.MemberTokenDTO login(String provider, String code) {
+        if (provider.equalsIgnoreCase(SocialType.KAKAO.name())) {
+            return loginWithKakao(code);
+        } else {
+            throw new MemberException(MemberErrorCode.UNSUPPORTED_OAUTH_TYPE);
+        }
+    }
+
+    private MemberResponseDTO.MemberTokenDTO loginWithKakao(String code) {
+        String token = getAccessTokenFromKakao(code);
+        OAuth2DTO.KakaoProfile profile = getProfileFromKakao(token);
+        String email = profile.getKakao_account().getEmail();
+        return loginOrSignup(SocialType.KAKAO, email);
+    }
+
+    private MemberResponseDTO.MemberTokenDTO loginOrSignup(SocialType socialType, String email) {
+        // SocialType을 Member에 provider라는 필드로 추가해서 저장해도 좋음
+        Member member;
+        Optional<Member> optional = memberRepository.findByEmail(email);
+
+        // orElse() 는 즉시 평가 이기 때문에 값이 있던 없던 내부 로직이 실행 되어 비 효율적 임
+        // 아래 처럼 로직을 분리 하면 성능을 높일 수 있음
+        member = optional.orElseGet(() -> memberRepository.save(Member.builder()
+                .email(email)
+                .role("ROLE_USER")
+                .build()));
+
+
+        return MemberResponseDTO.MemberTokenDTO.builder()
+                .accessToken(jwtProvider.createAccessToken(member))
+                .refreshToken(jwtProvider.createRefreshToken(member))
+                .build();
+    }
+
+    //인가코드로 토큰 가져오기
+    private String getAccessTokenFromKakao(String accessCode) {
+        // 인가코드 토큰 가져오기
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders httpHeaders = new HttpHeaders();
+
+        //Content-Type == HTTP 요청 본문의 데이터 형식을 명시
+        //application/x-www-form-urlencoded == 데이터가 URL 인코딩 방식으로 전송됨
+        httpHeaders.add("Content-Type", "application/x-www-form-urlencoded");
+
+        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+        map.add("grant_type", "authorization_code");
+        map.add("client_id", clientId);
+        map.add("redirect_uri", redirectURI);
+        map.add("code", accessCode);
+        HttpEntity<MultiValueMap> request = new HttpEntity<>(map, httpHeaders);
+
+        ResponseEntity<String> response1 = restTemplate.exchange(//이게 http요청을 서버로 보내고 서버로 받은 응답을 반환하는 메서드임
+                tokenURI, // URI
+                HttpMethod.POST, // Method
+                request, // Request 내용
+                String.class); // 받을 응답 자료형
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        OAuth2DTO.OAuth2TokenDTO oAuth2TokenDTO = null;
+
+        try {//objectMapper.readValue(변환할 json, 바꿀 클래스.class) -> json 데이터를 java 객체로 변경
+            oAuth2TokenDTO = objectMapper.readValue(response1.getBody(), OAuth2DTO.OAuth2TokenDTO.class);
+            return oAuth2TokenDTO.getAccess_token();
+        } catch (Exception e) {
+            throw new MemberException(MemberErrorCode.OAUTH_TOKEN_FAIL);
+        }
+    }
+
+    //토큰으로 카카오서버에서 유저정보 가져오기
+    private OAuth2DTO.KakaoProfile getProfileFromKakao(String accessToken) {
+        // 토큰으로 정보 가져오기
+        RestTemplate restTemplate = new RestTemplate();// 요청을 보내기 위한 RestTemplate
+        HttpHeaders httpHeaders = new HttpHeaders();//헤더 선언
+
+        //Content-Type == HTTP 요청 본문의 데이터 형식을 명시
+        //application/x-www-form-urlencoded == 데이터가 URL 인코딩 방식으로 전송됨
+
+        //Authorization == 인증 관련 정보를 서버에 전달하기 위한 헤더
+        httpHeaders.add("Authorization", "Bearer " + accessToken);//Bearer 뒤에 토큰을 추가하면 서버가 요청자의 인증 상태를 확인 가능
+        httpHeaders.add("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+
+        HttpEntity<MultiValueMap> request1 = new HttpEntity<>(httpHeaders);
+
+        ResponseEntity<String> response2 = restTemplate.exchange(
+                userInfoURI,// URI
+                HttpMethod.GET, // Method
+                request1, // Request 내용
+                String.class // 받을 응답 자료형
+        );
+
+
+        ObjectMapper om = new ObjectMapper();
+
+        try {
+            return om.readValue(response2.getBody(), OAuth2DTO.KakaoProfile.class);
+        } catch (Exception e) {
+            throw new MemberException(MemberErrorCode.OAUTH_USER_INFO_FAIL);
+        }
+    }
+}

src/main/java/com/example/umc7th/domain/openAPI/component/OpenApiWebClient.java

@@ -0,0 +1,11 @@
+package com.example.umc7th.domain.openAPI.component;
+
+import org.springframework.web.reactive.function.client.WebClient;
+
+public interface OpenApiWebClient {
+    // 한국 관광정보를 가져올 수 있는 WebClient를 반환하는 메소드 정의
+    public WebClient getTourWebClient(String language);
+    // 아래에 메소드를 추가하면서 확장해나갈 수 있겠죠?
+
+}
+

src/main/java/com/example/umc7th/domain/openAPI/component/OpenApiWebClientImpl.java

@@ -0,0 +1,53 @@
+package com.example.umc7th.domain.openAPI.component;
+
+import com.example.umc7th.domain.openAPI.exception.OpenAPIErrorCode;
+import com.example.umc7th.domain.openAPI.exception.OpenAPIException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.util.DefaultUriBuilderFactory;
+import reactor.netty.http.client.HttpClient;
+
+import java.time.Duration;
+
+@Component
+@Slf4j
+public class OpenApiWebClientImpl implements OpenApiWebClient {
+
+    @Override
+    public WebClient getTourWebClient(String language) {
+        if (language.equals("korean")) {
+            return getWebClient("https://apis.data.go.kr/B551011/KorService1");
+        } else if (language.equals("english")) {
+            return getWebClient("https://apis.data.go.kr/B551011/EngService1");
+        } else {
+            throw new OpenAPIException(OpenAPIErrorCode.UNSUPPORTED_LANGUAGE);
+        }
+    }
+
+    // 영문 API를 추가한 경우
+    // @Override
+    // public WebClient getEnglishTourWebClient() {
+    //     return getWebClient("https://apis.data.go.kr/B551011/EngService1");
+    // }
+
+    private WebClient getWebClient(String baseUrl) {
+        HttpClient httpClient = HttpClient.create()
+                .responseTimeout(Duration.ofMillis(20000));
+
+        // Uri를 build하는 factory 생성 (baseUrl을 WebClient 대신 여기에 포함하도록)
+        DefaultUriBuilderFactory factory = new DefaultUriBuilderFactory(baseUrl);
+        // Uri factory에 인코딩 모드를 NONE으로 바꾸어 인코딩하지 않도록해줍니다.
+        factory.setEncodingMode(DefaultUriBuilderFactory.EncodingMode.NONE);
+
+        return WebClient.builder()
+                .uriBuilderFactory(factory)
+                .clientConnector(new ReactorClientHttpConnector(httpClient))
+                .filter((request, next) -> {
+                    log.info("Web Client Request: " + request.url());
+                    return next.exchange(request);
+                })
+                .build();
+    }
+}

src/main/java/com/example/umc7th/domain/openAPI/controller/OpenApiController.java

@@ -0,0 +1,23 @@
+package com.example.umc7th.domain.openAPI.controller;
+
+import com.example.umc7th.domain.openAPI.dto.OpenApiResponseDTO;
+import com.example.umc7th.domain.openAPI.service.OpenApiQueryService;
+import com.example.umc7th.global.apiPayload.CustomResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class OpenApiController {
+
+    private final OpenApiQueryService openApiQueryService;
+
+    @GetMapping("/searchStay")
+    public CustomResponse<OpenApiResponseDTO.SearchStayResponseListDTO> controller(@RequestParam(name = "arrange", defaultValue = "A") String arrange,
+                                                                                   @RequestParam(name = "page", defaultValue = "1") int page,
+                                                                                   @RequestParam(name = "offset", defaultValue = "10") int offset) {
+        return CustomResponse.onSuccess(openApiQueryService.searchStay(arrange, page, offset));
+    }
+}

src/main/java/com/example/umc7th/domain/openAPI/dto/OpenApiResponseDTO.java

@@ -0,0 +1,46 @@
+package com.example.umc7th.domain.openAPI.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+public class OpenApiResponseDTO {
+
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Getter
+    // 해당 어노테이션으로 json 값을 Parsing할 때 필드가 없는 경우 무시하여 에러가 터지는 것을 방지, 한번 없이 돌려보시면 이해가 더 잘 되실겁니다.
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class SearchStayResponseDTO {
+        // 아래 변수는 Api 명세서의 응답을 보고 그대로 받고 싶은 값들만 똑같은 이름으로 만들어줍니다.
+        private String addr1;
+        private String title;
+        private String tel;
+        private String contentid;
+        private String contenttypeid;
+        private String createdtime;
+        private String firstimage;
+        private String firstimage2;
+        private String mapx;
+        private String mapy;
+    }
+
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Getter
+    public static class SearchStayResponseListDTO {
+        private List<SearchStayResponseDTO> item;
+
+        public static SearchStayResponseListDTO from(List<SearchStayResponseDTO> list) {
+            return SearchStayResponseListDTO.builder()
+                    .item(list)
+                    .build();
+        }
+    }
+}