Merge pull request #119 from noeyeyh/feat/password

noeyeyh · web-flow · commit 10fd6c3b7250 · 2025-02-17T21:52:27.000+09:00
#106 Feat: 비밀번호 찾기
diff --git a/build.gradle b/build.gradle
@@ -61,6 +61,9 @@ dependencies {
 
 	// redis
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+	// 이메일 전송
+	implementation 'org.springframework.boot:spring-boot-starter-mail'
 }
 
 tasks.named('test') {
diff --git a/src/main/java/com/memesphere/domain/user/controller/UserController.java b/src/main/java/com/memesphere/domain/user/controller/UserController.java
@@ -1,17 +1,9 @@
 package com.memesphere.domain.user.controller;
 
-import com.memesphere.domain.user.dto.request.ReissueRequest;
-import com.memesphere.domain.user.dto.request.NicknameRequest;
-import com.memesphere.domain.user.dto.request.SignInRequest;
-import com.memesphere.domain.user.dto.request.SignUpRequest;
-import com.memesphere.domain.user.dto.response.GoogleUserInfoResponse;
-import com.memesphere.domain.user.dto.response.TokenResponse;
-import com.memesphere.domain.user.dto.response.KakaoUserInfoResponse;
-import com.memesphere.domain.user.service.AuthServiceImpl;
-import com.memesphere.domain.user.service.GoogleServiceImpl;
-import com.memesphere.domain.user.service.KakaoServiceImpl;
+import com.memesphere.domain.user.dto.request.*;
+import com.memesphere.domain.user.dto.response.*;
+import com.memesphere.domain.user.service.*;
 import com.memesphere.global.apipayload.ApiResponse;
-import com.memesphere.domain.user.dto.response.LoginResponse;
 import com.memesphere.global.apipayload.code.status.ErrorStatus;
 import com.memesphere.global.apipayload.exception.GeneralException;
 import com.memesphere.global.jwt.CustomUserDetails;
@@ -35,6 +27,7 @@ public class UserController {
     private final KakaoServiceImpl kakaoServiceImpl;
     private final GoogleServiceImpl googleServiceImpl;
     private final AuthServiceImpl authServiceImpl;
+    private final MailServiceImpl mailServiceImpl;
     private final JwtAuthenticationFilter jwtAuthenticationFilter;
 
     @PostMapping("/login/oauth2/kakao")
@@ -115,4 +108,30 @@ public ApiResponse<?> isNicknameValidate(@RequestBody NicknameRequest nicknameRe
             return ApiResponse.onSuccess("사용 가능한 닉네임입니다.");
         }
     }
+
+    @PostMapping("/password/send")
+    @Operation(summary = "비밀번호 찾기 API")
+    public ApiResponse<?> sendPassword(@RequestParam("email") String email) {
+        // 임시 비밀번호 생성 및 저장
+        String tmpPassword = authServiceImpl.getTmpPassword();
+        authServiceImpl.updatePassword(tmpPassword, email);
+
+        // 메일 생성 및 전송
+        EmailResponse mailResponse = mailServiceImpl.createMail(tmpPassword, email);
+        mailServiceImpl.sendMail(mailResponse);
+
+        return ApiResponse.onSuccess("이메일 전송이 완료되었습니다.");
+    }
+
+    @PostMapping("/password/change")
+    @Operation(summary = "비밀번호 변경 API")
+    public ApiResponse<?> sendPassword(@RequestParam("newPassword") String newPassword, @AuthenticationPrincipal CustomUserDetails customUserDetails) {
+        if (customUserDetails == null) {
+            throw new GeneralException(ErrorStatus.USER_NOT_FOUND);
+        }
+
+        authServiceImpl.updatePassword(newPassword, customUserDetails.getUser().getEmail());
+
+        return ApiResponse.onSuccess("비밀번호 변경이 완료되었습니다.");
+    }
 }
diff --git a/src/main/java/com/memesphere/domain/user/converter/UserConverter.java b/src/main/java/com/memesphere/domain/user/converter/UserConverter.java
@@ -1,6 +1,7 @@
 package com.memesphere.domain.user.converter;
 
 import com.memesphere.domain.user.dto.request.SignUpRequest;
+import com.memesphere.domain.user.dto.response.EmailResponse;
 import com.memesphere.domain.user.dto.response.GoogleUserInfoResponse;
 import com.memesphere.domain.user.entity.SocialType;
 import com.memesphere.domain.user.entity.User;
@@ -49,5 +50,14 @@ public static User toAuthUser(SignUpRequest signUpRequest, PasswordEncoder passw
                 .build();
     }
 
+    // 비밀번호 찾기 이메일
+    public static EmailResponse toEmailResponse(String tmpPassword, String memberEmail, String title, String message, String fromAddress) {
+        return EmailResponse.builder()
+                .toAddress(memberEmail)
+                .title(title)
+                .message(message + tmpPassword)
+                .fromAddress(fromAddress)
+                .build();
+    }
 }
 
