Skip to content

Commit 687057b

Browse files
committed
Revert "Fix: 소셜 로그인 시 providerId가 null일 경우 예외 처리 및 클라이언트 키에 따른 providerId 저장 로직 추가"
This reverts commit df17920.
1 parent df17920 commit 687057b

2 files changed

Lines changed: 0 additions & 7 deletions

File tree

src/main/java/com/fund/stockProject/auth/service/AuthService.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@ public String register(OAuth2RegisterRequest oAuth2RegisterRequest, String clien
127127
MultipartFile image = oAuth2RegisterRequest.getImage();
128128
String imageUrl = (image != null && !image.isEmpty()) ? s3Service.uploadUserImage(image, "users") : null;
129129
String providerId = resolveSocialProviderId(oAuth2RegisterRequest, provider, clientKey);
130-
if (providerId == null) {
131-
throw new IllegalArgumentException("Social registration context expired. Please retry social login.");
132-
}
133130
String email = resolveRegistrationEmail(oAuth2RegisterRequest, provider, providerId);
134131
Boolean marketingAgreement = oAuth2RegisterRequest.getMarketingAgreement() != null
135132
? oAuth2RegisterRequest.getMarketingAgreement()
@@ -169,7 +166,6 @@ private String resolveSocialProviderId(OAuth2RegisterRequest request, PROVIDER p
169166
if (provider == PROVIDER.APPLE) {
170167
return pendingProviderId
171168
.or(() -> appleLoginContextService.extractProviderIdFromFallbackEmail(email))
172-
.or(() -> appleLoginContextService.consumePendingProviderIdByClient(PROVIDER.APPLE, clientKey))
173169
.orElse(null);
174170
}
175171
return pendingProviderId.orElse(null);

src/main/java/com/fund/stockProject/auth/service/OAuth2Service.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ public LoginResponse appleLogin(String code, String state, String userJson, Stri
112112
Optional<User> userOptional = userRepository.findByEmail(email);
113113
if (userOptional.isEmpty()) {
114114
appleLoginContextService.savePendingProviderId(PROVIDER.APPLE, email, providerId);
115-
if (clientKey != null && !clientKey.isBlank()) {
116-
appleLoginContextService.savePendingProviderIdByClient(PROVIDER.APPLE, clientKey, providerId);
117-
}
118115
return new LoginResponse("NEED_REGISTER", email, null, null, null, null);
119116
}
120117

0 commit comments

Comments
 (0)