Skip to content

feat : 회원 탈퇴를 소프트 딜리트 방식으로 변경 #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
essaysir merged 4 commits into from
Jun 22, 2025
Merged

feat : 회원 탈퇴를 소프트 딜리트 방식으로 변경 #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5da855d
feat : member 엔티티 변경
essaysir Jun 18, 2025
8e17a00
feat : OauthService 리팩토링 및 회원탈퇴를 soft delete 로 변경
essaysir Jun 19, 2025
2b2711f
feat : jwt 로 멤버를 불러올 때, status 가 Active 인 것만 불러오도록 수정
essaysir Jun 19, 2025
0480567
fix : 회원 탈퇴시, 닉네임 null 처리
essaysir Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
367 changes: 191 additions & 176 deletions src/main/java/umc/th/juinjang/api/auth/controller/OAuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,36 @@
package umc.th.juinjang.api.auth.controller;

import static umc.th.juinjang.common.code.status.ErrorStatus.*;

import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import io.micrometer.common.lang.Nullable;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import umc.th.juinjang.api.dto.ApiResponse;
import umc.th.juinjang.common.ExceptionHandler;
import umc.th.juinjang.common.code.status.SuccessStatus;
import umc.th.juinjang.api.auth.service.response.LoginResponseDto;
import umc.th.juinjang.api.auth.service.response.LoginResponseVersion2Dto;
import umc.th.juinjang.api.auth.controller.request.WithdrawReasonRequestDto;
import umc.th.juinjang.api.auth.controller.request.AppleLoginRequestDto;
import umc.th.juinjang.api.auth.controller.request.AppleSignUpRequestDto;
import umc.th.juinjang.api.auth.controller.request.AppleSignUpRequestVersion2Dto;
import umc.th.juinjang.api.auth.controller.request.KakaoLoginRequestDto;
import umc.th.juinjang.api.auth.controller.request.KakaoSignUpRequestDto;
import umc.th.juinjang.api.auth.controller.request.KakaoSignUpRequestVersion2Dto;
import umc.th.juinjang.domain.member.model.Member;
import umc.th.juinjang.api.auth.controller.request.WithdrawReasonRequestDto;
import umc.th.juinjang.api.auth.service.OAuthServiceV2;
import umc.th.juinjang.api.auth.service.WithdrawService;
import umc.th.juinjang.api.auth.service.OAuthService;

import static umc.th.juinjang.common.code.status.ErrorStatus.*;
import umc.th.juinjang.api.auth.service.response.LoginResponseDto;
import umc.th.juinjang.api.auth.service.response.LoginResponseVersion2Dto;
import umc.th.juinjang.api.dto.ApiResponse;
import umc.th.juinjang.common.ExceptionHandler;
import umc.th.juinjang.common.code.status.SuccessStatus;
import umc.th.juinjang.domain.member.model.Member;

