Merge pull request #247 from morib-in/feat#217

user last, first name 조합하여 회원가입 진행!

Author: khyojun

morib/src/main/java/org/morib/server/domain/user/UserManager.java

@@ -1,10 +1,15 @@
 package org.morib.server.domain.user;
 
+import java.util.Objects;
+
 import org.morib.server.annotation.Manager;
 import org.morib.server.domain.user.application.dto.UpdateUserProfileServiceDto;
 import org.morib.server.domain.user.infra.User;
 import org.morib.server.domain.user.infra.type.InterestArea;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 @Manager
 public class UserManager {
 
@@ -27,4 +32,14 @@ public void updateUserInterestArea(User findUser, String interestArea) {
     public void completeOnboarding(User findUser) {
         findUser.completeOnboarding();
     }
+
+
+    public void updateUserName(User findUser, String fullName) {
+        if(Objects.isNull(fullName) || findUser.isOnboardingCompleted()){
+            log.info("Full name is null or is already onboarding");
+            return;
+        }
+        log.info("Full name was {}", fullName);
+        findUser.updateUserName(fullName);
+    }
 }

morib/src/main/java/org/morib/server/domain/user/infra/User.java

@@ -93,4 +93,8 @@ public void updateUserInterestArea(InterestArea interestArea) {
     public void completeOnboarding() {
         this.isOnboardingCompleted = true;
     }
+
+    public void updateUserName(String fullName) {
+        this.name = fullName;
+    }
 }

morib/src/main/java/org/morib/server/global/oauth2/apple/dto/AppleResponseName.java

@@ -0,0 +1,11 @@
+package org.morib.server.global.oauth2.apple.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class AppleResponseName {
+	private String firstName;
+	private String lastName;
+}

morib/src/main/java/org/morib/server/global/oauth2/apple/dto/AppleUserInfoDto.java

@@ -0,0 +1,15 @@
+package org.morib.server.global.oauth2.apple.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class AppleUserInfoDto {
+	private AppleResponseName name;
+	private String email;
+
+	public static String fullName(AppleUserInfoDto dto) {
+		return dto.getName().getLastName()  + dto.getName().getFirstName();
+	}
+}

morib/src/main/java/org/morib/server/global/oauth2/handler/OAuth2LoginSuccessHandler.java

@@ -23,6 +23,7 @@
 import org.morib.server.global.jwt.JwtService;
 import org.morib.server.global.message.ErrorMessage;
 import org.morib.server.global.oauth2.CustomOAuth2User;
+import org.morib.server.global.oauth2.apple.dto.AppleUserInfoDto;
 import org.morib.server.global.oauth2.userinfo.AppleOAuth2UserInfo;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
@@ -74,7 +75,12 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 
         String encodedStateFromRequest = request.getParameter(OAuth2ParameterNames.STATE);
         String user = request.getParameter("user");
-        ObjectMapper objectMapper1 = new ObjectMapper();
+        String fullName = null;
+        if(Objects.nonNull(user)) {
+            AppleUserInfoDto appleUserInfoDto = objectMapper.readValue(user, AppleUserInfoDto.class);
+            fullName = AppleUserInfoDto.fullName(appleUserInfoDto);
+        }
+            
 
         Enumeration<String> parameterNames = request.getParameterNames();
         log.info("=== OAUTH2 CALLBACK RECEIVED ===");
@@ -85,9 +91,6 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
         log.info("State from request (Apple 반환값): {}", encodedStateFromRequest);
         log.info("Code from Apple {}", parameterNames.nextElement());
 
-        parameterNames.asIterator().forEachRemaining(clone-> log.info("now parameterName was this {}", clone));
-
-
         log.info("State length: {}", encodedStateFromRequest != null ? encodedStateFromRequest.length() : "null");
         log.info("All parameters: {}", request.getParameterMap());
 
@@ -97,11 +100,6 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
                 byte[] decoded = Base64.getUrlDecoder().decode(encodedStateFromRequest);
                 String decodedString = new String(decoded, StandardCharsets.UTF_8);
                 log.info("Decoded state: {}", decodedString);
-                if (decodedString.startsWith("{")) {
-                    log.info("✅ Apple이 우리의 encodedState를 그대로 반환함");
-                } else {
-                    log.info("❌ Apple이 원본 state를 반환함 - 이게 문제!");
-                }
             } catch (Exception e) {
                 log.info("❌ State 디코딩 실패 - 원본 state일 가능성 높음: {}", e.getMessage());
             }
@@ -142,7 +140,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
                 findUser.authorizeUser();
             }
             // 아니면 로그인으로 바로 직행
-            loginSuccess(response, oAuth2User, findUser.isOnboardingCompleted(), clientType);
+            loginSuccess(response, oAuth2User, findUser.isOnboardingCompleted(), clientType, fullName);
 
         } catch (Exception e) {
             log.error("OAuth2 authentication processing failed", e);
@@ -153,7 +151,8 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
         }
     }
 
-    private void loginSuccess(HttpServletResponse response, CustomOAuth2User oAuth2User, boolean isOnboardingCompleted, String clientType) throws IOException {
+    private void loginSuccess(HttpServletResponse response, CustomOAuth2User oAuth2User,
+        boolean isOnboardingCompleted, String clientType, String fullName) throws IOException {
         log.info("login success 진입");
         String accessToken = jwtService.createAccessToken(oAuth2User.getUserId());
         String refreshToken = jwtService.createRefreshToken();
@@ -164,6 +163,7 @@ private void loginSuccess(HttpServletResponse response, CustomOAuth2User oAuth2U
         log.info("now socialRefreshToken {}", socialRefreshToken);
         //userManager.updateSocialRefreshToken(user, socialRefreshToken);
         userManager.updateSocialRefreshToken(user, socialRefreshToken);
+        userManager.updateUserName(user, fullName);
 
         String targetRedirectUri;
         if ("electron".equalsIgnoreCase(clientType)) {