Merge pull request #120 from TeamLearningFlow/develop

Develop

Author: MODUGGAGI

src/main/java/learningFlow/learningFlow_BE/security/handler/OAuth2LoginSuccessHandler.java

@@ -27,8 +27,9 @@ public class OAuth2LoginSuccessHandler implements AuthenticationSuccessHandler {
 
     private final JwtTokenProvider jwtTokenProvider;
 
-    @Value("${app.frontend-url}")  // added
-    private String frontendUrl;     // added
+    @Value("${app.frontend-url}")
+    private String frontendUrl;
+
     @Override
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
                                         Authentication authentication) throws IOException {

src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserRegistrationService.java

@@ -44,7 +44,7 @@ public Map<String, Object> getAdditionalInfoRequirements() {
         Map<String, Object> response = new HashMap<>();
         response.put("message", "추가 정보 입력이 필요합니다");
         response.put("requiredFields", Arrays.asList(
-                "job", "interestFields", "gender", "preferType"
+                "name", "job", "interestFields", "preferType"
         ));
 
         return response;
@@ -64,15 +64,14 @@ public UserResponseDTO.UserLoginResponseDTO updateAdditionalInfo(
 
         Claims claims = jwtTokenProvider.getClaims(temporaryToken);
         String email = claims.getSubject();
-        String name = claims.get("name", String.class);
         String providerId = claims.get("providerId", String.class);
         SocialType socialType = SocialType.valueOf(claims.get("socialType", String.class));
 
 
         User newUser = User.builder()
                 .loginId(socialType.name() + "_" + providerId)
                 .email(email)
-                .name(name)
+                .name(additionalInfo.getName())
                 .providerId(providerId)
                 .pw("OAUTH2_USER")
                 .socialType(socialType)

src/main/java/learningFlow/learningFlow_BE/web/controller/LoginController.java

@@ -150,15 +150,16 @@ public ApiResponse<?> getAdditionalInfoPage() {
            OAuth2 회원가입의 추가 정보를 입력받습니다.
            
            [필수 입력]
-           - 직업
-           - 관심분야 (다중선택)
-           - 선호 미디어 타입
+           - 이름: 실명 또는 닉네임
+           - 직업: STUDENT, ADULT, EMPLOYEE, JOB_SEEKER, OTHER
+           - 관심분야: 다중선택 (APP_DEVELOPMENT, WEB_DEVELOPMENT, PROGRAMMING_LANGUAGE, DEEP_LEARNING, STATISTICS, DATA_ANALYSIS, UI_UX, PLANNING, BUSINESS_PRODUCTIVITY, FOREIGN_LANGUAGE, CAREER)
+           - 선호 미디어: VIDEO, TEXT
            
            [선택 입력]
            - 프로필 이미지 URL
            
            [주의사항]
-           - 이메일/이름은 구글 계정 정보 사용
+           - 이메일은 구글 계정 정보 사용
            - 이미지 미입력시 기본 이미지 사용
            """)
     public ApiResponse<UserResponseDTO.UserLoginResponseDTO> updateAdditionalInfo(

src/main/java/learningFlow/learningFlow_BE/web/dto/user/UserRequestDTO.java

@@ -59,6 +59,10 @@ public static class UserLoginDTO {
 
     @Getter
     public static class AdditionalInfoDTO {
+
+        @NotBlank(message = "이름은 필수 입력값입니다")
+        String name;
+
         @NotNull(message = "직업은 필수 선택값입니다")
         Job job;
 

src/main/resources/application.yml

@@ -24,7 +24,6 @@ spring:
       client:
         registration:
           google:
-            redirect-uri: "http://onboarding.p-e.kr:8080/login/oauth2/code/google"
             client-id: ${SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_ID}
             client-secret: ${SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_SECRET}
             scope:
@@ -59,7 +58,6 @@ custom:
 app:
   frontend-url: http://localhost:3000 #http://54.180.118.227:8080
 
-
 server:
   port: 8080
   compression: