카카오 사용자를 애플, 구글 사용자로 전환하는 로직 개발

.github/workflows/pr-test.yml

@@ -29,6 +29,11 @@ jobs:
           mkdir -p src/main/resources/firebase
           echo ${{ secrets.BACKEND_FIREBASE_JSON }} > src/main/resources/firebase/serviceAccountKey.json
 
+      - name: Apple Auth Key 파일 이동
+        run: |
+          mkdir -p src/main/resources/auth
+          printf "%s" "${{ secrets.APPLE_AUTH_KEY }}" > src/main/resources/auth/AuthKey.p8
+
       - name: gradlew 권한 부여
         run: chmod +x ./gradlew
 

backend/src/main/java/mouda/backend/auth/business/AppleAuthService.java

@@ -3,9 +3,10 @@
 import org.springframework.stereotype.Service;
 
 import lombok.RequiredArgsConstructor;
+import mouda.backend.auth.business.result.LoginProcessResult;
 import mouda.backend.auth.implement.AppleOauthManager;
 import mouda.backend.auth.implement.LoginManager;
-import mouda.backend.auth.presentation.request.OauthRequest;
+import mouda.backend.auth.presentation.request.LegacyOauthRequest;
 import mouda.backend.auth.presentation.response.LoginResponse;
 import mouda.backend.member.domain.Member;
 import mouda.backend.member.domain.OauthType;
