Skip to content

Commit 40e34e3

Browse files
authored
Merge pull request #341 from EAT-SSU/fix/login-problem-fix
fix: 기존 유저 정보로 credential 생성
2 parents 5447d0c + 3c57a1c commit 40e34e3

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/main/java/ssu/eatssu/domain/auth/service/OAuthService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public Tokens kakaoLogin(KakaoLoginRequest request) {
3737
.orElseGet(() -> userRepository.findFirstByEmailOrderByIdAsc(request.email())
3838
.orElseGet(() -> userService.join(request.email(), KAKAO, request.providerId())));
3939

40-
return generateOauthJwtTokens(user.getEmail(), KAKAO, request.providerId());
40+
return generateOauthJwtTokens(user.getEmail(), user.getProvider(), user.getProviderId());
4141
}
4242

4343
/**
@@ -51,7 +51,7 @@ public Tokens kakaoLoginV2(KakaoLoginRequestV2 request) {
5151
user.updateDeviceType(request.deviceType());
5252

5353

54-
return generateOauthJwtTokens(user.getEmail(), KAKAO, request.providerId());
54+
return generateOauthJwtTokens(user.getEmail(), user.getProvider(), user.getProviderId());
5555
}
5656

5757

@@ -64,7 +64,7 @@ public Tokens appleLogin(AppleLoginRequest request) {
6464

6565
updateAppleUserEmail(user, oAuthInfo.email());
6666

67-
return generateOauthJwtTokens(user.getEmail(), APPLE, oAuthInfo.providerId());
67+
return generateOauthJwtTokens(user.getEmail(), user.getProvider(), user.getProviderId());
6868
}
6969

7070
/**
@@ -81,7 +81,7 @@ public Tokens appleLoginV2(AppleLoginRequestV2 request) {
8181

8282
user.updateDeviceType(request.deviceType());
8383

84-
return generateOauthJwtTokens(user.getEmail(), APPLE, oAuthInfo.providerId());
84+
return generateOauthJwtTokens(user.getEmail(), user.getProvider(), user.getProviderId());
8585
}
8686

8787
public Tokens refreshTokens(Authentication authentication) {

0 commit comments

Comments
 (0)