Merge pull request #62 from Book-Mile/feat/#56

[Feat/#56] 소셜 연동 해제기능 ( + 추가 엔티티 생성)

src/main/java/com/bookmile/backend/domain/record/controller/RecordController.java

@@ -11,7 +11,6 @@
 import com.bookmile.backend.domain.record.service.Impl.RecordServiceImpl;
 import com.bookmile.backend.global.common.CommonResponse;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;

src/main/java/com/bookmile/backend/domain/user/controller/OAuthController.java

@@ -0,0 +1,57 @@
+package com.bookmile.backend.domain.user.controller;
+
+import com.bookmile.backend.domain.user.service.OAuthService;
+import com.bookmile.backend.global.common.CommonResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.bookmile.backend.global.common.StatusCode.SIGN_IN;
+import static com.bookmile.backend.global.common.StatusCode.USER_FOUND;
+
+@RestController
+@RequestMapping("api/v1/oauth2")
+@RequiredArgsConstructor
+public class OAuthController {
+    private final OAuthService oAuthService;
+
+    @Operation(summary = "[테스트] OAuth2 로그인 (소셜로그인)", description = "테스트용입니다. <br>" +
+            "토큰의 유효시간이 매우 짧습니다. accessToken : 30초, refreshToken : 1분 <br>" +
+            "회원가입 따로 없이, test용 email을 입력하여 계정을 생성하고, redirectUrl이 올바르게 나오는지 확인합니다. <br>" +
+            "또한, 제공한 accessToken, refreshToken을 유효한지 확인합니다. ")
+    @PostMapping("/test")
+    public ResponseEntity<CommonResponse<Map<String, String>>> testSocialLogin(
+            @RequestParam String email
+    ) {
+        return ResponseEntity.status(SIGN_IN.getStatus())
+                .body(CommonResponse.from(SIGN_IN.getMessage(), oAuthService.testSocialLogin(email)));
+    }
+
+    @Operation(summary = "연동된 소셜 로그인 조회", description = "현재 로그인한 사용자의 연동된 소셜 로그인 목록을 조회합니다.")
+    @GetMapping
+    public ResponseEntity<CommonResponse<List<String>>> getOAuthProviders(
+            @AuthenticationPrincipal UserDetails userDetails) {
+
+        return ResponseEntity.ok(CommonResponse.from(USER_FOUND.getMessage(), oAuthService.getOAuthProviders(userDetails.getUsername())));
+    }
+
+    @Operation(summary = "소셜로그인 연동 해제", description = "소셜 로그인 연동을 해제합니다. <br>" +
+            "provider에는 kakao, google, naver 중 1개 입력해주세요. <br>" +
+            "Header에 accessToken 필요합니다!")
+    @PostMapping( "unlink/{provider}")
+    public ResponseEntity<CommonResponse<Object>> unlinkOAuthProvider(
+            HttpServletRequest request,
+            @PathVariable(value = "provider") String provider,
+            @AuthenticationPrincipal UserDetails userDetails) {
+        oAuthService.unlinkUserOAuth(request, provider, userDetails.getUsername());
+
+        return ResponseEntity.ok(CommonResponse.from("연동해제 성공"));
+    }
+}

src/main/java/com/bookmile/backend/domain/user/controller/UserController.java

@@ -11,14 +11,12 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
-import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import static com.bookmile.backend.global.common.StatusCode.*;
@@ -135,18 +133,8 @@ public ResponseEntity<CommonResponse<TokenResDto>> testSignIn(
                  .body(CommonResponse.from(SIGN_IN.getMessage(),userService.testSignIn(signInReqDto)));
     }
 
-    @Operation(summary = "[테스트] OAuth2 로그인 (소셜로그인)", description = "테스트용입니다. <br>" +
-            "회원가입 따로 없이, test용 email을 입력하여 계정을 생성하고, rediectUrl이 올바르게 나오는지 확인합니다. <br>" +
-            "또한, 제공한 accessToken, refreshToken을 유효한지 확인합니다. ")
-    @PostMapping("/test/social-login")
-    public ResponseEntity<CommonResponse<Map<String, String>>> testSocialLogin(
-            @RequestParam String email
-    ) {
-        return ResponseEntity.status(SIGN_IN.getStatus())
-                .body(CommonResponse.from(SIGN_IN.getMessage(), userService.testSocialLogin(email)));
-    }
 
-    @Operation(summary = "[테스트] 리다이렉트",description = "리다이렉트 url에 토큰이 올바른지 검사합니다. <br>" +
+    @Operation(summary = "[테스트] 토큰 확인용",description = "리다이렉트 url에 토큰이 올바른지 검사합니다. <br>" +
             "유저의 정보를 확인합니다.")
     @PostMapping("/test/redirect")
     public ResponseEntity<CommonResponse<Map<String, String>>> testRedirect(

src/main/java/com/bookmile/backend/domain/user/entity/User.java

@@ -34,22 +34,14 @@ public class User extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private UserRole role;
 
-    // OAuth2.0 제공자
-    private String provider;
-
-    // OAuth 로그인 유저의 고유 ID
-    private String providerId;
-
     @Builder
-    public User(String nickname, String email, String password, String image, Boolean isDeleted, UserRole role, String provider, String providerId) {
+    public User(String nickname, String email, String password, String image, Boolean isDeleted, UserRole role) {
         this.nickname = nickname;
         this.email = email;
         this.password = password;
         this.image = image;
         this.isDeleted = isDeleted;
         this.role = role;
-        this.provider = provider;
-        this.providerId = providerId;
     }
 
     public void updateNickname(String newNickname) {

src/main/java/com/bookmile/backend/domain/user/entity/UserOAuth.java

@@ -0,0 +1,38 @@
+package com.bookmile.backend.domain.user.entity;
+
+import com.bookmile.backend.global.config.BaseEntity;
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class UserOAuth extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "oauth_id")
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    // OAuth2.0 제공자
+    @Column(nullable = false)
+    private String provider;
+
+    // OAuth 로그인 유저의 고유 ID
+    @Column(name= "provider_id", nullable = false, unique = true)
+    private String providerId;
+
+    @Builder
+    public UserOAuth(User user, String provider, String providerId) {
+        this.user = user;
+        this.provider = provider;
+        this.providerId = providerId;
+    }
+}

src/main/java/com/bookmile/backend/domain/user/repository/UserOAuthRepository.java

@@ -0,0 +1,16 @@
+package com.bookmile.backend.domain.user.repository;
+
+import com.bookmile.backend.domain.user.entity.User;
+import com.bookmile.backend.domain.user.entity.UserOAuth;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface UserOAuthRepository extends JpaRepository<UserOAuth, Long> {
+    Optional<UserOAuth> findByProviderAndProviderId(String provider, String providerId);
+    List<UserOAuth> findByUserId(Long userId);
+    Optional<UserOAuth> findByUserIdAndProvider(Long userId, String provider);
+}

src/main/java/com/bookmile/backend/domain/user/repository/UserRepository.java

@@ -10,8 +10,6 @@
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByEmail(String email);
 
-    Boolean existsByEmail(String email);
-
     Optional<User> findById(Long userId);
 
     Boolean existsByNickname(String nickname);

src/main/java/com/bookmile/backend/domain/user/service/OAuthService.java

@@ -0,0 +1,13 @@
+package com.bookmile.backend.domain.user.service;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import java.util.List;
+import java.util.Map;
+
+public interface OAuthService {
+    List<String> getOAuthProviders(String email);
+    void unlinkUserOAuth(HttpServletRequest request, String provider, String email);
+
+    Map<String, String> testSocialLogin(String email);
+}

src/main/java/com/bookmile/backend/domain/user/service/UserService.java

@@ -6,7 +6,6 @@
 import com.bookmile.backend.domain.user.dto.req.UserInfoReqDto;
 import com.bookmile.backend.domain.user.dto.res.TokenResDto;
 import com.bookmile.backend.domain.user.dto.res.UserDetailResDto;
-import com.bookmile.backend.domain.user.dto.res.UserInfoDto;
 import com.bookmile.backend.domain.user.dto.res.UserResDto;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.web.multipart.MultipartFile;
@@ -17,7 +16,6 @@ public interface UserService {
     UserResDto signUp(SignUpReqDto signUpReqDto);
     TokenResDto signIn(SignInReqDto signInReqDto);
     TokenResDto reIssue(HttpServletRequest request);
-    UserInfoDto getUserInfo(Long userId);
     UserDetailResDto getUser(String email);
     Boolean checkNickname(String nickname);
 
@@ -30,6 +28,5 @@ public interface UserService {
 
     // 테스트 로그인
     TokenResDto testSignIn(SignInReqDto signInReqDto);
-    Map<String, String> testSocialLogin(String email);
     Map<String, String> testRedirect(String accessToken);
 }

src/main/java/com/bookmile/backend/domain/user/service/impl/OAuthServiceImpl.java

@@ -0,0 +1,145 @@
+package com.bookmile.backend.domain.user.service.impl;
+
+import com.bookmile.backend.domain.user.entity.User;
+import com.bookmile.backend.domain.user.entity.UserOAuth;
+import com.bookmile.backend.domain.user.repository.UserOAuthRepository;
+import com.bookmile.backend.domain.user.repository.UserRepository;
+import com.bookmile.backend.domain.user.service.OAuthService;
+import com.bookmile.backend.global.common.StatusCode;
+import com.bookmile.backend.global.common.UserRole;
+import com.bookmile.backend.global.exception.CustomException;
+import com.bookmile.backend.global.jwt.JwtTokenProvider;
+import com.bookmile.backend.global.oauth.OAuth2UnlinkService;
+import com.bookmile.backend.global.common.RandomNickname;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.bookmile.backend.global.common.StatusCode.AUTHENTICATION_FAILED;
+import static com.bookmile.backend.global.common.StatusCode.INVALID_OAUTH_USER;
+
+@Service
+@RequiredArgsConstructor
+@Log4j2
+public class OAuthServiceImpl implements OAuthService {
+    private final UserRepository userRepository;
+    private final UserOAuthRepository userOAuthRepository;
+    private final JwtTokenProvider jwtTokenProvider;
+    private final RandomNickname randomNickname;
+    private final OAuth2UnlinkService oAuth2UnlinkService;
+
+    @Value("${aws.main.profile}")
+    private String mainProfile;
+
+    @Value("${spring.oauth2.url.callback}")
+    private String callBackUrl;
+
+    // 회원의 소셜 연동 정보 조회
+    @Override
+    @Transactional
+    public List<String> getOAuthProviders(String email) {
+        User user = findByEmail(email);
+
+        List<String> providers = userOAuthRepository.findByUserId(user.getId()).stream()
+                .map(UserOAuth::getProvider)
+                .toList();
+
+        return providers;
+    }
+
+
+    @Override
+    @Transactional
+    public void unlinkUserOAuth(HttpServletRequest request, String provider, String email) {
+        String token = jwtTokenProvider.resolveToken(request);
+
+        User user = findByEmail(email);
+
+        UserOAuth userOAuth = userOAuthRepository.findByUserIdAndProvider(user.getId(), provider).orElseThrow(
+                () -> new CustomException(INVALID_OAUTH_USER));
+
+        // 연동 해제
+        if (provider.equals("kakao")){
+            oAuth2UnlinkService.unlinkKakao(userOAuth.getProviderId());
+        }else if(provider.equals("naver")){
+            oAuth2UnlinkService.unlinkNaver(token);
+        }else if(provider.equals("google")){
+            oAuth2UnlinkService.unlinkGoogle(token);
+        }else{
+            throw new CustomException(StatusCode.INPUT_VALUE_INVALID);
+        }
+
+        userOAuthRepository.delete(userOAuth);
+    }
+
+    // [테스트용] - OAuth 로그인
+    @Override
+    public Map<String, String> testSocialLogin(String email) {
+
+        // test용 유저 생성
+        User testUser = userRepository.findByEmail(email).orElseGet(() -> {
+
+            // 유저 정보 저장
+            User newUser = userRepository.save( User.builder()
+                    .email(email)
+                    .nickname(randomNickname.generateNickname())
+                    .image(mainProfile)
+                    .role(UserRole.USER)
+                    .isDeleted(false)
+                    .build());
+
+            // OAuth2.0 정보 저장
+            userOAuthRepository.save( UserOAuth.builder()
+                    .user(newUser)
+                    .provider("test")
+                    .providerId("test")
+                    .build());
+            return newUser;
+        });
+
+        // OAuth2User 생성
+        Map<String, Object> attributes = new HashMap<>();
+        attributes.put("email", testUser.getEmail());
+        attributes.put("exist", true);
+        attributes.put("userId", testUser.getId());
+
+        OAuth2User oAuth2User = new DefaultOAuth2User(
+                Collections.singleton(new SimpleGrantedAuthority("ROLE_USER")),
+                attributes, "email");
+
+        String accessToken = jwtTokenProvider.createTestAccessToken(testUser.getEmail(), testUser.getId(),
+                testUser.getRole().toString());
+        String refreshToken = jwtTokenProvider.createTestRefreshToken(testUser.getEmail(), testUser.getId());
+
+        String redirectUrl = UriComponentsBuilder.fromHttpUrl(callBackUrl)
+                .queryParam("testAccess", accessToken)
+                .queryParam("testRefresh", refreshToken)
+                .toUriString();
+
+        log.info("UserServiceImpl.testSocialLogin: redirectUrl - {},", redirectUrl);
+
+        Map<String, String> response = new HashMap<>();
+        response.put("redirectUrl", redirectUrl);
+        response.put("accessToken", accessToken);
+        response.put("refreshToken", refreshToken);
+
+        return response;
+    }
+
+    private User findByEmail(String email) {
+        return userRepository.findByEmail(email).orElseThrow(() -> new CustomException(AUTHENTICATION_FAILED));
+    }
+
+}