From ff34087c6c9075c65845aeec1c334f2334ee5706 Mon Sep 17 00:00:00 2001 From: nikita Date: Fri, 28 Jul 2023 20:27:28 +0300 Subject: [PATCH] hm done --- .../car/GetMyCurrentCarsController.java | 27 ++++++++++++ .../driver/AddDriverController.java | 4 +- .../controller/driver/LoginController.java | 41 +++++++++++++++++++ .../controller/driver/LogoutController.java | 16 ++++++++ src/main/java/taxi/dao/CarDaoImpl.java | 6 ++- src/main/java/taxi/dao/DriverDao.java | 2 + src/main/java/taxi/dao/DriverDaoImpl.java | 32 ++++++++++++++- .../exception/AuthenticationException.java | 7 ++++ src/main/java/taxi/model/Driver.java | 22 +++++++++- .../taxi/service/AuthenticationService.java | 8 ++++ .../service/AuthenticationServiceImpl.java | 22 ++++++++++ src/main/java/taxi/service/DriverService.java | 2 + .../java/taxi/service/DriverServiceImpl.java | 6 +++ src/main/java/taxi/util/ConnectionUtil.java | 8 ++-- .../taxi/web/filter/AuthenticationFilter.java | 40 ++++++++++++++++++ src/main/resources/init_db.sql | 4 ++ src/main/webapp/WEB-INF/views/cars/add.jsp | 1 + src/main/webapp/WEB-INF/views/cars/all.jsp | 1 + .../webapp/WEB-INF/views/cars/drivers/add.jsp | 1 + src/main/webapp/WEB-INF/views/drivers/add.jsp | 8 ++++ src/main/webapp/WEB-INF/views/drivers/all.jsp | 1 + .../webapp/WEB-INF/views/drivers/header.jsp | 16 ++++++++ .../webapp/WEB-INF/views/drivers/login.jsp | 38 +++++++++++++++++ src/main/webapp/WEB-INF/views/index.jsp | 2 + .../WEB-INF/views/manufacturers/add.jsp | 1 + .../WEB-INF/views/manufacturers/all.jsp | 1 + src/main/webapp/web.xml | 36 ++++++++++++++++ 27 files changed, 344 insertions(+), 9 deletions(-) create mode 100644 src/main/java/taxi/controller/car/GetMyCurrentCarsController.java create mode 100644 src/main/java/taxi/controller/driver/LoginController.java create mode 100644 src/main/java/taxi/controller/driver/LogoutController.java create mode 100644 src/main/java/taxi/exception/AuthenticationException.java create mode 100644 src/main/java/taxi/service/AuthenticationService.java create mode 100644 src/main/java/taxi/service/AuthenticationServiceImpl.java create mode 100644 src/main/java/taxi/web/filter/AuthenticationFilter.java create mode 100644 src/main/webapp/WEB-INF/views/drivers/header.jsp create mode 100644 src/main/webapp/WEB-INF/views/drivers/login.jsp diff --git a/src/main/java/taxi/controller/car/GetMyCurrentCarsController.java b/src/main/java/taxi/controller/car/GetMyCurrentCarsController.java new file mode 100644 index 000000000..f6440d004 --- /dev/null +++ b/src/main/java/taxi/controller/car/GetMyCurrentCarsController.java @@ -0,0 +1,27 @@ +package taxi.controller.car; + +import java.io.IOException; +import java.util.List; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import taxi.lib.Injector; +import taxi.model.Car; +import taxi.service.CarService; +import taxi.service.DriverService; + +public class GetMyCurrentCarsController extends HttpServlet { + private static final Injector injector = Injector.getInstance("taxi"); + private final DriverService driverService = + (DriverService) injector.getInstance(DriverService.class); + private final CarService carService = (CarService) injector.getInstance(CarService.class); + + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + Long driverId = (Long) req.getSession().getAttribute("driver_id"); + List allCarsByDrivers = carService.getAllByDriver(driverId); + req.setAttribute("cars", allCarsByDrivers); + req.getRequestDispatcher("/WEB-INF/views/cars/all.jsp").forward(req,resp); + } +} diff --git a/src/main/java/taxi/controller/driver/AddDriverController.java b/src/main/java/taxi/controller/driver/AddDriverController.java index 1db67730b..e6da4dd22 100644 --- a/src/main/java/taxi/controller/driver/AddDriverController.java +++ b/src/main/java/taxi/controller/driver/AddDriverController.java @@ -24,7 +24,9 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { String name = req.getParameter("name"); String licenseNumber = req.getParameter("license_number"); - Driver driver = new Driver(name, licenseNumber); + String login = req.getParameter("login"); + String password = req.getParameter("password"); + Driver driver = new Driver(name, licenseNumber, login, password); driverService.create(driver); resp.sendRedirect(req.getContextPath() + "/drivers/add"); } diff --git a/src/main/java/taxi/controller/driver/LoginController.java b/src/main/java/taxi/controller/driver/LoginController.java new file mode 100644 index 000000000..a18c3dada --- /dev/null +++ b/src/main/java/taxi/controller/driver/LoginController.java @@ -0,0 +1,41 @@ +package taxi.controller.driver; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import taxi.exception.AuthenticationException; +import taxi.lib.Injector; +import taxi.model.Driver; +import taxi.service.AuthenticationService; + +public class LoginController extends HttpServlet { + private static final Injector injector = Injector.getInstance("taxi"); + private final AuthenticationService authenticationService = + (AuthenticationService) injector.getInstance(AuthenticationService.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + req.getRequestDispatcher("/WEB-INF/views/drivers/login.jsp").forward(req, resp); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + String login = req.getParameter("login"); + String password = req.getParameter("password"); + + try { + Driver driver = authenticationService.login(login, password); + HttpSession session = req.getSession(); + session.setAttribute("driver_id", driver.getId()); + resp.sendRedirect(req.getContextPath() + "/index"); + } catch (AuthenticationException e) { + req.setAttribute("message", e.getMessage()); + req.getRequestDispatcher("/WEB-INF/views/drivers/login.jsp").forward(req, resp); + } + } +} diff --git a/src/main/java/taxi/controller/driver/LogoutController.java b/src/main/java/taxi/controller/driver/LogoutController.java new file mode 100644 index 000000000..fc261847e --- /dev/null +++ b/src/main/java/taxi/controller/driver/LogoutController.java @@ -0,0 +1,16 @@ +package taxi.controller.driver; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class LogoutController extends HttpServlet { + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + req.getSession().invalidate(); + req.getRequestDispatcher("/drivers/login").forward(req, resp); + } +} diff --git a/src/main/java/taxi/dao/CarDaoImpl.java b/src/main/java/taxi/dao/CarDaoImpl.java index 586ccb595..aface2ddd 100644 --- a/src/main/java/taxi/dao/CarDaoImpl.java +++ b/src/main/java/taxi/dao/CarDaoImpl.java @@ -188,7 +188,7 @@ private void deleteAllDrivers(Car car) { } private List getAllDriversByCarId(Long carId) { - String query = "SELECT id, name, license_number " + String query = "SELECT id, name, license_number, login, password " + "FROM cars_drivers cd " + "JOIN drivers d ON cd.driver_id = d.id " + "WHERE car_id = ? AND is_deleted = false"; @@ -211,10 +211,14 @@ private Driver parseDriverFromResultSet(ResultSet resultSet) throws SQLException Long driverId = resultSet.getObject("id", Long.class); String name = resultSet.getString("name"); String licenseNumber = resultSet.getString("license_number"); + String login = resultSet.getString("login"); + String password = resultSet.getString("password"); Driver driver = new Driver(); driver.setId(driverId); driver.setName(name); driver.setLicenseNumber(licenseNumber); + driver.setLogin(login); + driver.setPassword(password); return driver; } diff --git a/src/main/java/taxi/dao/DriverDao.java b/src/main/java/taxi/dao/DriverDao.java index 83440d530..e9c38d2a5 100644 --- a/src/main/java/taxi/dao/DriverDao.java +++ b/src/main/java/taxi/dao/DriverDao.java @@ -1,6 +1,8 @@ package taxi.dao; +import java.util.Optional; import taxi.model.Driver; public interface DriverDao extends GenericDao { + Optional findByLogin(String login); } diff --git a/src/main/java/taxi/dao/DriverDaoImpl.java b/src/main/java/taxi/dao/DriverDaoImpl.java index f5e18f2a2..15bec43a1 100644 --- a/src/main/java/taxi/dao/DriverDaoImpl.java +++ b/src/main/java/taxi/dao/DriverDaoImpl.java @@ -18,12 +18,14 @@ public class DriverDaoImpl implements DriverDao { @Override public Driver create(Driver driver) { String query = "INSERT INTO drivers (name, license_number) " - + "VALUES (?, ?)"; + + "VALUES (?, ?, ?, ?)"; try (Connection connection = ConnectionUtil.getConnection(); PreparedStatement statement = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS)) { statement.setString(1, driver.getName()); statement.setString(2, driver.getLicenseNumber()); + statement.setString(3, driver.getLogin()); + statement.setString(4, driver.getPassword()); statement.executeUpdate(); ResultSet resultSet = statement.getGeneratedKeys(); if (resultSet.next()) { @@ -72,13 +74,16 @@ public List getAll() { public Driver update(Driver driver) { String query = "UPDATE drivers " + "SET name = ?, license_number = ? " + + ", login = ?, password = ? " + "WHERE id = ? AND is_deleted = FALSE"; try (Connection connection = ConnectionUtil.getConnection(); PreparedStatement statement = connection.prepareStatement(query)) { statement.setString(1, driver.getName()); statement.setString(2, driver.getLicenseNumber()); - statement.setLong(3, driver.getId()); + statement.setString(3, driver.getLogin()); + statement.setString(4, driver.getPassword()); + statement.setLong(5, driver.getId()); statement.executeUpdate(); return driver; } catch (SQLException e) { @@ -98,14 +103,37 @@ public boolean delete(Long id) { } } + @Override + public Optional findByLogin(String login) { + String query = "SELECT id, name, license_number, login, password " + + "FROM drivers " + + "WHERE login = ? " + + "AND is_deleted = FALSE;"; + try (Connection connection = ConnectionUtil.getConnection(); + PreparedStatement preparedStatement = connection.prepareStatement(query)) { + preparedStatement.setString(1, login); + ResultSet resultSet = preparedStatement.executeQuery(); + while (resultSet.next()) { + return Optional.of(parseDriverFromResultSet(resultSet)); + } + } catch (SQLException e) { + throw new DataProcessingException("Can't get Driver from table by login " + login, e); + } + return Optional.empty(); + } + private Driver parseDriverFromResultSet(ResultSet resultSet) throws SQLException { Long id = resultSet.getObject("id", Long.class); String name = resultSet.getString("name"); String licenseNumber = resultSet.getString("license_number"); + String login = resultSet.getString("login"); + String password = resultSet.getString("password"); Driver driver = new Driver(); driver.setId(id); driver.setName(name); driver.setLicenseNumber(licenseNumber); + driver.setLogin(login); + driver.setPassword(password); return driver; } } diff --git a/src/main/java/taxi/exception/AuthenticationException.java b/src/main/java/taxi/exception/AuthenticationException.java new file mode 100644 index 000000000..a80dfd9e9 --- /dev/null +++ b/src/main/java/taxi/exception/AuthenticationException.java @@ -0,0 +1,7 @@ +package taxi.exception; + +public class AuthenticationException extends Exception { + public AuthenticationException(String message) { + super(message); + } +} diff --git a/src/main/java/taxi/model/Driver.java b/src/main/java/taxi/model/Driver.java index 9c375f94c..6dadbe18e 100644 --- a/src/main/java/taxi/model/Driver.java +++ b/src/main/java/taxi/model/Driver.java @@ -6,13 +6,17 @@ public class Driver { private Long id; private String name; private String licenseNumber; + private String login; + private String password; public Driver() { } - public Driver(String name, String licenseNumber) { + public Driver(String name, String licenseNumber, String login, String password) { this.name = name; this.licenseNumber = licenseNumber; + this.login = login; + this.password = password; } public Long getId() { @@ -39,6 +43,22 @@ public void setLicenseNumber(String licenseNumber) { this.licenseNumber = licenseNumber; } + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getPassword() { + return password; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/main/java/taxi/service/AuthenticationService.java b/src/main/java/taxi/service/AuthenticationService.java new file mode 100644 index 000000000..e9ffa0eea --- /dev/null +++ b/src/main/java/taxi/service/AuthenticationService.java @@ -0,0 +1,8 @@ +package taxi.service; + +import taxi.exception.AuthenticationException; +import taxi.model.Driver; + +public interface AuthenticationService { + Driver login(String login, String password) throws AuthenticationException; +} diff --git a/src/main/java/taxi/service/AuthenticationServiceImpl.java b/src/main/java/taxi/service/AuthenticationServiceImpl.java new file mode 100644 index 000000000..7d2b110ed --- /dev/null +++ b/src/main/java/taxi/service/AuthenticationServiceImpl.java @@ -0,0 +1,22 @@ +package taxi.service; + +import java.util.Optional; +import taxi.exception.AuthenticationException; +import taxi.lib.Inject; +import taxi.lib.Service; +import taxi.model.Driver; + +@Service +public class AuthenticationServiceImpl implements AuthenticationService { + @Inject + private DriverService driverService; + + @Override + public Driver login(String login, String password) throws AuthenticationException { + Optional driverDaoByLogin = driverService.findByLogin(login); + if (password.equals(driverDaoByLogin.get().getPassword())) { + return driverDaoByLogin.get(); + } + throw new AuthenticationException("Login or Password is incorrect."); + } +} diff --git a/src/main/java/taxi/service/DriverService.java b/src/main/java/taxi/service/DriverService.java index faddf81b3..3dbdfe2f3 100644 --- a/src/main/java/taxi/service/DriverService.java +++ b/src/main/java/taxi/service/DriverService.java @@ -1,6 +1,8 @@ package taxi.service; +import java.util.Optional; import taxi.model.Driver; public interface DriverService extends GenericService { + Optional findByLogin(String login); } diff --git a/src/main/java/taxi/service/DriverServiceImpl.java b/src/main/java/taxi/service/DriverServiceImpl.java index e2f554b3f..cf14b8e39 100644 --- a/src/main/java/taxi/service/DriverServiceImpl.java +++ b/src/main/java/taxi/service/DriverServiceImpl.java @@ -2,6 +2,7 @@ import java.util.List; import java.util.NoSuchElementException; +import java.util.Optional; import taxi.dao.DriverDao; import taxi.lib.Inject; import taxi.lib.Service; @@ -38,4 +39,9 @@ public Driver update(Driver driver) { public boolean delete(Long id) { return driverDao.delete(id); } + + @Override + public Optional findByLogin(String login) { + return driverDao.findByLogin(login); + } } diff --git a/src/main/java/taxi/util/ConnectionUtil.java b/src/main/java/taxi/util/ConnectionUtil.java index 9a94e69a2..2046d5df6 100644 --- a/src/main/java/taxi/util/ConnectionUtil.java +++ b/src/main/java/taxi/util/ConnectionUtil.java @@ -6,10 +6,10 @@ import java.util.Properties; public class ConnectionUtil { - private static final String URL = "YOUR DATABASE URL"; - private static final String USERNAME = "YOUR USERNAME"; - private static final String PASSWORD = "YOUR PASSWORD"; - private static final String JDBC_DRIVER = "YOUR DRIVER"; + private static final String URL = "jdbc:mysql://sql7.freesqldatabase.com:3306/sql7630939"; + private static final String USERNAME = "sql7630939"; + private static final String PASSWORD = "HmUQTbNf6K"; + private static final String JDBC_DRIVER = "com.mysql.cj.jdbc.Driver"; static { try { diff --git a/src/main/java/taxi/web/filter/AuthenticationFilter.java b/src/main/java/taxi/web/filter/AuthenticationFilter.java new file mode 100644 index 000000000..f05996c67 --- /dev/null +++ b/src/main/java/taxi/web/filter/AuthenticationFilter.java @@ -0,0 +1,40 @@ +package taxi.web.filter; + +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +public class AuthenticationFilter implements Filter { + private final Set allowedUrls = new HashSet<>(); + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + allowedUrls.add("/drivers/login"); + allowedUrls.add("/drivers/add"); + } + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, + FilterChain filterChain) throws IOException, ServletException { + HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest; + HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse; + HttpSession httpSession = httpServletRequest.getSession(); + Long driverId = (Long) httpSession.getAttribute("driver_id"); + + if (driverId == null && !allowedUrls.contains(httpServletRequest.getServletPath())) { + httpServletResponse.sendRedirect(httpServletRequest.getContextPath() + + "/drivers/login"); + return; + } + filterChain.doFilter(httpServletRequest, httpServletResponse); + } +} diff --git a/src/main/resources/init_db.sql b/src/main/resources/init_db.sql index 2acabb883..d8d8b3a76 100644 --- a/src/main/resources/init_db.sql +++ b/src/main/resources/init_db.sql @@ -56,3 +56,7 @@ CREATE TABLE `cars_drivers` ( ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; + +ALTER TABLE drivers + ADD login VARCHAR(255) NOT NULL, + ADD password VARCHAR(255) NOT NULL; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cars/add.jsp b/src/main/webapp/WEB-INF/views/cars/add.jsp index c23ba0b4f..a7bdeca7c 100644 --- a/src/main/webapp/WEB-INF/views/cars/add.jsp +++ b/src/main/webapp/WEB-INF/views/cars/add.jsp @@ -8,6 +8,7 @@ Add car +<%@include file="/WEB-INF/views/drivers/header.jsp"%>

Add car:

diff --git a/src/main/webapp/WEB-INF/views/cars/all.jsp b/src/main/webapp/WEB-INF/views/cars/all.jsp index 84f046299..f21115726 100644 --- a/src/main/webapp/WEB-INF/views/cars/all.jsp +++ b/src/main/webapp/WEB-INF/views/cars/all.jsp @@ -8,6 +8,7 @@ All cars +<%@include file="/WEB-INF/views/drivers/header.jsp"%>

All cars:

diff --git a/src/main/webapp/WEB-INF/views/cars/drivers/add.jsp b/src/main/webapp/WEB-INF/views/cars/drivers/add.jsp index d281d5d72..54a635c6d 100644 --- a/src/main/webapp/WEB-INF/views/cars/drivers/add.jsp +++ b/src/main/webapp/WEB-INF/views/cars/drivers/add.jsp @@ -8,6 +8,7 @@ Add driver to car +<%@include file="/WEB-INF/views/drivers/header.jsp"%>

Add driver to car:

diff --git a/src/main/webapp/WEB-INF/views/drivers/add.jsp b/src/main/webapp/WEB-INF/views/drivers/add.jsp index 4ad7cee44..d9e3ac9c8 100644 --- a/src/main/webapp/WEB-INF/views/drivers/add.jsp +++ b/src/main/webapp/WEB-INF/views/drivers/add.jsp @@ -14,6 +14,8 @@ + + @@ -23,6 +25,12 @@ + + diff --git a/src/main/webapp/WEB-INF/views/drivers/all.jsp b/src/main/webapp/WEB-INF/views/drivers/all.jsp index 776101f73..4f2868e48 100644 --- a/src/main/webapp/WEB-INF/views/drivers/all.jsp +++ b/src/main/webapp/WEB-INF/views/drivers/all.jsp @@ -8,6 +8,7 @@ All drivers +<%@include file="/WEB-INF/views/drivers/header.jsp"%>

All drivers:

Name License numberLoginPassword Add
+ + + +
diff --git a/src/main/webapp/WEB-INF/views/drivers/header.jsp b/src/main/webapp/WEB-INF/views/drivers/header.jsp new file mode 100644 index 000000000..d918da8df --- /dev/null +++ b/src/main/webapp/WEB-INF/views/drivers/header.jsp @@ -0,0 +1,16 @@ +<%-- + Created by IntelliJ IDEA. + User: sasch + Date: 28.07.2023 + Time: 20:22 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Title + + +logout + + diff --git a/src/main/webapp/WEB-INF/views/drivers/login.jsp b/src/main/webapp/WEB-INF/views/drivers/login.jsp new file mode 100644 index 000000000..80b47c256 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/drivers/login.jsp @@ -0,0 +1,38 @@ +<%-- + Created by IntelliJ IDEA. + User: sasch + Date: 28.07.2023 + Time: 20:22 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + Title + + + +

Login:

+
+ + + + + + + + + + +
LoginPassword
+ + + + + +

${message}

+
+
+Register new driver + + diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index b9b5e9d2b..030221347 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -7,6 +7,7 @@ My team +<%@include file="/WEB-INF/views/drivers/header.jsp"%>

Hello, mates

@@ -20,6 +21,7 @@ +
Create new Car
Create new Manufacturer
Add Driver to Car
All Cars by driver
diff --git a/src/main/webapp/WEB-INF/views/manufacturers/add.jsp b/src/main/webapp/WEB-INF/views/manufacturers/add.jsp index 108d3541c..a98167383 100644 --- a/src/main/webapp/WEB-INF/views/manufacturers/add.jsp +++ b/src/main/webapp/WEB-INF/views/manufacturers/add.jsp @@ -8,6 +8,7 @@ Manufacturers +<%@include file="/WEB-INF/views/drivers/header.jsp"%>

Add manufacturer:

diff --git a/src/main/webapp/WEB-INF/views/manufacturers/all.jsp b/src/main/webapp/WEB-INF/views/manufacturers/all.jsp index fd3eafdbf..fd2627956 100644 --- a/src/main/webapp/WEB-INF/views/manufacturers/all.jsp +++ b/src/main/webapp/WEB-INF/views/manufacturers/all.jsp @@ -8,6 +8,7 @@ All manufacturers +<%@include file="/WEB-INF/views/drivers/header.jsp"%>

All manufacturers:

diff --git a/src/main/webapp/web.xml b/src/main/webapp/web.xml index 284381048..ded1393b1 100644 --- a/src/main/webapp/web.xml +++ b/src/main/webapp/web.xml @@ -105,4 +105,40 @@ deleteManufacturer/manufacturers/delete + + + login + taxi.controller.driver.LoginController + + + login + /drivers/login + + + + logout + taxi.controller.driver.LogoutController + + + logout + /drivers/logout + + + + carsByDriver + taxi.controller.car.GetMyCurrentCarsController + + + carsByDriver + /drivers/cars + + + + authenticationFilter + taxi.web.filter.AuthenticationFilter + + + authenticationFilter + /* +