Merge pull request #147 from TeamLearningFlow/develop

MODUGGAGI · web-flow · commit e02eb051400f · 2025-02-13T16:07:06.000+08:00
Develop
diff --git a/src/main/java/learningFlow/learningFlow_BE/security/handler/OAuth2LoginSuccessHandler.java b/src/main/java/learningFlow/learningFlow_BE/security/handler/OAuth2LoginSuccessHandler.java
@@ -39,7 +39,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
         // Principal 타입 확인, 첫 로그인인 경우 회원가입으로 이동
         if (authentication.getPrincipal() instanceof OAuth2UserTemp oAuth2UserTemp) {
             String temporaryToken = jwtTokenProvider.createTemporaryToken(oAuth2UserTemp);
-            String redirectUrl = frontendUrl + "/oauth2/additional-info?token=" + temporaryToken;
+            String redirectUrl = frontendUrl + "/oauth2/additional-info?oauth2RegistrationCode=" + temporaryToken;
             response.sendRedirect(redirectUrl);
             return;
         }
diff --git a/src/main/java/learningFlow/learningFlow_BE/service/auth/common/UserVerificationEmailService.java b/src/main/java/learningFlow/learningFlow_BE/service/auth/common/UserVerificationEmailService.java
@@ -73,7 +73,7 @@ public void sendVerificationEmail(String email, String token) {
                                         버튼을 누르면 자동으로 인증 후 추가 정보 입력 페이지로 이동합니다.
                                     </p>
                                     
-                                    <a href="%s/register/complete?token=%s" 
+                                    <a href="%s/register/complete?emailVerificationCode=%s" 
                                        class="btn" 
                                        style="background-color: #5e52ff; color: #ffffff; text-decoration: none; padding: 12px 24px; border-radius: 4px; font-weight: bold; display: inline-block; margin: 20px 0;">
                                         이메일 인증하기
@@ -101,7 +101,7 @@ public void sendVerificationEmail(String email, String token) {
         }
     }
 