@Slf4j
@RestController
Expand All @@ -33,165 +39,174 @@
@Validated
public class OAuthController {

private final OAuthService oauthService;
private final WithdrawService withdrawService;

// 카카오 로그인
// 프론트 측에서 전달해준 사용자 정보로 토큰 발급
@PostMapping("/kakao/login")
public ApiResponse<LoginResponseDto> kakaoLogin(@RequestHeader("target-id") String kakaoTargetId, @RequestBody @Validated KakaoLoginRequestDto kakaoReqDto) {
Long targetId;
if(kakaoTargetId == null) {
throw new ExceptionHandler(EMPTY_TARGET_ID);
}

targetId = Long.parseLong(kakaoTargetId);
return ApiResponse.onSuccess(oauthService.kakaoLogin(targetId, kakaoReqDto));
}

// 카카오 로그인 (회원가입)
@PostMapping("/kakao/signup")
public ApiResponse<LoginResponseDto> kakaoSignUp(@RequestHeader("target-id") String kakaoTargetId, @RequestBody @Validated KakaoSignUpRequestDto kakaoSignUpReqDto) {
Long targetId;
if(kakaoTargetId == null) {
throw new ExceptionHandler(EMPTY_TARGET_ID);
}

targetId = Long.parseLong(kakaoTargetId);
return ApiResponse.onSuccess(oauthService.kakaoSignUp(targetId, kakaoSignUpReqDto));
}

//V2
// 카카오 로그인
@PostMapping("/v2/kakao/login")
public ApiResponse<LoginResponseVersion2Dto> kakaoLoginVersion2(@RequestHeader("target-id") String kakaoTargetId, @RequestBody @Validated KakaoLoginRequestDto kakaoReqDto) {
Long targetId;
if(kakaoTargetId == null) {
throw new ExceptionHandler(EMPTY_TARGET_ID);
}

targetId = Long.parseLong(kakaoTargetId);
return ApiResponse.onSuccess(oauthService.kakaoLoginVersion2(targetId, kakaoReqDto));
}

// 카카오 로그인 (회원가입)
@PostMapping("/v2/kakao/signup")
public ApiResponse<LoginResponseVersion2Dto> kakaoSignUpVersion2(@RequestHeader("target-id") String kakaoTargetId, @RequestBody @Validated KakaoSignUpRequestVersion2Dto kakaoSignUpReqDto) {
Long targetId;
if(kakaoTargetId == null) {
throw new ExceptionHandler(EMPTY_TARGET_ID);
}

targetId = Long.parseLong(kakaoTargetId);
return ApiResponse.onSuccess(oauthService.kakaoSignUpVersion2(targetId, kakaoSignUpReqDto));
}


// refreshToken으로 accessToken 재발급
// Authorization : Bearer Token에 refreshToken 담기
@PostMapping("/regenerate-token")
public ApiResponse<LoginResponseDto> regenerateAccessToken(HttpServletRequest request) {
String accessToken = request.getHeader("Authorization");
String refreshToken = request.getHeader("Refresh-Token");

if (StringUtils.hasText(accessToken) && accessToken.startsWith("Bearer ") && StringUtils.hasText(refreshToken) && refreshToken.startsWith("Bearer ")) {
LoginResponseDto result = oauthService.regenerateAccessToken(accessToken.substring(7), refreshToken.substring(7));
return ApiResponse.onSuccess(result);
} else
throw new ExceptionHandler(TOKEN_EMPTY);
}

// 로그아웃 -> refresh 토큰 만료
@PostMapping("/logout")
public ApiResponse<String> logout(HttpServletRequest request) {
String token = request.getHeader("Refresh-Token");

if (StringUtils.hasText(token) && token.startsWith("Bearer ")) {
String result = oauthService.logout(token.substring(7));
return ApiResponse.onSuccess(result);
} else
throw new ExceptionHandler(TOKEN_EMPTY);
}

// 애플 로그인
// 클라이언트에서 identity token 값 받아오기
// 사용자가 입력한 정보를 바탕으로 Apple ID servers 에게 Identity Token 발급 요청 (프론트가) -> 이를 우리 서버가 가져오는 것
// Identity Token 값을 바탕으로 사용자 식별 & refresh, access Token 발급해주고 DB 저장 (로그인하기)

// 로그인
@PostMapping("/apple/login")
public ApiResponse<LoginResponseDto> appleLogin(@RequestBody @Validated AppleLoginRequestDto appleReqDto) {
if (appleReqDto.getIdentityToken() == null)
throw new ExceptionHandler(APPLE_ID_TOKEN_EMPTY);
return ApiResponse.onSuccess(oauthService.appleLogin(appleReqDto));
}

@PostMapping("/apple/signup")
public ApiResponse<LoginResponseDto> appleSignUp(@RequestBody @Validated AppleSignUpRequestDto appleSignUpReqDto) {
if (appleSignUpReqDto.getIdentityToken() == null)
throw new ExceptionHandler(APPLE_ID_TOKEN_EMPTY);
return ApiResponse.onSuccess(oauthService.appleSignUp(appleSignUpReqDto));
}

//V2
@PostMapping("/v2/apple/login")
public ApiResponse<LoginResponseVersion2Dto> appleLoginVersion2(@RequestBody @Validated AppleLoginRequestDto appleReqDto) {
if (appleReqDto.getIdentityToken() == null)
throw new ExceptionHandler(APPLE_ID_TOKEN_EMPTY);
return ApiResponse.onSuccess(oauthService.appleLoginVersion2(appleReqDto));
}

@PostMapping("/v2/apple/signup")
public ApiResponse<LoginResponseVersion2Dto> appleSignUpVersion2(@RequestBody @Validated AppleSignUpRequestVersion2Dto appleSignUpReqDto) {
if (appleSignUpReqDto.getIdentityToken() == null)
throw new ExceptionHandler(APPLE_ID_TOKEN_EMPTY);
return ApiResponse.onSuccess(oauthService.appleSignUpVersion2(appleSignUpReqDto));
}


// 카카오 탈퇴
@DeleteMapping("/withdraw/kakao")
public ApiResponse kakaoWithdraw(@AuthenticationPrincipal Member member, @RequestHeader("target-id") String kakaoTargetId, @RequestBody WithdrawReasonRequestDto withdrawReasonReqDto) {
Long targetId;

if(kakaoTargetId == null) {
throw new ExceptionHandler(EMPTY_TARGET_ID);
} else {
targetId = Long.parseLong(kakaoTargetId);
if(!targetId.equals(member.getKakaoTargetId())) {
throw new ExceptionHandler(UNCORRECTED_TARGET_ID);
}
}

// 카카오 계정 연결 끊기
boolean isUnlink = oauthService.kakaoWithdraw(member, targetId);

// 탈퇴 사유 추가
if(withdrawReasonReqDto.getWithdrawReason() != null) {
withdrawService.addWithdrawReason(withdrawReasonReqDto.getWithdrawReason());
}

// 사용자 정보 삭제 (DB)
if (!isUnlink) {
throw new ExceptionHandler(NOT_UNLINK_KAKAO);
}

return ApiResponse.onSuccess(SuccessStatus.MEMBER_DELETE);
}


// 애플 탈퇴
@DeleteMapping("/withdraw/apple")
public ApiResponse withdraw(@AuthenticationPrincipal Member member,
@Nullable@RequestHeader("X-Apple-Code") final String code, @RequestBody WithdrawReasonRequestDto withdrawReasonReqDto){
oauthService.appleWithdraw(member, code);

// 탈퇴 사유 추가
if(withdrawReasonReqDto.getWithdrawReason() != null) {
withdrawService.addWithdrawReason(withdrawReasonReqDto.getWithdrawReason());
}

return ApiResponse.onSuccess(SuccessStatus.MEMBER_DELETE);
}

}
// private final OAuthService oauthService;
private final OAuthServiceV2 oauthService;
private final WithdrawService withdrawService;

