重置密码

src/main/java/com/edgec/browserbackend/account/controller/AccountController.java

@@ -202,7 +202,7 @@ public class AccountController {
         accountService.updateUserToken(username, token);
     }
 
-    @RequestMapping(path = "/reset", method = RequestMethod.POST)
+    @RequestMapping(path = "/resetpassword", method = RequestMethod.POST)
     public ResultDto forgetPassword(@Valid @RequestBody UserDto user) {
         ResultDto resultDto = new ResultDto();
         try {
@@ -223,7 +223,7 @@ public class AccountController {
         return accountService.determUsernameOrEmail(text);
     }
 
-    @RequestMapping(path = "/resetwithotp", method = RequestMethod.POST)
+    @RequestMapping(path = "/reset", method = RequestMethod.POST)
     public ResultDto resetWithOtp(@Valid @RequestBody UserDto user) {
         ResultDto resultDto = new ResultDto();
         try {

src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java

@@ -782,7 +782,7 @@ public class AccountServiceImpl implements AccountService {
     @Override
     public void resetPasswordWithOtp(UserDto user) {
 
-        Otp otp = otpRepository.findByPhoneAndCreatedAtGreaterThanEqual(user.getPhone(),
+        Otp otp = otpRepository.findByPhoneAndCreatedAtGreaterThanEqual(user.getUsername(),
                 Instant.now().minusSeconds(600).toEpochMilli());
         if (otp == null) {
             throw new ClientRequestException(AccountErrorCode.OTPWRONG, AccountErrorCode.OTPWRONG.getReason());
@@ -791,7 +791,7 @@ public class AccountServiceImpl implements AccountService {
             throw new ClientRequestException(AccountErrorCode.OTPWRONG, AccountErrorCode.OTPWRONG.getReason());
         }
 
-        Account account = repository.findByPhoneNumber(user.getPhone());
+        Account account = repository.findById(user.getUsername()).orElse(null);
 
         if (account == null)
             throw new ClientRequestException(AccountErrorCode.PHONENOTEXIST, "Can't find account with phone " + user.getPhone());