-    public void sendPasswordResetEmail(String email, String token) {
+    public void sendPasswordResetEmail(String email, String passwordResetCode) {
 
         try {
             MimeMessage message = emailSender.createMimeMessage();
@@ -156,7 +156,7 @@ public void sendPasswordResetEmail(String email, String token) {
                                         버튼을 누르면 자동으로 인증 후 비밀번호 재설정 페이지로 이동합니다.
                                     </p>
                                     
-                                    <a href="%s/change-password?token=%s" 
+                                    <a href="%s/change-password?passwordResetCode=%s" 
                                        class="btn" 
                                        style="background-color: #5e52ff; color: #ffffff; text-decoration: none; padding: 12px 24px; border-radius: 4px; font-weight: bold; display: inline-block; margin: 20px 0;">
                                         이메일 인증하기
@@ -173,7 +173,7 @@ public void sendPasswordResetEmail(String email, String token) {
                 </table>
             </body>
             </html>
-            """.formatted(baseUrl, token);
+            """.formatted(baseUrl, passwordResetCode);
 
             helper.setText(htmlContent, true);
             emailSender.send(message);
diff --git a/src/main/java/learningFlow/learningFlow_BE/service/auth/local/LocalUserAuthService.java b/src/main/java/learningFlow/learningFlow_BE/service/auth/local/LocalUserAuthService.java
@@ -88,9 +88,9 @@ public void initialRegister(UserRequestDTO.InitialRegisterDTO requestDTO) {
     }
 
     @Transactional
-    public EmailVerificationToken validateRegistrationToken(String token) {
+    public EmailVerificationToken validateRegistrationToken(String emailVerificationCode) {
         // 토큰 유효성 검증
-        EmailVerificationToken verificationToken = emailVerificationTokenRepository.findByTokenAndVerifiedFalse(token)
+        EmailVerificationToken verificationToken = emailVerificationTokenRepository.findByTokenAndVerifiedFalse(emailVerificationCode)
                 .orElseThrow(() -> new RuntimeException("유효하지 않은 토큰입니다."));
 
         if (verificationToken.isExpired()) {
@@ -103,13 +103,13 @@ public EmailVerificationToken validateRegistrationToken(String token) {
 
     @Transactional
     public UserResponseDTO.UserLoginResponseDTO completeRegister(
-            String token,
+            String emailVerificationCode,
             UserRequestDTO.CompleteRegisterDTO requestDTO,
             HttpServletResponse response
     ) {
         String imageUrl = null;
         //이메일 토큰 검증
-        EmailVerificationToken verificationToken = validateRegistrationToken(token);
+        EmailVerificationToken verificationToken = validateRegistrationToken(emailVerificationCode);
 
         // 로그인 ID 생성
         String loginuuid = UUID.randomUUID().toString().substring(0, 8);
@@ -259,8 +259,8 @@ public String sendPasswordResetEmail(PrincipalDetails principalDetails) {
     }
 
     @Transactional
-    public PasswordResetToken validatePasswordResetToken(String token) {
-        PasswordResetToken resetToken = tokenRepository.findByToken(token)
+    public PasswordResetToken validatePasswordResetToken(String passwordResetCode) {
+        PasswordResetToken resetToken = tokenRepository.findByToken(passwordResetCode)
                 .orElseThrow(() -> new RuntimeException("유효하지 않은 토큰입니다."));
 
         if (resetToken.isExpired()) {
@@ -273,10 +273,10 @@ public PasswordResetToken validatePasswordResetToken(String token) {
 
     @Transactional
     public String resetPassword(
-            String token,
+            String passwordResetCode,
             UserRequestDTO.ResetPasswordDTO request
     ) {
-        PasswordResetToken resetToken = validatePasswordResetToken(token);
+        PasswordResetToken resetToken = validatePasswordResetToken(passwordResetCode);
 
         User user = resetToken.getUser();
 
diff --git a/src/main/java/learningFlow/learningFlow_BE/web/controller/LoginController.java b/src/main/java/learningFlow/learningFlow_BE/web/controller/LoginController.java
@@ -71,9 +71,9 @@ public ApiResponse<String> register(
            3. 추가 정보 입력 페이지로 이동
            """)
     public ApiResponse<String> goCompleteRegister(
-            @RequestParam String token
+            @RequestParam String emailVerificationCode
     ) {
-        localUserAuthService.validateRegistrationToken(token);
+        localUserAuthService.validateRegistrationToken(emailVerificationCode);
         return ApiResponse.onSuccess("토큰이 유효. 추가 정보를 입력해주세요.");
     }
 
@@ -89,11 +89,11 @@ public ApiResponse<String> goCompleteRegister(
            - 프로필 이미지 URL (이미지 업로드 API로 받은 URL)
            """)
     public ApiResponse<UserResponseDTO.UserLoginResponseDTO> completeRegister(
-            @RequestParam String token,
+            @RequestParam String emailVerificationCode,
             @Valid @RequestBody UserRequestDTO.CompleteRegisterDTO request, // ✅ JSON 데이터 - application/json
             HttpServletResponse response
     ) {
-        return ApiResponse.onSuccess(localUserAuthService.completeRegister(token, request, response));
+        return ApiResponse.onSuccess(localUserAuthService.completeRegister(emailVerificationCode, request, response));
     }
 
     @PostMapping("/login")
@@ -166,11 +166,11 @@ public ApiResponse<?> getAdditionalInfoPage() {
            - 이미지 미입력시 기본 이미지 사용
            """)
     public ApiResponse<UserResponseDTO.UserLoginResponseDTO> updateAdditionalInfo(
-            @RequestParam String token,
+            @RequestParam String oauth2RegistrationCode,
             @RequestBody @Valid UserRequestDTO.AdditionalInfoDTO request, // ✅ JSON 데이터 - application/json
             HttpServletResponse response) {
         log.info("put info");
-        return ApiResponse.onSuccess(OAuth2UserRegistrationService.updateAdditionalInfo(token, request, response));
+        return ApiResponse.onSuccess(OAuth2UserRegistrationService.updateAdditionalInfo(oauth2RegistrationCode, request, response));
     }
     //TODO: 해당 DTO에 안 맞으면 500에러 나는데, 400에러이고 왜 회원가입 안되는 건지 구체적인 에러 작성 필요.
 
@@ -213,9 +213,9 @@ public ApiResponse<String> sendPasswordResetEmail(
            - 사용자 매칭
            """)
     public ApiResponse<String> goChangePassword(
-            @RequestParam String token
+            @RequestParam String passwordResetCode
     ) {
-        localUserAuthService.validatePasswordResetToken(token);
+        localUserAuthService.validatePasswordResetToken(passwordResetCode);
         return ApiResponse.onSuccess("토큰이 유효합니다. 새로운 비밀번호를 입력해주세요.");
     }
 
@@ -234,10 +234,10 @@ public ApiResponse<String> goChangePassword(
            - 변경 시 모든 기기 로그아웃
            """)
     public ApiResponse<String> changePassword(
-            @RequestParam String token,
+            @RequestParam String passwordResetCode,
             @Valid @RequestBody UserRequestDTO.ResetPasswordDTO request
     ) {
-        return ApiResponse.onSuccess(localUserAuthService.resetPassword(token, request));
+        return ApiResponse.onSuccess(localUserAuthService.resetPassword(passwordResetCode, request));
     }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo`
`39`	`39`	`// Principal 타입 확인, 첫 로그인인 경우 회원가입으로 이동`
`40`	`40`	`if (authentication.getPrincipal() instanceof OAuth2UserTemp oAuth2UserTemp) {`
`41`	`41`	`String temporaryToken = jwtTokenProvider.createTemporaryToken(oAuth2UserTemp);`
`42`		`- String redirectUrl = frontendUrl + "/oauth2/additional-info?token=" + temporaryToken;`
	`42`	`+ String redirectUrl = frontendUrl + "/oauth2/additional-info?oauth2RegistrationCode=" + temporaryToken;`
`43`	`43`	`response.sendRedirect(redirectUrl);`
`44`	`44`	`return;`
`45`	`45`	`}`