diff --git a/belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/controller/UserController.java b/belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/controller/UserController.java index e778ad6028b79764b0a1f38046176265d5536f90..5c261d6c1f6a4d5b5fb923aa35fc0a208ef7aa1c 100644 --- a/belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/controller/UserController.java +++ b/belajarbelajar/src/main/java/apap/tutorial/belajarbelajar/controller/UserController.java @@ -70,14 +70,16 @@ public class UserController { UserModel user = userService.getUserByUsername(userModel.getUsername()); BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); if (passwordEncoder.matches(userModel.getPassword(), user.getPassword())){ - if (newPassword.equals(confPassword)){ + if (passwordEncoder.matches(newPassword, user.getPassword())) { + return "error-update"; + } else if (newPassword.equals(confPassword)){ user.setPassword(newPassword); userService.addUser(user); return "sukses-update-password"; } else { model.addAttribute("message", "password yang dikonfirmasi tidak sama. Ulangi!"); } - }else { + } else { model.addAttribute("message", "password lama invalid. Ulangi!"); } return "form-update-password"; diff --git a/belajarbelajar/src/main/resources/templates/error/403.html b/belajarbelajar/src/main/resources/templates/error/403.html index 34318c58e93d5d3e0077e1dcc32363f4b75401a2..08e5359a6290eba6c0fdd1487852ebb183f8ac8a 100644 --- a/belajarbelajar/src/main/resources/templates/error/403.html +++ b/belajarbelajar/src/main/resources/templates/error/403.html @@ -2,7 +2,7 @@ <html lang="en" xmlns:th="http://thymeleaf.org"> <head> <meta charset="UTF-8"> - <title>404 not found</title> + <title>Error 403</title> <object th:include="fragments/fragment :: css" th:remove="tag"></object> <object th:include="fragments/fragment :: js" th:remove="tag"></object> diff --git a/belajarbelajar/src/main/resources/templates/form-update-password.html b/belajarbelajar/src/main/resources/templates/form-update-password.html index 96ab436402069bdb686ccc9d9f9a3438c75d1e31..cec2932c96f199c3b5e3148052bb0c618d1299a9 100644 --- a/belajarbelajar/src/main/resources/templates/form-update-password.html +++ b/belajarbelajar/src/main/resources/templates/form-update-password.html @@ -3,7 +3,7 @@ <head> <meta charset="UTF-8"> - <title>21 Cineplux</title> + <title>Update password</title> <object th:include="fragments/fragment :: css" th:remove="tag"></object> <object th:include="fragments/fragment :: js" th:remove="tag"></object> </head>