From 3f3577ca4b8f284effaa4f1635eef5b218cd84f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Fri, 11 Jul 2025 16:34:06 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=82=AD=EC=A0=9C]=20=EB=AF=B8=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C=20-=20Front?= =?UTF-8?q?=20SocialUser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/entity/FrontUserSocial.java | 29 ---- .../web/security/domain/SocialUser.java | 43 ------ .../config/application/enums/SignUpType.java | 3 +- .../config/application/enums/SocialType.java | 15 -- .../config/application/util/CommonUtil.java | 19 +-- .../security/CustomOAuth2UserService.java | 48 ------- .../security/FrontSecurityConfig.java | 9 +- .../config/application/util/AuthUtil.java | 2 - .../ports/ParseSocialUserPortIn.java | 10 -- .../application/ParseSocialUserService.java | 45 ------ .../application/domain/KakaoUserInfo.java | 116 ---------------- .../application/domain/NaverUserInfo.java | 60 -------- .../domain/ParseSocialUserCmd.java | 19 --- .../application/domain/ParsedUserInfo.java | 18 --- .../persistence/FrontUserSocialRepo.java | 12 -- .../persistence/ProcessSocialLoginDao.java | 66 --------- .../ports/ProcessSocialLoginPortIn.java | 10 -- .../ports/ProcessSocialLoginPortOut.java | 17 --- .../ProcessSocialLoginService.java | 131 ------------------ .../domain/CreateUserSocialCmd.java | 26 ---- .../application/domain/GetUserSocial.java | 28 ---- .../application/domain/GetUserSocialCmd.java | 17 --- .../domain/ProcessSocialLogin.java | 14 -- .../domain/ProcessSocialLoginCmd.java | 19 --- 24 files changed, 8 insertions(+), 768 deletions(-) delete mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserSocial.java delete mode 100644 core/src/main/java/app/module/core/config/adapters/web/security/domain/SocialUser.java delete mode 100644 core/src/main/java/app/module/core/config/application/enums/SocialType.java delete mode 100644 front/src/main/java/app/module/front/config/application/security/CustomOAuth2UserService.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/ParseSocialUserPortIn.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/ParseSocialUserService.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/KakaoUserInfo.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/NaverUserInfo.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParseSocialUserCmd.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParsedUserInfo.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/FrontUserSocialRepo.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/ProcessSocialLoginDao.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortIn.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortOut.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/ProcessSocialLoginService.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/CreateUserSocialCmd.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocial.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocialCmd.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLogin.java delete mode 100644 front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLoginCmd.java diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserSocial.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserSocial.java deleted file mode 100644 index 417c2159..00000000 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/FrontUserSocial.java +++ /dev/null @@ -1,29 +0,0 @@ -package app.module.core.config.adapters.persistence.entity; - -import app.module.core.config.adapters.persistence.component.AuditEntity; -import app.module.core.config.application.enums.SocialType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -public class FrontUserSocial extends AuditEntity { - - private Integer seq; - - private String userId; - - private SocialType socialType; - - private String socialId; - - private String email; - - private String name; - - private String ci; -} diff --git a/core/src/main/java/app/module/core/config/adapters/web/security/domain/SocialUser.java b/core/src/main/java/app/module/core/config/adapters/web/security/domain/SocialUser.java deleted file mode 100644 index 3fa962cf..00000000 --- a/core/src/main/java/app/module/core/config/adapters/web/security/domain/SocialUser.java +++ /dev/null @@ -1,43 +0,0 @@ -package app.module.core.config.adapters.web.security.domain; - -import java.util.Collection; -import java.util.Map; -import lombok.Getter; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.oauth2.core.user.DefaultOAuth2User; - -@Getter -public class SocialUser extends DefaultOAuth2User { - - private final String username; - private final String password; - private final boolean enabled; - private final boolean accountNonExpired; - private final boolean credentialsNonExpired; - private final boolean accountNonLocked; - private final String nickname; - private final long remainPasswordDays; - - public SocialUser( - Collection authorities, - Map attributes, - String nameAttributeKey, - String username, - String password, - boolean enabled, - boolean accountNonExpired, - boolean credentialsNonExpired, - boolean accountNonLocked, - String nickname, - long remainPasswordDays) { - super(authorities, attributes, nameAttributeKey); - this.username = username; - this.password = password; - this.enabled = enabled; - this.accountNonExpired = accountNonExpired; - this.credentialsNonExpired = credentialsNonExpired; - this.accountNonLocked = accountNonLocked; - this.nickname = nickname; - this.remainPasswordDays = remainPasswordDays; - } -} diff --git a/core/src/main/java/app/module/core/config/application/enums/SignUpType.java b/core/src/main/java/app/module/core/config/application/enums/SignUpType.java index adef1f9c..aabee922 100644 --- a/core/src/main/java/app/module/core/config/application/enums/SignUpType.java +++ b/core/src/main/java/app/module/core/config/application/enums/SignUpType.java @@ -6,8 +6,7 @@ import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor public enum SignUpType { - NORMAL("일반 회원가입"), - SOCIAL("소셜 로그인 회원가입"); + NORMAL("일반 회원가입"); private final String desc; } diff --git a/core/src/main/java/app/module/core/config/application/enums/SocialType.java b/core/src/main/java/app/module/core/config/application/enums/SocialType.java deleted file mode 100644 index 0708a006..00000000 --- a/core/src/main/java/app/module/core/config/application/enums/SocialType.java +++ /dev/null @@ -1,15 +0,0 @@ -package app.module.core.config.application.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public enum SocialType { - KAKAO("카카오 로그인", "kakao"), - NAVER("네이버 로그인", "naver"), - APPLE("애플 로그인", "apple"); - - private final String desc; - private final String registrationId; -} diff --git a/core/src/main/java/app/module/core/config/application/util/CommonUtil.java b/core/src/main/java/app/module/core/config/application/util/CommonUtil.java index cc4f3f0e..4d29033f 100644 --- a/core/src/main/java/app/module/core/config/application/util/CommonUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/CommonUtil.java @@ -1,8 +1,13 @@ package app.module.core.config.application.util; -import app.module.core.config.adapters.web.security.domain.SocialUser; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import java.io.File; import java.io.IOException; @@ -12,15 +17,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.oauth2.core.user.DefaultOAuth2User; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - @Slf4j public class CommonUtil { @@ -88,9 +84,6 @@ public class CommonUtil { if (principal instanceof UserDetails) { username = ((UserDetails) principal).getUsername(); - } else if (principal instanceof DefaultOAuth2User) { - SocialUser socialUser = (SocialUser) principal; - username = socialUser.getUsername(); } return username; diff --git a/front/src/main/java/app/module/front/config/application/security/CustomOAuth2UserService.java b/front/src/main/java/app/module/front/config/application/security/CustomOAuth2UserService.java deleted file mode 100644 index 8e2e33db..00000000 --- a/front/src/main/java/app/module/front/config/application/security/CustomOAuth2UserService.java +++ /dev/null @@ -1,48 +0,0 @@ -package app.module.front.config.application.security; - -import app.module.core.config.application.enums.SocialType; -import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortIn; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd; -import java.util.Arrays; -import java.util.Map; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; -import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; -import org.springframework.security.oauth2.client.userinfo.OAuth2UserService; -import org.springframework.security.oauth2.core.OAuth2AuthenticationException; -import org.springframework.security.oauth2.core.user.OAuth2User; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -@Slf4j -public class CustomOAuth2UserService implements OAuth2UserService { - - private final ProcessSocialLoginPortIn processSocialLoginPortIn; - - @Override - public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException { - OAuth2UserService delegate = new DefaultOAuth2UserService(); - OAuth2User oAuth2User = delegate.loadUser(userRequest); - - String registrationId = userRequest.getClientRegistration().getRegistrationId(); - SocialType socialType = - Arrays.stream(SocialType.values()) - .filter(type -> type.getRegistrationId().equals(registrationId)) - .findFirst() - .orElseThrow(() -> new RuntimeException("Social type not found")); - String userNameAttributeName = - userRequest - .getClientRegistration() - .getProviderDetails() - .getUserInfoEndpoint() - .getUserNameAttributeName(); - - Map attributes = oAuth2User.getAttributes(); - - return processSocialLoginPortIn - .operate(new ProcessSocialLoginCmd(socialType, userNameAttributeName, attributes)) - .orElseThrow(); - } -} diff --git a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java index db82a261..28aeec36 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java @@ -31,7 +31,6 @@ public class FrontSecurityConfig { private final FrontDetailService frontDetailService; private final DataSource dataSource; private final BCryptPasswordEncoder passwordEncoder; - private final CustomOAuth2UserService customOAuth2UserService; private final CustomAuthenticationEntryPoint customAuthenticationEntryPoint; @Value("${app.front.session.maximum.num}") private Integer maxSessionNum; @@ -104,13 +103,7 @@ public class FrontSecurityConfig { session -> session.maximumSessions(maxSessionNum).maxSessionsPreventsLogin(false).expiredUrl("/login")) .sessionManagement( session -> session.invalidSessionUrl("/login")) - .oauth2Login( - config -> - config - .loginPage("/login") - .userInfoEndpoint( - userInfoEndpointConfig -> - userInfoEndpointConfig.userService(customOAuth2UserService))); + ; return http.build(); } diff --git a/front/src/main/java/app/module/front/config/application/util/AuthUtil.java b/front/src/main/java/app/module/front/config/application/util/AuthUtil.java index 59d3fc2f..d6b6b76c 100644 --- a/front/src/main/java/app/module/front/config/application/util/AuthUtil.java +++ b/front/src/main/java/app/module/front/config/application/util/AuthUtil.java @@ -1,11 +1,9 @@ package app.module.front.config.application.util; -import app.module.core.config.adapters.web.security.domain.SocialUser; import app.module.front.config.application.security.FrontHouseholdUser; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.oauth2.core.user.DefaultOAuth2User; import org.springframework.stereotype.Component; @Component diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/ParseSocialUserPortIn.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/ParseSocialUserPortIn.java deleted file mode 100644 index 437c4706..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/ParseSocialUserPortIn.java +++ /dev/null @@ -1,10 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports; - -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParseSocialUserCmd; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParsedUserInfo; -import java.util.Optional; - -public interface ParseSocialUserPortIn { - - Optional operate(ParseSocialUserCmd cmd); -} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/ParseSocialUserService.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/ParseSocialUserService.java deleted file mode 100644 index 00ce8e3a..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/ParseSocialUserService.java +++ /dev/null @@ -1,45 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports.application; - -import app.module.front.usecase.user.social.parseSocialUser.ports.ParseSocialUserPortIn; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.KakaoUserInfo; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.NaverUserInfo; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParseSocialUserCmd; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParsedUserInfo; -import java.util.Optional; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -@Slf4j -class ParseSocialUserService implements ParseSocialUserPortIn { - - @Override - public Optional operate(ParseSocialUserCmd cmd) { - ParsedUserInfo parsedUserInfo = null; - - switch (cmd.getSocialType()) { - case KAKAO -> { - parsedUserInfo = new KakaoUserInfo(cmd.getUserNameAttributeName(), - cmd.getAttributes()); - } - case NAVER -> { - parsedUserInfo = new NaverUserInfo(cmd.getUserNameAttributeName(), - cmd.getAttributes()); - } - } - - if (parsedUserInfo != null) { - log.info("socialId: {}", parsedUserInfo.getSocialId()); - log.info("nickname: {}", parsedUserInfo.getNickName()); - log.info("name: {}", parsedUserInfo.getName()); - log.info("ci: {}", parsedUserInfo.getCi()); - log.info("birthday: {}", parsedUserInfo.getBirthday()); - log.info("email: {}", parsedUserInfo.getEmail()); - log.info("phone: {}", parsedUserInfo.getPhone()); - } - - return Optional.ofNullable(parsedUserInfo); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/KakaoUserInfo.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/KakaoUserInfo.java deleted file mode 100644 index 2f0d1958..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/KakaoUserInfo.java +++ /dev/null @@ -1,116 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain; - -import java.util.Map; -import java.util.Objects; - -public class KakaoUserInfo implements ParsedUserInfo { - - private final String userNameAttribute; - private final Map attributes; - - public KakaoUserInfo(String userNameAttribute, Map attributes) { - this.userNameAttribute = userNameAttribute; - this.attributes = attributes; - } - - @Override - public String getSocialId() { - return String.valueOf(attributes.get(userNameAttribute)); - } - - @Override - @SuppressWarnings("unchecked") - public String getNickName() { - Map account = (Map) attributes.get("kakao_account"); - Map profile = (Map) account.get("profile"); - - return (String) profile.get("nickname"); - } - - @Override - @SuppressWarnings("unchecked") - public String getName() { - Map account = (Map) attributes.get("kakao_account"); - - if (account == null) { - return null; - } - - // 카카오 로그인 서비스 인증 전에 이름 정보는 전달되지 않는다. - if (account.get("name") == null) { - return null; - } - - return (String) account.get("name"); - } - - @Override - @SuppressWarnings("unchecked") - public String getEmail() { - Map account = (Map) attributes.get("kakao_account"); - - if (account == null) { - return null; - } - - String email = (String) account.get("email"); - - // 카카오 로그인 서비스 인증 전에 이메일 정보는 전달되지 않는다. - return Objects.requireNonNullElse(email, "NO-KAKAO-EMAIL@noemail.com"); - } - - @Override - @SuppressWarnings("unchecked") - public String getPhone() { - Map account = (Map) attributes.get("kakao_account"); - - if (account == null) { - return null; - } - - // 카카오 로그인 서비스 인증 전에 phone 정보는 전달되지 않는다. - if (account.get("phone_number") == null) { - return null; - } - - // "0" + s.replaceAll("^\\+\\d{1,3}-?|-", "").trim(); - return (String) account.get("phone_number"); - } - - @Override - @SuppressWarnings("unchecked") - public String getBirthday() { - Map account = (Map) attributes.get("kakao_account"); - - if (account == null) { - return null; - } - - String birthyear = (String) account.get("birthyear"); - String birthday = (String) account.get("birthday"); - - // 카카오 로그인 서비스 인증 전에 생년월일 정보는 전달되지 않는다. - if (birthyear == null || birthday == null) { - return null; - } - - return birthyear + birthday; - } - - @Override - @SuppressWarnings("unchecked") - public String getCi() { - Map account = (Map) attributes.get("kakao_account"); - - if (account == null) { - return null; - } - - // 카카오 로그인 서비스 인증 전에 CI 정보는 전달되지 않는다. - if (account.get("ci") == null || ((String) account.get("ci")).equals("")) { - return null; - } - - return (String) account.get("ci"); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/NaverUserInfo.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/NaverUserInfo.java deleted file mode 100644 index 8ec48f80..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/NaverUserInfo.java +++ /dev/null @@ -1,60 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain; - -import java.util.Map; -import lombok.ToString; - -@ToString -public class NaverUserInfo implements ParsedUserInfo { - - private final String userNameAttribute; - private final Map attributes; - - public NaverUserInfo(String userNameAttribute, Map attributes) { - this.userNameAttribute = userNameAttribute; - this.attributes = attributes; - } - - @Override - public String getSocialId() { - return (String) getAttrs().get("id"); - } - - @Override - public String getNickName() { - return (String) getAttrs().get("nickname"); - } - - @Override - public String getName() { - return (String) getAttrs().get("name"); - } - - @Override - public String getEmail() { - return (String) getAttrs().get("email"); - } - - @Override - public String getPhone() { - String phone = (String) getAttrs().get("mobile"); - return phone != null ? phone.replaceAll("-", "") : null; - } - - @Override - public String getBirthday() { - String birthYear = (String) getAttrs().get("birthyear"); - String birthday = (String) getAttrs().get("birthday"); - return (birthYear + birthday).replaceAll("-", ""); - } - - @Override - public String getCi() { - // 네이버 로그인 서비스 인증 전에 CI 정보는 전달되지 않는다. - return (String) getAttrs().get("ci"); - } - - @SuppressWarnings("unchecked") - private Map getAttrs() { - return (Map) attributes.get(userNameAttribute); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParseSocialUserCmd.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParseSocialUserCmd.java deleted file mode 100644 index 60de9f20..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParseSocialUserCmd.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain; - -import app.module.core.config.application.enums.SocialType; -import java.util.Map; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class ParseSocialUserCmd { - - private SocialType socialType; - private String userNameAttributeName; - private Map attributes; -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParsedUserInfo.java b/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParsedUserInfo.java deleted file mode 100644 index 21361129..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/parseSocialUser/ports/application/domain/ParsedUserInfo.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.front.usecase.user.social.parseSocialUser.ports.application.domain; - -public interface ParsedUserInfo { - - String getSocialId(); - - String getNickName(); - - String getName(); - - String getEmail(); - - String getPhone(); - - String getBirthday(); - - String getCi(); -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/FrontUserSocialRepo.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/FrontUserSocialRepo.java deleted file mode 100644 index e115fb7a..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/FrontUserSocialRepo.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUserSocial; -import app.module.core.config.application.enums.SocialType; -import java.util.Optional; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface FrontUserSocialRepo { - - Optional findBySocialTypeAndSocialId(SocialType socialType, String socialId); -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/ProcessSocialLoginDao.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/ProcessSocialLoginDao.java deleted file mode 100644 index c18963fa..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/adapters/persistence/ProcessSocialLoginDao.java +++ /dev/null @@ -1,66 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.adapters.persistence; - -import app.module.core.config.adapters.persistence.entity.FrontUserSocial; -import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortOut; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.CreateUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocial; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLogin; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd; -import java.util.Optional; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class ProcessSocialLoginDao implements ProcessSocialLoginPortOut { - - private final FrontUserSocialRepo frontUserSocialRepo; - - @Override - public Optional operate(ProcessSocialLoginCmd cmd) { - return Optional.empty(); - } - - @Override - public Optional findUserSocial(GetUserSocialCmd cmd) { - return frontUserSocialRepo - .findBySocialTypeAndSocialId(cmd.getSocialType(), cmd.getSocialId()) - .flatMap( - frontSocialUser -> - Optional.of( - new GetUserSocial( - frontSocialUser.getSeq(), - frontSocialUser.getUserId(), - frontSocialUser.getSocialType(), - frontSocialUser.getSocialId(), - frontSocialUser.getEmail(), - frontSocialUser.getName(), - frontSocialUser.getCi()))); - } - - @Override - public Optional createUserSocial(CreateUserSocialCmd cmd) { -// FrontUserSocial createUserSocial = -// frontUserSocialRepo.save( -// new FrontUserSocial( -// null, -// cmd.getUserId(), -// cmd.getSocialType(), -// cmd.getSocialId(), -// cmd.getEmail(), -// cmd.getName(), -// cmd.getCi())); -// -// return Optional.of( -// new GetUserSocial( -// createUserSocial.getSeq(), -// createUserSocial.getUserId(), -// createUserSocial.getSocialType(), -// createUserSocial.getSocialId(), -// createUserSocial.getEmail(), -// createUserSocial.getName(), -// createUserSocial.getCi())); - return null; - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortIn.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortIn.java deleted file mode 100644 index ee7aeac5..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortIn.java +++ /dev/null @@ -1,10 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports; - -import app.module.core.config.adapters.web.security.domain.SocialUser; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd; -import java.util.Optional; - -public interface ProcessSocialLoginPortIn { - - Optional operate(ProcessSocialLoginCmd cmd); -} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortOut.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortOut.java deleted file mode 100644 index 15fc7b20..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/ProcessSocialLoginPortOut.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports; - -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.CreateUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocial; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLogin; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd; -import java.util.Optional; - -public interface ProcessSocialLoginPortOut { - - Optional operate(ProcessSocialLoginCmd cmd); - - Optional findUserSocial(GetUserSocialCmd cmd); - - Optional createUserSocial(CreateUserSocialCmd cmd); -} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/ProcessSocialLoginService.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/ProcessSocialLoginService.java deleted file mode 100644 index 2d05a449..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/ProcessSocialLoginService.java +++ /dev/null @@ -1,131 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application; - -import app.module.core.config.adapters.web.security.domain.CorePrivilege; -import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.config.adapters.web.security.domain.SocialUser; -import app.module.core.config.application.enums.SignUpType; -import app.module.core.usecase.user.createUser.ports.CreateUserPortIn; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; -import app.module.core.usecase.user.findUser.ports.FindUserPortIn; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUser; -import app.module.core.usecase.user.findUser.ports.application.domain.FindUserCmd; -import app.module.front.usecase.user.social.parseSocialUser.ports.ParseSocialUserPortIn; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParseSocialUserCmd; -import app.module.front.usecase.user.social.parseSocialUser.ports.application.domain.ParsedUserInfo; -import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortIn; -import app.module.front.usecase.user.social.processSocialLogin.ports.ProcessSocialLoginPortOut; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.CreateUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.GetUserSocialCmd; -import app.module.front.usecase.user.social.processSocialLogin.ports.application.domain.ProcessSocialLoginCmd; -import java.util.Collection; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import lombok.RequiredArgsConstructor; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class ProcessSocialLoginService implements ProcessSocialLoginPortIn { - - private final ProcessSocialLoginPortOut portOut; - private final ParseSocialUserPortIn parseSocialUserPortIn; - private final FindUserPortIn findUserPortIn; - private final CreateUserPortIn createUserPortIn; - - @Override - public Optional operate(ProcessSocialLoginCmd cmd) { - - // SNS Login Provider 가 제공하는 사용자 정보 파싱 - Optional parsedUserInfo = - parseSocialUserPortIn.operate( - new ParseSocialUserCmd( - cmd.getSocialType(), cmd.getUserNameAttributeName(), cmd.getAttributes())); - - if (parsedUserInfo.isPresent()) { - ParsedUserInfo parsedUser = parsedUserInfo.get(); - - return portOut - .findUserSocial(new GetUserSocialCmd(cmd.getSocialType(), parsedUser.getSocialId())) - .flatMap( - getUserSocial -> - findUserPortIn - .operate(new FindUserCmd(getUserSocial.getUserId())) - .flatMap(findUser -> getSocialUserOpt(findUser, cmd))) - .or( - () -> { - // 신규 회원인 경우, - String uuid = UUID.randomUUID().toString(); - - return createUserPortIn - .operate( - new CreateUserCmd( - uuid, - "NO_PASSWD", - parsedUser.getEmail(), - parsedUser.getNickName(), - SignUpType.SOCIAL, - false, - 0, - false, - Set.of("ROLE_GENERAL"))) - .flatMap( - createUser -> - portOut.createUserSocial( - new CreateUserSocialCmd( - createUser.getId(), - cmd.getSocialType(), - parsedUser.getSocialId(), - createUser.getEmail(), - parsedUser.getName(), - parsedUser.getCi()))) - .flatMap( - getUserSocial -> - findUserPortIn - .operate(new FindUserCmd(getUserSocial.getUserId())) - .flatMap(findUser -> getSocialUserOpt(findUser, cmd))); - }); - } - - return Optional.empty(); - } - - private Optional getSocialUserOpt(FindUser findUser, ProcessSocialLoginCmd cmd) { - boolean accountLocked = Optional.ofNullable(findUser.getAccountLocked()).orElse(false); - boolean accountDisabled = Optional.ofNullable(findUser.getAccountDisabled()).orElse(false); - - return Optional.of( - new SocialUser( - getAuthorities(findUser.getRoles()), - cmd.getAttributes(), - cmd.getUserNameAttributeName(), - findUser.getId(), - findUser.getPassword(), - !accountDisabled, - true, - true, - !accountLocked, - findUser.getNickname(), - 0L)); - } - - private Collection getAuthorities(Collection roles) { - return Stream.concat(getRoles(roles), getPrivileges(roles)) - .map(SimpleGrantedAuthority::new) - .collect(Collectors.toList()); - } - - private Stream getRoles(Collection roles) { - return roles.stream().map(CoreRole::getId); - } - - private Stream getPrivileges(Collection roles) { - return roles.stream() - .flatMap(roleOutput -> roleOutput.getPrivileges().stream()) - .map(CorePrivilege::getId); - } -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/CreateUserSocialCmd.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/CreateUserSocialCmd.java deleted file mode 100644 index bf508316..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/CreateUserSocialCmd.java +++ /dev/null @@ -1,26 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain; - -import app.module.core.config.application.enums.SocialType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class CreateUserSocialCmd { - - private String userId; - - private SocialType socialType; - - private String socialId; - - private String email; - - private String name; - - private String ci; -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocial.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocial.java deleted file mode 100644 index b3f43186..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocial.java +++ /dev/null @@ -1,28 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain; - -import app.module.core.config.application.enums.SocialType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetUserSocial { - - private Integer seq; - - private String userId; - - private SocialType socialType; - - private String socialId; - - private String email; - - private String name; - - private String ci; -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocialCmd.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocialCmd.java deleted file mode 100644 index 37caad42..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/GetUserSocialCmd.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain; - -import app.module.core.config.application.enums.SocialType; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetUserSocialCmd { - - private SocialType socialType; - private String socialId; -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLogin.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLogin.java deleted file mode 100644 index 7ff7d37e..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLogin.java +++ /dev/null @@ -1,14 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class ProcessSocialLogin { - -} diff --git a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLoginCmd.java b/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLoginCmd.java deleted file mode 100644 index e297c7f8..00000000 --- a/front/src/main/java/app/module/front/usecase/user/social/processSocialLogin/ports/application/domain/ProcessSocialLoginCmd.java +++ /dev/null @@ -1,19 +0,0 @@ -package app.module.front.usecase.user.social.processSocialLogin.ports.application.domain; - -import app.module.core.config.application.enums.SocialType; -import java.util.Map; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class ProcessSocialLoginCmd { - - private SocialType socialType; - private String userNameAttributeName; - private Map attributes; -}