Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/main/java/taxi/controller/GetMyCurrentCarsController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package taxi.controller;

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 javax.servlet.http.HttpSession;
import taxi.lib.Injector;
import taxi.model.Car;
import taxi.service.CarService;

public class GetMyCurrentCarsController extends HttpServlet {
private static final Injector injector = Injector.getInstance("taxi");
private final CarService carService = (CarService) injector.getInstance(CarService.class);

@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
HttpSession session = req.getSession();
Long driverId = (Long) session.getAttribute("driverID");
List<Car> cars = carService.getAllByDriver(driverId);
req.setAttribute("cars", cars);
req.getRequestDispatcher("/WEB-INF/views/cars/all.jsp").forward(req, resp);
}
}
40 changes: 40 additions & 0 deletions src/main/java/taxi/controller/LoginController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package taxi.controller;

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/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("driverID", driver.getId());
resp.sendRedirect(req.getContextPath() + "/index");
} catch (AuthenticationException e) {
req.setAttribute("errorMsg", e.getMessage());
req.getRequestDispatcher("/WEB-INF/views/login.jsp").forward(req, resp);
}
}
}
16 changes: 16 additions & 0 deletions src/main/java/taxi/controller/LogoutController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package taxi.controller;

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
public void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
req.getSession().invalidate();
resp.sendRedirect(req.getContextPath() + "/login");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/taxi/dao/CarDaoImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ private void deleteAllDrivers(Car car) {
}

private List<Driver> 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";
Expand All @@ -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;
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/taxi/dao/DriverDao.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package taxi.dao;

import java.util.Optional;
import taxi.model.Driver;

public interface DriverDao extends GenericDao<Driver> {
Optional<Driver> findByLogin(String login);
}
33 changes: 29 additions & 4 deletions src/main/java/taxi/dao/DriverDaoImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
public class DriverDaoImpl implements DriverDao {
@Override
public Driver create(Driver driver) {
String query = "INSERT INTO drivers (name, license_number) "
+ "VALUES (?, ?)";
String query = "INSERT INTO drivers (name, license_number, login, password) "
+ "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()) {
Expand Down Expand Up @@ -71,14 +73,16 @@ public List<Driver> getAll() {
@Override
public Driver update(Driver driver) {
String query = "UPDATE drivers "
+ "SET name = ?, license_number = ? "
+ "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) {
Expand All @@ -98,14 +102,35 @@ public boolean delete(Long id) {
}
}

@Override
public Optional<Driver> findByLogin(String login) {
String query = "SELECT * FROM drivers WHERE login = ? AND is_deleted = FALSE";
try (Connection connection = ConnectionUtil.getConnection();
PreparedStatement statement = connection.prepareStatement(query)) {
statement.setString(1, login);
ResultSet resultSet = statement.executeQuery();
Driver driver = null;
if (resultSet.next()) {
driver = parseDriverFromResultSet(resultSet);
}
return Optional.ofNullable(driver);
} catch (SQLException e) {
throw new DataProcessingException("Can't get driver by login " + login, e);
}
}

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;
}
}
7 changes: 7 additions & 0 deletions src/main/java/taxi/exception/AuthenticationException.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package taxi.exception;

public class AuthenticationException extends Exception {
public AuthenticationException(String message) {
super(message);
}
}
31 changes: 29 additions & 2 deletions src/main/java/taxi/model/Driver.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,19 @@ 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, String login, String password) {
this.name = name;
this.licenseNumber = licenseNumber;
this.login = login;
this.password = password;
}