diff --git a/src/main/java/com/memesphere/domain/user/dto/response/EmailResponse.java b/src/main/java/com/memesphere/domain/user/dto/response/EmailResponse.java
@@ -0,0 +1,17 @@
+package com.memesphere.domain.user.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class EmailResponse {
+    private String toAddress; // 받는 이메일 주소
+    private String title; // 이메일 제목
+    private String message; // 이메일 내용
+    private String fromAddress; // 보내는 이메일 주소
+}
diff --git a/src/main/java/com/memesphere/domain/user/entity/User.java b/src/main/java/com/memesphere/domain/user/entity/User.java
@@ -67,4 +67,8 @@ public class User extends BaseEntity {
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
     @Builder.Default
     private List<ChatLike> chatLikeList = new ArrayList<>();
+
+    public void updatePassword(String password){
+        this.password = password;
+    }
 }
diff --git a/src/main/java/com/memesphere/domain/user/service/AuthService.java b/src/main/java/com/memesphere/domain/user/service/AuthService.java
@@ -12,4 +12,6 @@ public interface AuthService {
     LoginResponse reissueAccessToken(String refreshToken, User existingUser);
     void checkPassword(User user, String password);
     boolean checkNicknameDuplicate(String nickname);
+    String getTmpPassword();
+    void updatePassword(String tmpPassword, String memberEmail);
 }