// 카카오 로그인
// 프론트 측에서 전달해준 사용자 정보로 토큰 발급
@PostMapping("/kakao/login")
public ApiResponse<LoginResponseDto> kakaoLogin(@RequestHeader("target-id") String kakaoTargetId,
@RequestBody @Validated KakaoLoginRequestDto kakaoReqDto) {
Long targetId;
if (kakaoTargetId == null) {
throw new ExceptionHandler(EMPTY_TARGET_ID);
}

targetId = Long.parseLong(kakaoTargetId);
return ApiResponse.onSuccess(oauthService.kakaoLogin(targetId, kakaoReqDto));
}

// 카카오 로그인 (회원가입)
@PostMapping("/kakao/signup")
public ApiResponse<LoginResponseDto> kakaoSignUp(@RequestHeader("target-id") String kakaoTargetId,
@RequestBody @Validated KakaoSignUpRequestDto kakaoSignUpReqDto) {
Long targetId;
if (kakaoTargetId == null) {
throw new ExceptionHandler(EMPTY_TARGET_ID);
}

targetId = Long.parseLong(kakaoTargetId);
return ApiResponse.onSuccess(oauthService.kakaoSignUp(targetId, kakaoSignUpReqDto));
}

//V2
// 카카오 로그인
@PostMapping("/v2/kakao/login")
public ApiResponse<LoginResponseVersion2Dto> kakaoLoginVersion2(@RequestHeader("target-id") String kakaoTargetId,
@RequestBody @Validated KakaoLoginRequestDto kakaoReqDto) {
Long targetId;
if (kakaoTargetId == null) {
throw new ExceptionHandler(EMPTY_TARGET_ID);
}

targetId = Long.parseLong(kakaoTargetId);
return ApiResponse.onSuccess(oauthService.kakaoLoginVersion2(targetId, kakaoReqDto));
}

// 카카오 로그인 (회원가입)
@PostMapping("/v2/kakao/signup")
public ApiResponse<LoginResponseVersion2Dto> kakaoSignUpVersion2(@RequestHeader("target-id") String kakaoTargetId,
@RequestBody @Validated KakaoSignUpRequestVersion2Dto kakaoSignUpReqDto) {
Long targetId;
if (kakaoTargetId == null) {
throw new ExceptionHandler(EMPTY_TARGET_ID);
}

targetId = Long.parseLong(kakaoTargetId);
return ApiResponse.onSuccess(oauthService.kakaoSignUpVersion2(targetId, kakaoSignUpReqDto));
}

// refreshToken으로 accessToken 재발급
// Authorization : Bearer Token에 refreshToken 담기
@PostMapping("/regenerate-token")
public ApiResponse<LoginResponseDto> regenerateAccessToken(HttpServletRequest request) {
String accessToken = request.getHeader("Authorization");
String refreshToken = request.getHeader("Refresh-Token");

if (StringUtils.hasText(accessToken) && accessToken.startsWith("Bearer ") && StringUtils.hasText(refreshToken)
&& refreshToken.startsWith("Bearer ")) {
LoginResponseDto result = oauthService.regenerateAccessToken(accessToken.substring(7),
refreshToken.substring(7));
return ApiResponse.onSuccess(result);
} else
throw new ExceptionHandler(TOKEN_EMPTY);
}