public Driver(String name, String licenseNumber) {
this.name = name;
this.licenseNumber = licenseNumber;
Expand Down Expand Up @@ -39,6 +48,22 @@ public void setLicenseNumber(String licenseNumber) {
this.licenseNumber = licenseNumber;
}

public String getLogin() {
return login;
}

public void setLogin(String login) {
this.login = login;
}

public String getPassword() {
return password;
}

public void setPassword(String password) {
this.password = password;
}

@Override
public boolean equals(Object o) {
if (this == o) {
Expand All @@ -50,11 +75,13 @@ public boolean equals(Object o) {
Driver driver = (Driver) o;
return Objects.equals(id, driver.id)
&& Objects.equals(name, driver.name)
&& Objects.equals(licenseNumber, driver.licenseNumber);
&& Objects.equals(licenseNumber, driver.licenseNumber)
&& Objects.equals(login, driver.login)
&& Objects.equals(password, driver.password);
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would not recommend to add password to equals/hashcode methods.
Further it will be encrypted and depending on hashing algorithm this may cause improper comparison

}

@Override
public int hashCode() {
return Objects.hash(id, name, licenseNumber);
return Objects.hash(id, name, licenseNumber, login, password);
}
}
8 changes: 8 additions & 0 deletions src/main/java/taxi/service/AuthenticationService.java
Original file line number Diff line number Diff line change
@@ -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;
}
21 changes: 21 additions & 0 deletions src/main/java/taxi/service/AuthenticationServiceImpl.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package taxi.service;

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 {
Driver driver = driverService.findByLogin(login);
if (driver.getPassword().equals(password)) {
return driver;
}
throw new AuthenticationException("Incorrect login or password");
}
}
2 changes: 2 additions & 0 deletions src/main/java/taxi/service/DriverService.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package taxi.service;

import taxi.exception.AuthenticationException;
import taxi.model.Driver;

public interface DriverService extends GenericService<Driver> {
Driver findByLogin(String login) throws AuthenticationException;
}
8 changes: 8 additions & 0 deletions src/main/java/taxi/service/DriverServiceImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.List;
import java.util.NoSuchElementException;
import taxi.dao.DriverDao;
import taxi.exception.AuthenticationException;
import taxi.lib.Inject;
import taxi.lib.Service;
import taxi.model.Driver;
Expand Down Expand Up @@ -38,4 +39,11 @@ public Driver update(Driver driver) {
public boolean delete(Long id) {
return driverDao.delete(id);
}

@Override
public Driver findByLogin(String login) throws AuthenticationException {
return driverDao.findByLogin(login).orElseThrow(() ->
new AuthenticationException("Incorrect login or password")
);
}
}
8 changes: 4 additions & 4 deletions src/main/java/taxi/util/ConnectionUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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://localhost:3306/taxi?serverTimezone=UTC";
private static final String USERNAME = "root";
private static final String PASSWORD = "as12df34";
private static final String JDBC_DRIVER = "com.mysql.cj.jdbc.Driver";

static {
try {
Expand Down
39 changes: 39 additions & 0 deletions src/main/java/taxi/web/filter/AuthenticationFilter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
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 static final Set<String> allowedUrls = new HashSet<>();

@Override
public void init(FilterConfig filterConfig) {
allowedUrls.add("/login");
allowedUrls.add("/drivers/add");
}

@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse,
FilterChain filterChain)
throws IOException, ServletException {
HttpServletRequest req = (HttpServletRequest) servletRequest;
HttpServletResponse resp = (HttpServletResponse) servletResponse;
HttpSession session = req.getSession();
Long driverId = (Long) session.getAttribute("driverID");
if (driverId != null || allowedUrls.contains(req.getServletPath())) {
filterChain.doFilter(req, resp);
return;
}
resp.sendRedirect(req.getContextPath() + "/login");
}
}
1 change: 1 addition & 0 deletions src/main/webapp/WEB-INF/views/cars/add.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<title>Add car</title>
</head>
<body>
<%@include file="/WEB-INF/views/header.jsp"%>
<form method="post" id="car" action="${pageContext.request.contextPath}/cars/add"></form>
<h1 class="table_dark">Add car:</h1>
<table border="1" class="table_dark">
Expand Down
Loading