diff --git a/src/main/java/com/memesphere/domain/user/service/AuthServiceImpl.java b/src/main/java/com/memesphere/domain/user/service/AuthServiceImpl.java
@@ -13,6 +13,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 
@@ -22,7 +23,6 @@ public class AuthServiceImpl implements AuthService{
 
     private final PasswordEncoder passwordEncoder;
     private final UserRepository userRepository;
-    private final UserServiceImpl userServiceImpl;
     private final TokenProvider tokenProvider;
     private final RedisService redisService;
 
@@ -38,7 +38,7 @@ public void handleUserRegistration(SignUpRequest signUpRequest) {
         }
 
         User newUser = UserConverter.toAuthUser(signUpRequest, passwordEncoder);
-        userServiceImpl.save(newUser);
+        userRepository.save(newUser);
     }
 
     public LoginResponse handleUserLogin(SignInRequest signInRequest) {
@@ -111,4 +111,29 @@ public void checkPassword(User user, String password) {
     public boolean checkNicknameDuplicate(String nickname) {
         return userRepository.findByNickname(nickname).isPresent();
     }
+
+    public String getTmpPassword() {
+        char[] charSet = new char[]{ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+                'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+                'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'};
+
+        String pwd = "";
+
+        // 문자 배열 길이의 값을 랜덤으로 10개를 뽑아 조합
+        int idx = 0;
+        for(int i = 0; i < 10; i++){
+            idx = (int) (charSet.length * Math.random());
+            pwd += charSet[idx];
+        }
+
+        return pwd;
+    }
+
+    @Transactional
+    public void updatePassword(String tmpPassword, String memberEmail) {
+        String encryptPassword = passwordEncoder.encode(tmpPassword);
+        User existingUser = userRepository.findByEmail(memberEmail).orElseThrow(() -> new GeneralException(ErrorStatus.USER_NOT_FOUND));
+
+        existingUser.updatePassword(encryptPassword);
+    }
 }
diff --git a/src/main/java/com/memesphere/domain/user/service/GoogleServiceImpl.java b/src/main/java/com/memesphere/domain/user/service/GoogleServiceImpl.java
@@ -24,7 +24,6 @@
 public class GoogleServiceImpl implements GoogleService{
 
     private final TokenProvider tokenProvider;
-    private final UserServiceImpl userServiceImpl;
     private final UserRepository userRepository;
 
     @Value("${security.oauth2.client.registration.google.client-id}")
diff --git a/src/main/java/com/memesphere/domain/user/service/KakaoServiceImpl.java b/src/main/java/com/memesphere/domain/user/service/KakaoServiceImpl.java
@@ -22,7 +22,6 @@
 public class KakaoServiceImpl implements KakaoService {
 
     private final TokenProvider tokenProvider;
-    private final UserServiceImpl userServiceImpl;
     private final UserRepository userRepository;
     private final RedisService redisService;
 
@@ -70,7 +69,7 @@ public KakaoUserInfoResponse getUserInfo(String accessToken) {
     }
 
     public LoginResponse handleUserLogin(KakaoUserInfoResponse kakaoUserInfoResponse) {
-        User existingUser = userServiceImpl.findByLoginId(kakaoUserInfoResponse.getId());
+        User existingUser = userRepository.findByLoginId(kakaoUserInfoResponse.getId()).orElse(null);
         String accessToken;
 
         if (existingUser != null) {
diff --git a/src/main/java/com/memesphere/domain/user/service/MailService.java b/src/main/java/com/memesphere/domain/user/service/MailService.java
@@ -0,0 +1,8 @@
+package com.memesphere.domain.user.service;
+
+import com.memesphere.domain.user.dto.response.EmailResponse;
+
+public interface MailService {
+    EmailResponse createMail(String tmpPassword, String memberEmail);
+    void sendMail(EmailResponse email);
+}
diff --git a/src/main/java/com/memesphere/domain/user/service/MailServiceImpl.java b/src/main/java/com/memesphere/domain/user/service/MailServiceImpl.java
@@ -0,0 +1,49 @@
+package com.memesphere.domain.user.service;
+
+import com.memesphere.domain.user.converter.UserConverter;
+import com.memesphere.domain.user.dto.response.EmailResponse;
+import com.memesphere.domain.user.entity.User;
+import com.memesphere.domain.user.repository.UserRepository;
+import com.memesphere.global.apipayload.code.status.ErrorStatus;
+import com.memesphere.global.apipayload.exception.GeneralException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.mail.SimpleMailMessage;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class MailServiceImpl implements MailService {
+
+    private final JavaMailSender mailSender;
+    private final UserRepository userRepository;
+
+    private static final String title = "MemeSphere 임시 비밀번호 안내 이메일입니다.";
+    private static final String message = "안녕하세요. MemeSphere 임시 비밀번호 안내 메일입니다. "
+            +"\n" + "회원님의 임시 비밀번호는 아래와 같습니다. 로그인 후 반드시 비밀번호를 변경해주세요."+"\n";
+    private static final String fromAddress = "memesphere01@gmail.com";
+
+    @Override
+    public EmailResponse createMail(String tmpPassword, String memberEmail) {
+        User existingUser = userRepository.findByEmail(memberEmail).orElseThrow(() -> new GeneralException(ErrorStatus.USER_NOT_FOUND));
+        String password = existingUser.getPassword();
+
+        if (password == null) {
+            throw new GeneralException(ErrorStatus.SOCIAL_LOGIN_NOT_ALLOWED);
+        }
+
+        return UserConverter.toEmailResponse(tmpPassword, memberEmail, title, message, fromAddress);
+    }
+
+    @Override
+    public void sendMail(EmailResponse email) {
+        SimpleMailMessage mailMessage = new SimpleMailMessage();
+        mailMessage.setTo(email.getToAddress());
+        mailMessage.setSubject(email.getTitle());
+        mailMessage.setText(email.getMessage());
+        mailMessage.setFrom(email.getFromAddress());
+        mailMessage.setReplyTo(email.getFromAddress());
+
+        mailSender.send(mailMessage);
+    }
+}
diff --git a/src/main/java/com/memesphere/domain/user/service/UserService.java b/src/main/java/com/memesphere/domain/user/service/UserService.java
diff --git a/src/main/java/com/memesphere/domain/user/service/UserServiceImpl.java b/src/main/java/com/memesphere/domain/user/service/UserServiceImpl.java
diff --git a/src/main/java/com/memesphere/global/apipayload/code/status/ErrorStatus.java b/src/main/java/com/memesphere/global/apipayload/code/status/ErrorStatus.java
@@ -49,6 +49,7 @@ public enum ErrorStatus implements BaseCode {
     EXPIRED_TOKEN(HttpStatus.UNAUTHORIZED, "EXPIRED TOKEN", "만료된 토큰입니다."),
     UNSUPPORTED_TOKEN(HttpStatus.UNAUTHORIZED, "UNSUPPORTED TOKEN", "지원하지 않는 토큰입니다."),
     INVALID_SIGNATURE(HttpStatus.UNAUTHORIZED, "INVALID SIGNATURE", "잘못된 JWT 서명입니다"),
+    SOCIAL_LOGIN_NOT_ALLOWED(HttpStatus.FORBIDDEN, "SOCIAL LOGIN NOT ALLOWED", "소셜 로그인 계정으로 비밀번호를 찾을 수 없습니다."),
 
     // 이미지 에러
     INVALID_FILE_EXTENTION(HttpStatus.BAD_REQUEST, "INVALID FILE EXTENSION", "지원되지 않는 파일 형식입니다."),

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,9 @@ dependencies {`
`61`	`61`
`62`	`62`	`// redis`
`63`	`63`	`implementation 'org.springframework.boot:spring-boot-starter-data-redis'`
	`64`	`+`
	`65`	`+ // 이메일 전송`
	`66`	`+ implementation 'org.springframework.boot:spring-boot-starter-mail'`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`tasks.named('test') {`
Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,8 @@ public class User extends BaseEntity {`
`67`	`67`	`@OneToMany(mappedBy = "user", cascade = CascadeType.ALL)`
`68`	`68`	`@Builder.Default`
`69`	`69`	`private List<ChatLike> chatLikeList = new ArrayList<>();`
	`70`	`+`
	`71`	`+ public void updatePassword(String password){`
	`72`	`+ this.password = password;`
	`73`	`+ }`
`70`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,6 @@ public interface AuthService {`
`12`	`12`	`LoginResponse reissueAccessToken(String refreshToken, User existingUser);`
`13`	`13`	`void checkPassword(User user, String password);`
`14`	`14`	`boolean checkNicknameDuplicate(String nickname);`
	`15`	`+ String getTmpPassword();`
	`16`	`+ void updatePassword(String tmpPassword, String memberEmail);`
`15`	`17`	`}`