// 로그아웃 -> refresh 토큰 만료
@PostMapping("/logout")
public ApiResponse<String> logout(HttpServletRequest request) {
String token = request.getHeader("Refresh-Token");

if (StringUtils.hasText(token) && token.startsWith("Bearer ")) {
String result = oauthService.logout(token.substring(7));
return ApiResponse.onSuccess(result);
} else
throw new ExceptionHandler(TOKEN_EMPTY);
}

// 애플 로그인
// 클라이언트에서 identity token 값 받아오기
// 사용자가 입력한 정보를 바탕으로 Apple ID servers 에게 Identity Token 발급 요청 (프론트가) -> 이를 우리 서버가 가져오는 것
// Identity Token 값을 바탕으로 사용자 식별 & refresh, access Token 발급해주고 DB 저장 (로그인하기)

// 로그인
@PostMapping("/apple/login")
public ApiResponse<LoginResponseDto> appleLogin(@RequestBody @Validated AppleLoginRequestDto appleReqDto) {
if (appleReqDto.getIdentityToken() == null)
throw new ExceptionHandler(APPLE_ID_TOKEN_EMPTY);
return ApiResponse.onSuccess(oauthService.appleLogin(appleReqDto));
}

@PostMapping("/apple/signup")
public ApiResponse<LoginResponseDto> appleSignUp(@RequestBody @Validated AppleSignUpRequestDto appleSignUpReqDto) {
if (appleSignUpReqDto.getIdentityToken() == null)
throw new ExceptionHandler(APPLE_ID_TOKEN_EMPTY);
return ApiResponse.onSuccess(oauthService.appleSignUp(appleSignUpReqDto));
}

//V2
@PostMapping("/v2/apple/login")
public ApiResponse<LoginResponseVersion2Dto> appleLoginVersion2(
@RequestBody @Validated AppleLoginRequestDto appleReqDto) {
if (appleReqDto.getIdentityToken() == null)
throw new ExceptionHandler(APPLE_ID_TOKEN_EMPTY);
return ApiResponse.onSuccess(oauthService.appleLoginVersion2(appleReqDto));
}

@PostMapping("/v2/apple/signup")
public ApiResponse<LoginResponseVersion2Dto> appleSignUpVersion2(
@RequestBody @Validated AppleSignUpRequestVersion2Dto appleSignUpReqDto) {
if (appleSignUpReqDto.getIdentityToken() == null)
throw new ExceptionHandler(APPLE_ID_TOKEN_EMPTY);
return ApiResponse.onSuccess(oauthService.appleSignUpVersion2(appleSignUpReqDto));
}

// 카카오 탈퇴
@DeleteMapping("/withdraw/kakao")
public ApiResponse kakaoWithdraw(@AuthenticationPrincipal Member member,
@RequestHeader("target-id") String kakaoTargetId, @RequestBody WithdrawReasonRequestDto withdrawReasonReqDto) {
Long targetId;

if (kakaoTargetId == null) {
throw new ExceptionHandler(EMPTY_TARGET_ID);
} else {
targetId = Long.parseLong(kakaoTargetId);
if (!targetId.equals(member.getKakaoTargetId())) {
throw new ExceptionHandler(UNCORRECTED_TARGET_ID);
}
}

// 카카오 계정 연결 끊기
// TODO : 해당 로직을 스케쥴러로 이동할 필요가 있음.
boolean isUnlink = oauthService.kakaoWithdraw(member, targetId);

// 탈퇴 사유 추가
if (withdrawReasonReqDto.getWithdrawReason() != null) {
withdrawService.addWithdrawReason(withdrawReasonReqDto.getWithdrawReason());
}

// 사용자 정보 삭제 (DB)
if (!isUnlink) {
throw new ExceptionHandler(NOT_UNLINK_KAKAO);
}

return ApiResponse.onSuccess(SuccessStatus.MEMBER_DELETE);
}

// 애플 탈퇴
@DeleteMapping("/withdraw/apple")
public ApiResponse withdraw(@AuthenticationPrincipal Member member,
@Nullable @RequestHeader("X-Apple-Code") final String code,
@RequestBody WithdrawReasonRequestDto withdrawReasonReqDto) {
oauthService.appleWithdraw(member, code);

// 탈퇴 사유 추가
if (withdrawReasonReqDto.getWithdrawReason() != null) {
withdrawService.addWithdrawReason(withdrawReasonReqDto.getWithdrawReason());
}

return ApiResponse.onSuccess(SuccessStatus.MEMBER_DELETE);
}

}
Loading