@@ -18,11 +19,14 @@ public class AppleAuthService implements AuthService {
 	private final LoginManager loginManager;
 
 	@Override
-	public LoginResponse oauthLogin(OauthRequest oauthRequest) {
+	public LoginResponse oauthLogin(LegacyOauthRequest oauthRequest) {
 		String socialLoginId = oauthManager.getSocialLoginId(oauthRequest.code());
-		String accessToken = loginManager.processSocialLogin(OauthType.APPLE, socialLoginId);
-
-		return new LoginResponse(accessToken);
+		if (oauthRequest.memberId() != null) {
+			String accessToken = loginManager.updateOauth(oauthRequest.memberId(), OauthType.APPLE, socialLoginId);
+			return new LoginResponse(accessToken);
+		}
+		LoginProcessResult loginProcessResult = loginManager.processSocialLogin(OauthType.APPLE, socialLoginId);
+		return new LoginResponse(loginProcessResult.accessToken());
 	}
 
 	@Override

backend/src/main/java/mouda/backend/auth/business/AuthService.java

@@ -1,12 +1,12 @@
 package mouda.backend.auth.business;
 
-import mouda.backend.auth.presentation.request.OauthRequest;
+import mouda.backend.auth.presentation.request.LegacyOauthRequest;
 import mouda.backend.auth.presentation.response.LoginResponse;
 import mouda.backend.member.domain.Member;
 
 public interface AuthService {
 
-	LoginResponse oauthLogin(OauthRequest oauthRequest);
+	LoginResponse oauthLogin(LegacyOauthRequest oauthRequest);
 
 	Member findMember(String token);
 

backend/src/main/java/mouda/backend/auth/business/GoogleAuthService.java

@@ -3,9 +3,10 @@
 import org.springframework.stereotype.Service;
 
 import lombok.RequiredArgsConstructor;
+import mouda.backend.auth.business.result.LoginProcessResult;
 import mouda.backend.auth.implement.GoogleOauthManager;
 import mouda.backend.auth.implement.LoginManager;
-import mouda.backend.auth.presentation.request.GoogleOauthReqeust;
+import mouda.backend.auth.presentation.request.GoogleOauthRequest;
 import mouda.backend.auth.presentation.response.LoginResponse;
 import mouda.backend.member.domain.Member;
 import mouda.backend.member.domain.OauthType;
@@ -17,11 +18,16 @@ public class GoogleAuthService {
 	private final GoogleOauthManager googleOauthManager;
 	private final LoginManager loginManager;
 
-	public LoginResponse oauthLogin(GoogleOauthReqeust googleOauthReqeust) {
-		String memberName = googleOauthManager.getMemberName(googleOauthReqeust.idToken());
-		String socialLoginId = googleOauthManager.getSocialLoginId(googleOauthReqeust.idToken());
-		String accessToken = loginManager.processSocialLogin(OauthType.GOOGLE, socialLoginId);
-		return new LoginResponse(accessToken);
+	public LoginResponse oauthLogin(GoogleOauthRequest googleOauthRequest) {
+		String memberName = googleOauthManager.getMemberName(googleOauthRequest.idToken());
+		String socialLoginId = googleOauthManager.getSocialLoginId(googleOauthRequest.idToken());
+		if (googleOauthRequest.memberId() != null) {
+			String accessToken = loginManager.updateOauth(googleOauthRequest.memberId(), OauthType.GOOGLE,
+				socialLoginId);
+			return new LoginResponse(accessToken);
+		}
+		LoginProcessResult loginProcessResult = loginManager.processSocialLogin(OauthType.GOOGLE, socialLoginId);
+		return new LoginResponse(loginProcessResult.accessToken());
 	}
 
 	public Member findMember(String token) {

backend/src/main/java/mouda/backend/auth/business/KakaoAuthService.java

@@ -3,10 +3,12 @@
 import org.springframework.stereotype.Service;
 
 import lombok.RequiredArgsConstructor;
+import mouda.backend.auth.business.result.LoginProcessResult;
 import mouda.backend.auth.implement.KakaoOauthManager;
 import mouda.backend.auth.implement.LoginManager;
 import mouda.backend.auth.implement.jwt.AccessTokenProvider;
 import mouda.backend.auth.presentation.request.OauthRequest;
+import mouda.backend.auth.presentation.response.KakaoLoginResponse;
 import mouda.backend.auth.presentation.response.LoginResponse;
 import mouda.backend.member.domain.LoginDetail;
 import mouda.backend.member.domain.Member;
@@ -16,19 +18,19 @@
 
 @Service
 @RequiredArgsConstructor
-public class KakaoAuthService implements AuthService {
+public class KakaoAuthService {
 
 	private final AccessTokenProvider accessTokenProvider;
 	private final KakaoOauthManager oauthManager;
 	private final LoginManager loginManager;
 	private final MemberFinder memberFinder;
 	private final MemberWriter memberWriter;
 
-	public LoginResponse oauthLogin(OauthRequest oauthRequest) {
+	public KakaoLoginResponse oauthLogin(OauthRequest oauthRequest) {
 		String kakaoId = oauthManager.getSocialLoginId(oauthRequest.code());
-		String token = loginManager.processSocialLogin(OauthType.KAKAO, kakaoId);
+		LoginProcessResult loginProcessResult = loginManager.processSocialLogin(OauthType.KAKAO, kakaoId);
 
-		return new LoginResponse(token);
+		return new KakaoLoginResponse(loginProcessResult.memberId(), loginProcessResult.accessToken());
 	}
 
 	public Member findMember(String token) {

backend/src/main/java/mouda/backend/auth/business/result/LoginProcessResult.java

@@ -0,0 +1,7 @@
+package mouda.backend.auth.business.result;
+
+public record LoginProcessResult(
+	Long memberId,
+	String accessToken
+) {
+}

backend/src/main/java/mouda/backend/auth/exception/AuthErrorMessage.java

@@ -18,7 +18,7 @@ public enum AuthErrorMessage {
 	KAKAO_CONNECT_TIMEOUT("커넥션 타임아웃 되었습니다."),
 	DARAKBANG_NOT_ENTERED("가입한 다락방이 아닙니다."),
 	MEMBER_NOT_FOUND("회원가입 이력을 찾을 수 없습니다."),
-	;
+	KAKAO_CANNOT_SIGNUP("기존 카카오 로그인 이력이 있는 사용자만 이용할 수 있는 서비스입니다. 새로운 회원은 다른 로그인 서비스를 이용해주세요.");
 
 	private final String message;
 }

backend/src/main/java/mouda/backend/auth/implement/LoginManager.java

@@ -2,39 +2,53 @@
 
 import java.util.Optional;
 
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import mouda.backend.auth.business.result.LoginProcessResult;
+import mouda.backend.auth.exception.AuthErrorMessage;
+import mouda.backend.auth.exception.AuthException;
 import mouda.backend.auth.implement.jwt.AccessTokenProvider;
 import mouda.backend.member.domain.LoginDetail;
 import mouda.backend.member.domain.Member;
 import mouda.backend.member.domain.OauthType;
+import mouda.backend.member.implement.MemberFinder;
 import mouda.backend.member.implement.MemberWriter;
 import mouda.backend.member.infrastructure.MemberRepository;
 
 @Component
 @RequiredArgsConstructor
-@Slf4j
 public class LoginManager {
 
 	private final MemberRepository memberRepository;
 	private final AccessTokenProvider accessTokenProvider;
 	private final MemberWriter memberWriter;
+	private final MemberFinder memberFinder;
 
-	public String processSocialLogin(OauthType oauthType, String socialLoginId) {
+	public LoginProcessResult processSocialLogin(OauthType oauthType, String socialLoginId) {
 		Optional<Member> member = memberRepository.findByLoginDetail_SocialLoginId(socialLoginId);
-		log.error("1번");
+
 		if (member.isPresent()) {
-			return accessTokenProvider.provide(member.get());
+			return new LoginProcessResult(member.get().getId(), accessTokenProvider.provide(member.get()));
+		}
+
+		if (oauthType == OauthType.KAKAO) {
+			throw new AuthException(HttpStatus.BAD_REQUEST, AuthErrorMessage.KAKAO_CANNOT_SIGNUP);
 		}
-		log.error("2번");
 		Member newMember = Member.builder()
 			.nickname("nickname")
 			.loginDetail(new LoginDetail(oauthType, socialLoginId))
 			.build();
 		memberWriter.append(newMember);
-		log.error("3번");
-		return accessTokenProvider.provide(newMember);
+
+		return new LoginProcessResult(newMember.getId(), accessTokenProvider.provide(newMember));
+	}
+
+	public String updateOauth(long memberId, OauthType oauthType, String socialLoginId) {
+		Member member = memberFinder.find(memberId);
+		memberWriter.updateLoginDetail(memberId, oauthType, socialLoginId);
+
+		return accessTokenProvider.provide(member);
 	}
 }

backend/src/main/java/mouda/backend/auth/presentation/controller/AuthController.java

@@ -12,8 +12,10 @@
 import mouda.backend.auth.business.GoogleAuthService;
 import mouda.backend.auth.business.KakaoAuthService;
 import mouda.backend.auth.presentation.controller.swagger.AuthSwagger;
-import mouda.backend.auth.presentation.request.GoogleOauthReqeust;
+import mouda.backend.auth.presentation.request.GoogleOauthRequest;
+import mouda.backend.auth.presentation.request.LegacyOauthRequest;
 import mouda.backend.auth.presentation.request.OauthRequest;
+import mouda.backend.auth.presentation.response.KakaoLoginResponse;
 import mouda.backend.auth.presentation.response.LoginResponse;
 import mouda.backend.common.response.RestResponse;
 
@@ -28,8 +30,8 @@ public class AuthController implements AuthSwagger {
 
 	@Override
 	@PostMapping("/kakao/oauth")
-	public ResponseEntity<RestResponse<LoginResponse>> loginKakaoOauth(@RequestBody OauthRequest oauthRequest) {
-		LoginResponse response = kakaoAuthService.oauthLogin(oauthRequest);
+	public ResponseEntity<RestResponse<KakaoLoginResponse>> loginKakaoOauth(@RequestBody OauthRequest oauthRequest) {
+		KakaoLoginResponse response = kakaoAuthService.oauthLogin(oauthRequest);
 
 		return ResponseEntity.ok().body(new RestResponse<>(response));
 	}
@@ -46,15 +48,15 @@ public ResponseEntity<RestResponse<LoginResponse>> loginBasicOauth() {
 	@Override
 	@PostMapping("/google/oauth")
 	public ResponseEntity<RestResponse<LoginResponse>> loginGoogleOauth(
-		@RequestBody GoogleOauthReqeust googleOauthReqeust) {
-		LoginResponse response = googleAuthService.oauthLogin(googleOauthReqeust);
+		@RequestBody GoogleOauthRequest googleOauthRequest) {
+		LoginResponse response = googleAuthService.oauthLogin(googleOauthRequest);
 
 		return ResponseEntity.ok().body(new RestResponse<>(response));
 	}
 
 	@Override
 	@PostMapping("/apple/oauth")
-	public ResponseEntity<RestResponse<LoginResponse>> loginAppleOauth(@RequestBody OauthRequest oauthRequest) {
+	public ResponseEntity<RestResponse<LoginResponse>> loginAppleOauth(@RequestBody LegacyOauthRequest oauthRequest) {
 		LoginResponse response = appleAuthService.oauthLogin(oauthRequest);
 
 		return ResponseEntity.ok().body(new RestResponse<>(response));

backend/src/main/java/mouda/backend/auth/presentation/controller/swagger/AuthSwagger.java

@@ -6,8 +6,10 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import mouda.backend.auth.presentation.request.GoogleOauthReqeust;
+import mouda.backend.auth.presentation.request.GoogleOauthRequest;
+import mouda.backend.auth.presentation.request.LegacyOauthRequest;
 import mouda.backend.auth.presentation.request.OauthRequest;
+import mouda.backend.auth.presentation.response.KakaoLoginResponse;
 import mouda.backend.auth.presentation.response.LoginResponse;
 import mouda.backend.common.response.RestResponse;
 
@@ -17,7 +19,7 @@ public interface AuthSwagger {
 	@ApiResponses({
 		@ApiResponse(responseCode = "200", description = "로그인 성공!"),
 	})
-	ResponseEntity<RestResponse<LoginResponse>> loginKakaoOauth(@RequestBody OauthRequest oauthRequest);
+	ResponseEntity<RestResponse<KakaoLoginResponse>> loginKakaoOauth(@RequestBody OauthRequest oauthRequest);
 
 	@Operation(summary = "테스트 용 로그인", description = "테스트 용 가짜 사용자로 로그인한다(accessToken 발급).")
 	@ApiResponses({
@@ -29,11 +31,11 @@ public interface AuthSwagger {
 	@ApiResponses({
 		@ApiResponse(responseCode = "200", description = "로그인 성공!"),
 	})
-	ResponseEntity<RestResponse<LoginResponse>> loginAppleOauth(@RequestBody OauthRequest oauthRequest);
+	ResponseEntity<RestResponse<LoginResponse>> loginAppleOauth(@RequestBody LegacyOauthRequest oauthRequest);
 
 	@Operation(summary = "구글 oauth 로그인", description = "구글 Oauth Code 를 사용하여 로그인한다(accessToken 발급).")
 	@ApiResponses({
 		@ApiResponse(responseCode = "200", description = "로그인 성공!"),
 	})
-	ResponseEntity<RestResponse<LoginResponse>> loginGoogleOauth(@RequestBody GoogleOauthReqeust googleOauthReqeust);
+	ResponseEntity<RestResponse<LoginResponse>> loginGoogleOauth(@RequestBody GoogleOauthRequest googleOauthRequest);
 }

backend/src/main/java/mouda/backend/auth/presentation/request/GoogleOauthRequest.java

@@ -0,0 +1,11 @@
+package mouda.backend.auth.presentation.request;
+
+import jakarta.validation.constraints.NotNull;
+
+public record GoogleOauthRequest(
+	Long memberId,
+
+	@NotNull
+	String idToken
+) {
+}

backend/src/main/java/mouda/backend/auth/presentation/request/LegacyOauthRequest.java

@@ -0,0 +1,11 @@
+package mouda.backend.auth.presentation.request;
+
+import jakarta.validation.constraints.NotNull;
+
+public record LegacyOauthRequest(
+	Long memberId,
+
+	@NotNull
+	String code
+) {
+}

backend/src/main/java/mouda/backend/auth/presentation/request/OauthRequest.java

@@ -1,6 +1,9 @@
 package mouda.backend.auth.presentation.request;
 
+import jakarta.validation.constraints.NotNull;
+
 public record OauthRequest(
+	@NotNull
 	String code
 ) {
 }

backend/src/main/java/mouda/backend/auth/presentation/response/KakaoLoginResponse.java

@@ -0,0 +1,7 @@
+package mouda.backend.auth.presentation.response;
+
+public record KakaoLoginResponse(
+	Long memberId,
+	String accessToken
+) {
+}

backend/src/main/java/mouda/backend/auth/presentation/response/LoginResponse.java

@@ -1,5 +1,7 @@
 package mouda.backend.auth.presentation.response;
 
-public record LoginResponse(String accessToken) {
+public record LoginResponse(
+	String accessToken
+) {
 
 }

backend/src/main/java/mouda/backend/member/domain/LoginDetail.java

@@ -1,5 +1,7 @@
 package mouda.backend.member.domain;
 
+import java.util.Objects;
+
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -21,4 +23,19 @@ public LoginDetail(OauthType oauthType, String socialLoginId) {
 		this.oauthType = oauthType;
 		this.socialLoginId = socialLoginId;
 	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		LoginDetail that = (LoginDetail)o;
+		return oauthType == that.oauthType && Objects.equals(socialLoginId, that.socialLoginId);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(oauthType, socialLoginId);
+	}
 }

backend/src/main/java/mouda/backend/member/implement/MemberWriter.java

@@ -4,6 +4,7 @@
 
 import lombok.RequiredArgsConstructor;
 import mouda.backend.member.domain.Member;
+import mouda.backend.member.domain.OauthType;
 import mouda.backend.member.infrastructure.MemberRepository;
 
 @Component
@@ -15,4 +16,8 @@ public class MemberWriter {
 	public Member append(Member member) {
 		return memberRepository.save(member);
 	}
+
+	public void updateLoginDetail(long memberId, OauthType oauthType, String socialLoginId) {
+		memberRepository.updateLoginDetail(memberId, oauthType, socialLoginId);
+	}
 }