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
41 changes: 41 additions & 0 deletions src/main/java/taxi/controller/LoginController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
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("driver_id", 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
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
req.getSession().invalidate();
resp.sendRedirect(req.getContextPath() + "/login");
}
}
6 changes: 4 additions & 2 deletions src/main/java/taxi/controller/driver/AddDriverController.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)

@Override
public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
String login = req.getParameter("username");
String name = req.getParameter("name");
String licenseNumber = req.getParameter("license_number");
Driver driver = new Driver(name, licenseNumber);
String password = req.getParameter("password");
Driver driver = new Driver(login, name, licenseNumber, password);
driverService.create(driver);
resp.sendRedirect(req.getContextPath() + "/drivers/add");
resp.sendRedirect(req.getContextPath() + "/drivers/all");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package taxi.controller.driver;

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;

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 {
List<Car> cars = carService.getAllByDriver((Long) req.getSession()
.getAttribute("driver_id"));
req.setAttribute("cars", cars);
req.getRequestDispatcher("/WEB-INF/views/cars/all.jsp").forward(req, resp);
}
}
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, username, name, license_number, password "
+ "FROM cars_drivers cd "
+ "JOIN drivers d ON cd.driver_id = d.id "
+ "WHERE car_id = ? AND is_deleted = false";
Expand All @@ -209,12 +209,16 @@ private List<Driver> getAllDriversByCarId(Long carId) {

private Driver parseDriverFromResultSet(ResultSet resultSet) throws SQLException {
Long driverId = resultSet.getObject("id", Long.class);
String login = resultSet.getString("username");
String name = resultSet.getString("name");
String licenseNumber = resultSet.getString("license_number");
String password = resultSet.getString("password");
Driver driver = new Driver();
driver.setId(driverId);
driver.setLogin(login);
driver.setName(name);
driver.setLicenseNumber(licenseNumber);
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);
}
41 changes: 33 additions & 8 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 (username, name, license_number, 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(1, driver.getLogin());
statement.setString(2, driver.getName());
statement.setString(3, driver.getLicenseNumber());
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 username = ?, name = ?, license_number = ?, 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(1, driver.getLogin());
statement.setString(2, driver.getName());
statement.setString(3, driver.getLicenseNumber());
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 username = ? 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 login = resultSet.getString("username");
String name = resultSet.getString("name");
String licenseNumber = resultSet.getString("license_number");
String password = resultSet.getString("password");
Driver driver = new Driver();
driver.setId(id);
driver.setLogin(login);
driver.setName(name);
driver.setLicenseNumber(licenseNumber);
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);
}
}
24 changes: 24 additions & 0 deletions src/main/java/taxi/model/Driver.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

public class Driver {
private Long id;
private String login;
private String name;
private String licenseNumber;
private String password;

public Driver() {
}
Expand All @@ -15,6 +17,12 @@ public Driver(String name, String licenseNumber) {
this.licenseNumber = licenseNumber;
}

public Driver(String login, String name, String licenseNumber, String password) {
this(name, licenseNumber);
this.login = login;
this.password = password;
}

public Long getId() {
return id;
}
Expand All @@ -39,6 +47,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 Down
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;
}
23 changes: 23 additions & 0 deletions src/main/java/taxi/service/AuthenticationServiceImpl.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
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<Driver> driver = driverService.findByLogin(login);
if (!driver.orElseThrow(() -> new AuthenticationException("Login or password is incorrect"))
.getPassword().equals(password)) {
throw new AuthenticationException("Login or password is incorrect");
}
return driver.get();
}
}
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 java.util.Optional;
import taxi.model.Driver;

public interface DriverService extends GenericService<Driver> {
Optional<Driver> findByLogin(String login);
}
6 changes: 6 additions & 0 deletions src/main/java/taxi/service/DriverServiceImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -38,4 +39,9 @@ public Driver update(Driver driver) {
public boolean delete(Long id) {
return driverDao.delete(id);
}

@Override
public Optional<Driver> findByLogin(String login) {
return driverDao.findByLogin(login);
}
}
10 changes: 6 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,12 @@
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"
+ "?useUnicode=true&serverTimezone=UTC"
+ "&useSSL=true&verifyServerCertificate=false";
private static final String USERNAME = "root";
private static final String PASSWORD = "12345678";
private static final String JDBC_DRIVER = "com.mysql.cj.jdbc.Driver";

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

@Override
public void init(FilterConfig filterConfig) throws ServletException {
allowedUrl = new HashSet<>();
allowedUrl.add("/login");
allowedUrl.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("driver_id");
if (driverId != null || allowedUrl.contains(req.getServletPath())) {
filterChain.doFilter(req, resp);
return;
}
resp.sendRedirect(req.getContextPath() + "/login");

}
}
2 changes: 2 additions & 0 deletions src/main/resources/init_db.sql
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ SET FOREIGN_KEY_CHECKS = 0;
DROP TABLE IF EXISTS `drivers`;
CREATE TABLE `drivers` (
`id` BIGINT(0) UNSIGNED NOT NULL AUTO_INCREMENT,
`username` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`name` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`license_number` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`is_deleted` BIT(1) NOT NULL DEFAULT b'0',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
Expand Down
Loading