Your New Pass : " + tmp + "
"; userService.updatePassword(account, HashPassword.hash(tmp)); - MailService.send(account, subject, message); + MailService.send(account, title, message); session.setAttribute("message", "we have sent your password via email"); response.sendRedirect(request.getContextPath() + "/user/forgot-password"); } catch (ValidationException e) { diff --git a/src/java/com/library/controller/user/RegisterController.java b/src/java/com/library/controller/user/RegisterController.java index 9135658..7933964 100644 --- a/src/java/com/library/controller/user/RegisterController.java +++ b/src/java/com/library/controller/user/RegisterController.java @@ -2,7 +2,6 @@ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template */ - package com.library.controller.user; import java.io.IOException; @@ -14,61 +13,58 @@ import jakarta.servlet.http.HttpServletResponse; import com.library.dao.UserDao; import com.library.dao.UserDaoImpl; +import com.library.exception.AccountHasExistedException; +import com.library.exception.AccountNotExistException; +import com.library.exception.ValidationException; + +import com.library.factory.ServiceFactory; +import com.library.service.UserService; import com.library.util.HashPassword; +import com.library.util.Validator; import jakarta.servlet.http.HttpSession; +import sun.security.validator.ValidatorException; + /** * - * @author hieuchu + * @author hieuchu */ -@WebServlet(name="RegisterController", urlPatterns={"/user/register"}) +@WebServlet(name = "RegisterController", urlPatterns = {"/user/register"}) public class RegisterController extends HttpServlet { - UserDao userDao = new UserDaoImpl(); - + + private final UserService userService = ServiceFactory.getUserService(); + @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { HttpSession session = request.getSession(); String error = (String) session.getAttribute("error"); request.setAttribute("error", error); session.removeAttribute("error"); - request.getRequestDispatcher("/WEB-INF/views/user/register.jsp").forward(request, response); - } + request.getRequestDispatcher("/WEB-INF/views/user/register.jsp").forward(request, response); + } + @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { HttpSession session = request.getSession(); String userName = request.getParameter("username"); String pass = request.getParameter("password"); - String account = request.getParameter("account"); - if(userName.trim().isEmpty()){ - session.setAttribute("error", "Vui lòng nhập họ và tên!"); - response.sendRedirect(request.getContextPath() + "/user/register"); - return; - } - else if(pass.trim().isEmpty()){ - session.setAttribute("error", "Vui lòng nhập mật khẩu!"); - response.sendRedirect(request.getContextPath() + "/user/register"); - return; - } - else if(account.trim().isEmpty()){ - session.setAttribute("error", "Vui lòng nhập tên đăng nhập!"); + String account = request.getParameter("account"); + try { + Validator.validateUserInput(account, pass); + userService.hasAccountExisted(account); + String hashedPassword = HashPassword.hash(pass); + userService.addUser(userName, account, hashedPassword); + session.setAttribute("success", "Resgiter Done !!!"); + response.sendRedirect(request.getContextPath() + "/user/login"); + } catch (AccountHasExistedException s) { + session.setAttribute("error", "account has existed !!!"); response.sendRedirect(request.getContextPath() + "/user/register"); - return; - } - - if(userDao.checkUserExistence(account)){ - session.setAttribute("error", "Tên đăng nhập đã được sử dụng!"); + } catch (ValidationException s1) { + session.setAttribute("error", s1.getMessage()); response.sendRedirect(request.getContextPath() + "/user/register"); - return; - } - else{ - String hashedPassword = HashPassword.hash(pass); - userDao.addNewUser(userName, account, hashedPassword); - session.setAttribute("success", "Bạn đã đăng kí thành công!"); - response.sendRedirect(request.getContextPath() + "/user/login"); - return; + } } - } diff --git a/src/java/com/library/controller/user/SettingController.java b/src/java/com/library/controller/user/SettingController.java index d663f47..8027022 100644 --- a/src/java/com/library/controller/user/SettingController.java +++ b/src/java/com/library/controller/user/SettingController.java @@ -33,29 +33,19 @@ public class SettingController extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - HttpSession session = request.getSession(false); -// if (session == null || session.getAttribute("account") == null) { -// response.sendRedirect(request.getContextPath() + "/user/login"); -// return; -// } + HttpSession session = request.getSession(false); String account = (String) session.getAttribute("account"); try { - UserProfileDTO dto = userService.getProfileUserByAccount(account); - + UserProfileDTO dto = userService.getProfileUserByAccount(account); String error = (String) session.getAttribute("changePasswordError"); - String success = (String) session.getAttribute("changePasswordSuccess"); - + String success = (String) session.getAttribute("changePasswordSuccess"); request.setAttribute("error", error); - request.setAttribute("success", success); - + request.setAttribute("success", success); session.removeAttribute("changePasswordError"); session.removeAttribute("changePasswordSuccess"); - session.setAttribute("user", dto); - + session.setAttribute("user", dto); request.getRequestDispatcher("/WEB-INF/views/user/setting.jsp").forward(request, response); return; - } catch (UserNotFoundException u) { response.sendError(404, "User not found"); } diff --git a/src/java/com/library/controller/user/UpdateProfileController.java b/src/java/com/library/controller/user/UpdateProfileController.java index dbe1138..dce8198 100644 --- a/src/java/com/library/controller/user/UpdateProfileController.java +++ b/src/java/com/library/controller/user/UpdateProfileController.java @@ -83,13 +83,13 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) boolean checkUpdate = userService.updateProfileUser(account, avatar, fullName, userID); if (checkUpdate) { - request.setAttribute("isUpdated", "✅ You have updated your profile successfully!"); + request.setAttribute("isUpdated", "You have updated your profile successfully!"); session.removeAttribute("user"); u.setNewProfile(fullName, account, avatar); session.setAttribute("user", u); activityService.ActivityUser(2, account); } else { - request.setAttribute("isUpdated", "❌ Failed to update your profile. Please try again!"); + request.setAttribute("isUpdated", " Failed to update your profile"); } request.getRequestDispatcher("/WEB-INF/views/user/setting.jsp").forward(request, response); } diff --git a/src/java/com/library/controller/user/UserDashBoardController.java b/src/java/com/library/controller/user/UserDashBoardController.java index b33b12a..656d774 100644 --- a/src/java/com/library/controller/user/UserDashBoardController.java +++ b/src/java/com/library/controller/user/UserDashBoardController.java @@ -25,18 +25,14 @@ public class UserDashBoardController extends HttpServlet { BookDao bookDao = new BookDaoImpl(); - BorrowingDao borrowDao = new BorrowingDaoImpl(); + BorrowingDao borrowDao = new BorrowingDaoImpl(); + @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { int totalBook = bookDao.totalBook(); - HttpSession session = request.getSession(false); //get available session + HttpSession session = request.getSession(false); -// check if the session is null or if the user has not logged in yet - if(session == null || session.getAttribute("account") == null){ - response.sendRedirect(request.getContextPath() + "/user/login"); - return ; - } // take current user account String account = (String)session.getAttribute("account"); diff --git a/src/java/com/library/dao/BookDaoImpl.java b/src/java/com/library/dao/BookDaoImpl.java index 24d6db3..ef4ab7b 100644 --- a/src/java/com/library/dao/BookDaoImpl.java +++ b/src/java/com/library/dao/BookDaoImpl.java @@ -47,7 +47,7 @@ public List