Skip to content

fix: 스테이지 환경에서는 탈퇴 유예 무효화 #335

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
dh2906 merged 1 commit into from
Feb 28, 2026
Merged

fix: 스테이지 환경에서는 탈퇴 유예 무효화 #335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions src/main/java/gg/agit/konect/global/auth/oauth/OAuthLoginHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import java.util.Set;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.core.env.Profiles;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
Expand All @@ -24,9 +26,12 @@ public class OAuthLoginHelper {

private static final long RESTORE_WINDOW_DAYS = 7L;

private static final String STAGE_PROFILE = "stage";

private final UserRepository userRepository;
private final UnRegisteredUserRepository unRegisteredUserRepository;
private final SecurityProperties securityProperties;
private final Environment environment;

@Value("${app.frontend.base-url}")
private String frontendBaseUrl;
Expand Down Expand Up @@ -58,6 +63,10 @@ public Optional<User> findUserByProvider(Provider provider, String email, String
}

private Optional<User> restoreWithdrawnByProviderId(Provider provider, String providerId) {
if (isStageProfile()) {
return Optional.empty();
}

return userRepository
.findFirstByProviderIdAndProviderAndDeletedAtIsNotNullOrderByDeletedAtDesc(providerId, provider)
.filter(user -> user.canRestore(LocalDateTime.now(), RESTORE_WINDOW_DAYS))
Expand All @@ -68,6 +77,10 @@ private Optional<User> restoreWithdrawnByProviderId(Provider provider, String pr
}

private Optional<User> restoreWithdrawnByEmail(Provider provider, String email) {
if (isStageProfile()) {
return Optional.empty();
}

if (!StringUtils.hasText(email)) {
return Optional.empty();
}
Expand All @@ -80,6 +93,10 @@ private Optional<User> restoreWithdrawnByEmail(Provider provider, String email)
});
}

private boolean isStageProfile() {
return environment.acceptsProfiles(Profiles.of(STAGE_PROFILE));
}

// Apple 로그인 시 이메일이 누락된 경우, UnRegisteredUser에서 이메일을 조회
public String resolveAppleEmail(String providerId) {
if (!StringUtils.hasText(providerId)) {
Expand Down