Recovery fixes

Author: Throyer

src/main/java/com/github/throyer/common/springboot/controllers/app/RecoveryController.java

@@ -26,16 +26,16 @@
 @Controller
 @RequestMapping("/app/recovery")
 public class RecoveryController {
-    
+
     @Autowired
     private RecoveryService recoveryService;
-    
+
     @Autowired
     private RecoveryConfirmService confirmService;
-    
+
     @Autowired
     private RecoveryUpdateService updateService;
-    
+
     @GetMapping
     public String index(Model model) {
         model.addAttribute("recovery", new RecoveryRequest());
@@ -48,17 +48,17 @@ public String index(
         BindingResult result,
         Model model
     ) {
-        
+
         if (validate(model, recovery, "recovery", result)) {
             return "app/recovery/index";
         }
-                
+
         var email = recovery.getEmail();
-        
+
         recoveryService.recovery(email);
-        
+
         model.addAttribute("codes", new Codes(email));
-        
+
         return "app/recovery/confirm";
     }
 
@@ -69,19 +69,18 @@ public String confirm(
         RedirectAttributes redirect,
         Model model
     ) {
-        
+
         if (validate(model, codes, "recovery", result)) {
             return "app/recovery/confirm";
         }
 
         try {
-            
-            confirmService.confirm(codes.getEmail(), codes.code());            
-            return "redirect:/app/recovery/update";            
+            confirmService.confirm(codes.getEmail(), codes.code());
         } catch (ResponseStatusException exception) {
-            
+
             Toasts.add(model, "Código expirado ou invalido.", Type.DANGER);
             model.addAttribute("confirm", codes);
+            return "app/recovery/confirm";
         }
 
         model.addAttribute("update", new Update(codes));
@@ -97,19 +96,19 @@ public String update(
         Model model
     ) {
         update.validate(result);
-        
+
         if (validate(model, update, "update", result)) {
             return "app/recovery/update";
         }
- 
+
         try {
             updateService.update(update.getEmail(), update.code(), update.getPassword());
         } catch (ResponseStatusException exception) {
             Toasts.add(model, "Código expirado ou invalido.", Type.DANGER);
             model.addAttribute("update", update);
             return "app/recovery/update";
         }
-        
+
         Toasts.add(redirect, "Sua senha foi atualizada com sucesso.", Type.SUCCESS);
         return "redirect:/app/login";
     }

src/main/java/com/github/throyer/common/springboot/domain/user/repository/Queries.java

@@ -29,7 +29,7 @@ public class Queries {
         WHERE user.id = ?1
     """;
 
-    public static final String FIND_BY_EMAIL_FETCH_ROLES = """
+    public static final String FIND_USER_BY_EMAIL_FETCH_ROLES = """
         SELECT user FROM #{#entityName} user
         LEFT JOIN FETCH user.roles
         WHERE user.email = ?1

src/main/java/com/github/throyer/common/springboot/domain/user/repository/UserRepository.java

@@ -6,7 +6,6 @@
 import com.github.throyer.common.springboot.domain.user.model.UserDetails;
 import static com.github.throyer.common.springboot.domain.user.repository.Queries.DELETE_USER_BY_ID;
 import static com.github.throyer.common.springboot.domain.user.repository.Queries.FIND_ALL_USER_DETAILS_WITHOUT_ROLES;
-import static com.github.throyer.common.springboot.domain.user.repository.Queries.FIND_BY_EMAIL_FETCH_ROLES;
 import static com.github.throyer.common.springboot.domain.user.repository.Queries.FIND_USERNAME_BY_ID;
 import static com.github.throyer.common.springboot.domain.user.repository.Queries.FIND_USER_BY_ID_FETCH_ROLES;
 import com.github.throyer.common.springboot.domain.management.repository.SoftDeleteRepository;
@@ -17,6 +16,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
+import static com.github.throyer.common.springboot.domain.user.repository.Queries.FIND_USER_BY_EMAIL_FETCH_ROLES;
 
 @Repository
 public interface UserRepository extends SoftDeleteRepository<User> {
@@ -51,7 +51,7 @@ default void deleteAll(Iterable<? extends User> entities) {
     @Query(FIND_USER_BY_ID_FETCH_ROLES)
     public Optional<User> findOptionalByIdFetchRoles(Long id);
 
-    @Query(FIND_BY_EMAIL_FETCH_ROLES)
+    @Query(FIND_USER_BY_EMAIL_FETCH_ROLES)
     public Optional<User> findOptionalByEmailFetchRoles(String email);
 
     public Optional<User> findOptionalByEmail(String email);