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
42 changes: 42 additions & 0 deletions src/main/java/taxi/controller/LoginController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
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() + "/drivers/cars");
return;
} 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() + "/index");
}
}
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
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 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
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
HttpSession session = req.getSession();
Long driverId = (Long) session.getAttribute("driver_id");
List<Car> cars = carService.getAllByDriver(driverId);
req.setAttribute("cars", cars);
req.getRequestDispatcher("/WEB-INF/views/cars/all.jsp").forward(req, resp);
}
}
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);
}
17 changes: 17 additions & 0 deletions src/main/java/taxi/dao/DriverDaoImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,21 @@ private Driver parseDriverFromResultSet(ResultSet resultSet) throws SQLException
driver.setLicenseNumber(licenseNumber);
return driver;
}

@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 driver with login " + login, e);
}
}
}
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);
}
}
16 changes: 16 additions & 0 deletions src/main/java/taxi/model/Driver.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ public class Driver {
private Long id;
private String name;
private String licenseNumber;
private String login;
private String password;

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

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

public Long getId() {
return id;
}
Expand All @@ -39,6 +47,14 @@ public void setLicenseNumber(String licenseNumber) {
this.licenseNumber = licenseNumber;
}

public String getLogin() {
return login;
}

public String getPassword() {
return password;
}

@Override
public boolean equals(Object o) {
if (this == o) {
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/taxi/service/AuthenticationService.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package taxi.service;

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

public interface AuthenticationService {
Driver login(String login, String password)throws AuthenticationException;

}
22 changes: 22 additions & 0 deletions src/main/java/taxi/service/AuthenticationServiceImpl.java
Original file line number Diff line number Diff line change
@@ -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<Driver> driver = driverService.findByLogin("login");
if (driver.get().getPassword().equals(password)) {
return driver.get();
}
throw new AuthenticationException("login or password was incorrect");
}
}
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);
}
8 changes: 7 additions & 1 deletion 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 All @@ -20,7 +21,7 @@ public Driver create(Driver driver) {
@Override
public Driver get(Long id) {
return driverDao.get(id).orElseThrow(() ->
new NoSuchElementException("Can't get driver by id: " + id)
new NoSuchElementException("Can't get driver by id : " + id)
);
}

Expand All @@ -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: 5 additions & 5 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 = "A251745A";
private static final String JDBC_DRIVER = "com.mysql.cj.jdbc.Driver";

static {
try {
Expand All @@ -24,7 +24,7 @@ public static Connection getConnection() {
dbProperties.setProperty("user", USERNAME);
dbProperties.setProperty("password", PASSWORD);
try {
return DriverManager.getConnection(URL, dbProperties);
return DriverManager.getConnection(URL,dbProperties);
} catch (SQLException e) {
throw new RuntimeException("Can't create connection to DB ", e);
}
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 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("driver_id");
if (driverId == null && !allowedUrls.contains(req.getServletPath())) {
resp.sendRedirect(req.getContextPath() + "/login");
return;
}
filterChain.doFilter(req, resp);
}
}
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
1 change: 1 addition & 0 deletions src/main/webapp/WEB-INF/views/cars/all.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<title>All cars</title>
</head>
<body>
<%@include file="/WEB-INF/views/header.jsp" %>
<h1 class="table_dark">All cars:</h1>
<table border="1" class="table_dark">
<tr>
Expand Down
1 change: 1 addition & 0 deletions src/main/webapp/WEB-INF/views/cars/drivers/add.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<title>Add driver to car</title>
</head>
<body>
<%@include file="/WEB-INF/views/header.jsp" %>
<form method="post" id="car" action="${pageContext.request.contextPath}/cars/drivers/add"></form>
<h1 class="table_dark">Add driver to car:</h1>
<table border="1" class="table_dark">
Expand Down
8 changes: 8 additions & 0 deletions src/main/webapp/WEB-INF/views/drivers/add.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<tr>
<th>Name</th>
<th>License number</th>
<th>Login</th>
<th>Password</th>
<th>Add</th>
</tr>
<tr>
Expand All @@ -23,6 +25,12 @@
<td>
<input type="text" name="license_number" form="driver" required>
</td>
<td>
<input type="text" name="login" form="driver" required>
</td>
<td>
<input type="password" name="password" form="driver" required>
</td>
<td>
<input type="submit" name="add" form="driver">
</td>
Expand Down
4 changes: 4 additions & 0 deletions src/main/webapp/WEB-INF/views/drivers/all.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<th>ID</th>
<th>Name</th>
<th>License number</th>
<th>Login</th>
<th>Delete</th>
</tr>
<c:forEach var="driver" items="${drivers}">
Expand All @@ -27,6 +28,9 @@
<td>
<c:out value="${driver.licenseNumber}"/>
</td>
<td>
<c:out value="${driver.login}"/>
</td>
<td>
<a href="${pageContext.request.contextPath}/drivers/delete?id=${driver.id}">DELETE</a>
</td>
Expand Down
9 changes: 9 additions & 0 deletions src/main/webapp/WEB-INF/views/header.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>Title</title>
</head>
<body>
<a href="${pageContext.request.contextPath}/logout">Logout</a>
</body>
</html>
16 changes: 16 additions & 0 deletions src/main/webapp/WEB-INF/views/login.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>Login</title>
</head>
<body>
<h1>Login Page</h1>
<h4 style="color: red">${errorMsg}</h4>
<form method="post" action="${pageContext.request.contextPath}/login">
Login: <input type="text" name="login" required>
Password: <input type="password" name="password" required>
<button type="submit">Login</button>
</form>
<h4><a href="${pageContext.request.contextPath}/drivers/add">NEW DRIVER</a></h4>
</body>
</html>
Loading