@@ -53,15 +53,14 @@ public class OAuthServiceV2 {
5353
5454 @ Transactional
5555 public LoginResponseDto kakaoLogin (Long targetId , KakaoLoginRequestDto dto ) {
56- Optional < Member > member =
56+ Member member =
5757 memberRepository .findByEmailAndKakaoTargetIdAndStatus (
5858 dto .getEmail (),
5959 targetId ,
6060 MemberStatus .ACTIVE
61- );
61+ ). orElseThrow (() -> handleKakaoLoginError ( dto . getEmail (), targetId )) ;
6262
63- return member .map (this ::createToken )
64- .orElseThrow (() -> handleKakaoLoginError (dto .getEmail (), targetId ));
63+ return createToken (member );
6564 }
6665
6766 @ Transactional
@@ -92,15 +91,14 @@ public LoginResponseDto kakaoSignUp(Long targetId, KakaoSignUpRequestDto kakaoLo
9291
9392 @ Transactional
9493 public LoginResponseVersion2Dto kakaoLoginVersion2 (Long targetId , KakaoLoginRequestDto dto ) {
95- Optional < Member > member =
94+ Member member =
9695 memberRepository .findByEmailAndKakaoTargetIdAndStatus (
9796 dto .getEmail (),
9897 targetId ,
9998 MemberStatus .ACTIVE
100- );
99+ ). orElseThrow (() -> handleKakaoLoginError ( dto . getEmail (), targetId )) ;
101100
102- return member .map (this ::createTokenVersion2 )
103- .orElseThrow (() -> handleKakaoLoginError (dto .getEmail (), targetId ));
101+ return createTokenVersion2 (member );
104102 }
105103
106104 @ Transactional
@@ -207,15 +205,14 @@ public LoginResponseDto appleLogin(AppleLoginRequestDto request) {
207205 String email = appleInfo .getEmail ();
208206 String sub = appleInfo .getSub ();
209207
210- Optional < Member > member =
208+ Member member =
211209 memberRepository .findByEmailAndAppleSubAndStatus (
212210 email ,
213211 sub ,
214212 MemberStatus .ACTIVE
215- );
213+ ). orElseThrow (() -> handleAppleLoginError ( email , sub )) ;
216214
217- return member .map (this ::createToken )
218- .orElseThrow (() -> handleAppleLoginError (email , sub ));
215+ return createToken (member );
219216 }
220217
221218 @ Transactional
@@ -257,15 +254,14 @@ public LoginResponseVersion2Dto appleLoginVersion2(AppleLoginRequestDto request)
257254 if (email == null || sub == null )
258255 throw new ExceptionHandler (INVALID_APPLE_ID_TOKEN );
259256
260- Optional < Member > member =
257+ Member member =
261258 memberRepository .findByEmailAndAppleSubAndStatus (
262259 email ,
263260 sub ,
264261 MemberStatus .ACTIVE
265- );
262+ ). orElseThrow (() -> handleAppleLoginError ( email , sub )) ;
266263
267- return member .map (this ::createTokenVersion2 )
268- .orElseThrow (() -> handleAppleLoginError (email , sub ));
264+ return createTokenVersion2 (member );
269265 }
270266
271267 @ Transactional
0 commit comments