[LINKER-X] fix: 비회원 로그인시 일단 무조건 회원가입 (#30)

YAPP-Github · Jan 27, 2024 · b7590de · b7590de
1 parent 7491b8e
commit b7590de
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 50 deletions.
diff --git a/...va/com/imlinker/coreapi/core/auth/security/oauth2/CustomAuthenticationSuccessHandler.java b/...va/com/imlinker/coreapi/core/auth/security/oauth2/CustomAuthenticationSuccessHandler.java
@@ -5,14 +5,13 @@
 import com.imlinker.coreapi.core.auth.security.oauth2.vendor.OAuthVendorAttributeResolver;
 import com.imlinker.domain.auth.OAuthVendor;
 import com.imlinker.domain.common.Email;
+import com.imlinker.domain.common.URL;
 import com.imlinker.domain.user.UserService;
 import com.imlinker.error.ApplicationException;
 import com.imlinker.error.ErrorType;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -24,7 +23,6 @@
 @Slf4j
 @Component
 public class CustomAuthenticationSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
-
     private final UserService userService;
 
     private final JwtTokenProvider jwtTokenProvider;
@@ -58,35 +56,25 @@ public void onAuthenticationSuccess(
         OAuthVendorAttributeResolver resolver =
                 vendorAttributeResolverRegistry.get(oAuth2User.getVendor());
 
+        String oAuthId = resolver.getOAuthId(oAuth2User.getAttributes());
         Email email = resolver.getEmail(oAuth2User.getAttributes());
-        boolean isMember = userService.isMember(email);
 
-        if (isMember) {
-            String accessToken = jwtTokenProvider.generateToken(email, TokenType.ACCESS_TOKEN);
-            String refreshToken = jwtTokenProvider.generateToken(email, TokenType.REFRESH_TOKEN);
+        boolean isMember = userService.isMember(oAuth2User.getVendor(), oAuthId);
 
-            String redirectUri =
-                    clientOriginHost
-                            + "?"
-                            + String.format(
-                                    "%s?accessToken=%s&refreshToken=%s", clientOriginHost, accessToken, refreshToken);
-            getRedirectStrategy().sendRedirect(request, response, redirectUri);
-        } else {
-            String oAuthId = resolver.getOAuthId(oAuth2User.getAttributes());
+        if (!isMember) {
             String nickname = resolver.getNickname(oAuth2User.getAttributes());
-            String profileImgUrl = resolver.getProfileImgUrl(oAuth2User.getAttributes());
-
-            String redirectUri =
-                    clientOriginHost
-                            + "?"
-                            + URLEncoder.encode(
-                                    String.format(
-                                            "oAuthId=%s&nickname=%s&profileImgUrl=%s&email=%s",
-                                            oAuthId, nickname, profileImgUrl, email.getValue()),
-                                    StandardCharsets.UTF_8);
+            URL profileImgUrl = URL.of(resolver.getProfileImgUrl(oAuth2User.getAttributes()));
 
-            getRedirectStrategy().sendRedirect(request, response, redirectUri);
+            userService.createUser(oAuthId, nickname, email, profileImgUrl, oAuth2User.getVendor());
         }
+
+        String accessToken = jwtTokenProvider.generateToken(email, TokenType.ACCESS_TOKEN);
+        String refreshToken = jwtTokenProvider.generateToken(email, TokenType.REFRESH_TOKEN);
+
+        String redirectUri =
+                String.format(
+                        "%s?accessToken=%s&refreshToken=%s", clientOriginHost, accessToken, refreshToken);
+        getRedirectStrategy().sendRedirect(request, response, redirectUri);
     }
 
     private String getHostFromCache(String state) {

diff --git a/domain/src/main/java/com/imlinker/domain/common/Email.java b/domain/src/main/java/com/imlinker/domain/common/Email.java
@@ -3,12 +3,10 @@
 import com.imlinker.error.ApplicationException;
 import com.imlinker.error.ErrorType;
 import java.util.regex.Pattern;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 @Getter
+@ToString
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class Email {

diff --git a/domain/src/main/java/com/imlinker/domain/common/URL.java b/domain/src/main/java/com/imlinker/domain/common/URL.java
@@ -3,18 +3,16 @@
 import com.imlinker.error.ApplicationException;
 import com.imlinker.error.ErrorType;
 import java.util.regex.Pattern;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 @Getter
+@ToString
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class URL {
 
     private static final String URL_REGEX =
-            "^((http|https)://)?(www\\.)?([a-zA-Z0-9가-힣]+)\\.[a-z]{2,6}(:\\d{1,5})?(/[a-zA-Z0-9가-힣%._~/?#-]*)?$";
+            "^((http|https)://)?(www\\.)?([a-zA-Z0-9가-힣.]+)\\.[a-z]{2,6}(:\\d{1,5})?(/[a-zA-Z0-9가-힣%._~/?#-]*)?$";
 
     private static final Pattern URL_PATTERN = Pattern.compile(URL_REGEX);
 

diff --git a/domain/src/main/java/com/imlinker/domain/user/UserRepository.java b/domain/src/main/java/com/imlinker/domain/user/UserRepository.java
@@ -1,13 +1,14 @@
 package com.imlinker.domain.user;
 
-import com.imlinker.domain.common.Email;
+import com.imlinker.domain.auth.OAuthVendor;
 import java.util.Optional;
 
 public interface UserRepository {
 
     Optional<User> findById(Long id);
 
-    Optional<User> findByEmail(Email email);
+    Optional<User> findByOAuthVendorAndOAuthIdentifier(
+            OAuthVendor oAuthVendor, String oAuthIdentifier);
 
     User save(User user);
 }
diff --git a/domain/src/main/java/com/imlinker/domain/user/UserService.java b/domain/src/main/java/com/imlinker/domain/user/UserService.java
@@ -1,15 +1,40 @@
 package com.imlinker.domain.user;
 
+import com.imlinker.domain.auth.OAuthVendor;
 import com.imlinker.domain.common.Email;
+import com.imlinker.domain.common.URL;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class UserService {
     private final UserRepository userRepository;
 
-    public boolean isMember(Email email) {
-        return userRepository.findByEmail(email).isPresent();
+    public boolean isMember(OAuthVendor oAuthVendor, String oAuthIdentifier) {
+        return userRepository
+                .findByOAuthVendorAndOAuthIdentifier(oAuthVendor, oAuthIdentifier)
+                .isPresent();
+    }
+
+    public User createUser(
+            String oAuthId, String name, Email email, URL profileImgUrl, OAuthVendor oAuthVendor) {
+        log.info(
+                "[회원가입][시작] oAuthId: {}, name: {}, email: {}, profileImgUrl: {}, oAuthVendor: {}",
+                oAuthId,
+                name,
+                email,
+                profileImgUrl,
+                oAuthVendor);
+        return userRepository.save(
+                User.builder()
+                        .oAuthIdentifier(oAuthId)
+                        .name(name)
+                        .email(email)
+                        .profileImgUrl(profileImgUrl)
+                        .oAuthVendor(oAuthVendor)
+                        .build());
     }
 }
diff --git a/storage/src/main/java/com/imlinker/storage/user/UserAdaptor.java b/storage/src/main/java/com/imlinker/storage/user/UserAdaptor.java
@@ -1,6 +1,6 @@
 package com.imlinker.storage.user;
 
-import com.imlinker.domain.common.Email;
+import com.imlinker.domain.auth.OAuthVendor;
 import com.imlinker.domain.user.User;
 import com.imlinker.domain.user.UserRepository;
 import com.imlinker.storage.user.mapper.UserMapper;
@@ -21,9 +21,10 @@ public Optional<User> findById(Long id) {
     }
 
     @Override
-    public Optional<User> findByEmail(Email email) {
-        Optional<UserEntity> entity = repo.findByEmail(email.getValue());
-        return entity.map(UserMapper::toModel);
+    public Optional<User> findByOAuthVendorAndOAuthIdentifier(
+            OAuthVendor oAuthVendor, String oAuthIdentifier) {
+        return repo.findByOauthVendorAndOauthIdentifier(oAuthVendor.name(), oAuthIdentifier)
+                .map(UserMapper::toModel);
     }
 
     @Override

diff --git a/storage/src/main/java/com/imlinker/storage/user/UserEntity.java b/storage/src/main/java/com/imlinker/storage/user/UserEntity.java
@@ -16,10 +16,10 @@ public class UserEntity extends BaseTimeEntity {
     private Long id;
 
     @Column(name = "oauth_vendor")
-    private String oAuthVendor;
+    private String oauthVendor;
 
     @Column(name = "oauth_identifier")
-    private String oAuthIdentifier;
+    private String oauthIdentifier;
 
     @Column(name = "name")
     private String name;

diff --git a/storage/src/main/java/com/imlinker/storage/user/UserJpaRepository.java b/storage/src/main/java/com/imlinker/storage/user/UserJpaRepository.java
@@ -4,5 +4,6 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserJpaRepository extends JpaRepository<UserEntity, Long> {
-    Optional<UserEntity> findByEmail(String email);
+    Optional<UserEntity> findByOauthVendorAndOauthIdentifier(
+            String oAuthVendor, String oAuthIdentifier);
 }
diff --git a/storage/src/main/java/com/imlinker/storage/user/mapper/UserMapper.java b/storage/src/main/java/com/imlinker/storage/user/mapper/UserMapper.java
@@ -14,8 +14,8 @@ public class UserMapper {
     public static User toModel(UserEntity entity) {
         return User.builder()
                 .id(entity.getId())
-                .oAuthVendor(OAuthVendor.of(entity.getOAuthVendor()))
-                .oAuthIdentifier(entity.getOAuthIdentifier())
+                .oAuthVendor(OAuthVendor.of(entity.getOauthVendor()))
+                .oAuthIdentifier(entity.getOauthIdentifier())
                 .name(entity.getName())
                 .profileImgUrl(URL.of(entity.getProfileImgUrl()))
                 .email(Email.of(entity.getEmail()))
@@ -25,8 +25,8 @@ public static User toModel(UserEntity entity) {
     public static UserEntity toEntity(User model) {
         return UserEntity.builder()
                 .id(model.getId())
-                .oAuthVendor(model.getOAuthVendor().name())
-                .oAuthIdentifier(model.getOAuthIdentifier())
+                .oauthVendor(model.getOAuthVendor().name())
+                .oauthIdentifier(model.getOAuthIdentifier())
                 .name(model.getName())
                 .profileImgUrl(model.getProfileImgUrl().getValue())
                 .email(model.getEmail().getValue())