chore: resolve merge conflict

MONEYMONG · May 26, 2024 · 074d074 · 074d074
1 parent 10955b2
commit 074d074
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/src/main/java/com/moneymong/domain/user/service/UserFacadeService.java b/src/main/java/com/moneymong/domain/user/service/UserFacadeService.java
@@ -2,7 +2,6 @@
 
 import com.moneymong.domain.agency.service.AgencyUserService;
 import com.moneymong.domain.user.api.request.LoginRequest;
-import com.moneymong.domain.user.api.request.UserDeleteRequest;
 import com.moneymong.global.security.oauth.dto.AuthUserInfo;
 import com.moneymong.domain.user.api.response.LoginSuccessResponse;
 import com.moneymong.global.security.oauth.dto.OAuthUserDataResponse;
@@ -45,10 +44,4 @@ public void delete(Long userId) {
         userUniversityService.delete(userId);
         agencyUserService.deleteAll(userId);
     }
-
-    @Transactional
-    public void revoke(UserDeleteRequest deleteRequest, Long userId) {
-        oAuthService.revoke(deleteRequest);
-        delete(userId);
-    }
 }
diff --git a/src/main/java/com/moneymong/global/security/oauth/handler/AppleService.java b/src/main/java/com/moneymong/global/security/oauth/handler/AppleService.java
@@ -180,8 +180,6 @@ private OAuthUserDataResponse decodePayload(String idToken, String nickname, Str
             String providerUid = decoded.getSubject();
             String email = claims.get("sub").asString();
 
-            log.info("[AppleService] email = {}", email);
-            log.info("[AppleService] nickname = {}", nickname);
             return OAuthUserDataResponse.builder()
                     .provider(getAuthProvider().toString())
                     .oauthId(providerUid)

diff --git a/src/main/java/com/moneymong/global/security/service/OAuthService.java b/src/main/java/com/moneymong/global/security/service/OAuthService.java
@@ -1,13 +1,14 @@
 package com.moneymong.global.security.service;
 
 import com.moneymong.domain.user.api.request.LoginRequest;
-import com.moneymong.domain.user.api.request.UserDeleteRequest;
 
 import com.moneymong.domain.user.entity.User;
 import com.moneymong.domain.user.repository.UserRepository;
 import com.moneymong.global.exception.custom.NotFoundException;
-import com.moneymong.global.exception.enums.ErrorCode;
 
+import com.moneymong.global.security.oauth.dto.OAuthUserDataRequest;
+import com.moneymong.global.security.oauth.dto.OAuthUserDataResponse;
+import com.moneymong.global.security.oauth.handler.OAuthAuthenticationHandler;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -53,4 +54,5 @@ public void revoke(Long userId) {
         OAuthAuthenticationHandler oAuthHandler = this.oAuthAuthenticationHandlers.get(oAuthProvider);
 
         oAuthHandler.unlink(userId);
+    }
 }