Introduce basic authentication, improve ActorServlet

balins · balins · commit 678763e7c01e · 2020-01-21T21:42:35.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,6 @@
     <version>1.0-SNAPSHOT</version>
     <modules>
         <module>server</module>
-        <module>webapp</module>
     </modules>
 
 
diff --git a/server/pom.xml b/server/pom.xml
@@ -29,11 +29,6 @@
           <artifactId>jetty-servlet</artifactId>
           <version>9.4.25.v20191220</version>
       </dependency>
-      <dependency>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-webapp</artifactId>
-          <version>9.4.25.v20191220</version>
-      </dependency>
       <dependency>
           <groupId>com.h2database</groupId>
           <artifactId>h2</artifactId>
diff --git a/server/src/main/java/com/balinski/api_project/Main.java b/server/src/main/java/com/balinski/api_project/Main.java
@@ -9,7 +9,7 @@
 import java.util.List;
 
 public class Main {
-
+    //"name":"jakub","token":"7f078d288631a4de5fc1ce01fa4e0addeebed19ad5c6d6f543fcc160c5c5cdfc"
     public static void main(String[] args) {
         //testDatabase();
         runApplication();
diff --git a/server/src/main/java/com/balinski/api_project/database/DatabaseProxy.java b/server/src/main/java/com/balinski/api_project/database/DatabaseProxy.java
@@ -69,6 +69,7 @@ public static int queryUpdate(String sql, boolean transaction) throws DatabaseEx
                 connection.commit();
             }
         } catch (SQLException e) {
+            e.printStackTrace();
             throw new DatabaseException("An error occurred when trying to update the database.", e);
         } finally {
             closeConnection();
diff --git a/server/src/main/java/com/balinski/api_project/database/dao/ActorDao.java b/server/src/main/java/com/balinski/api_project/database/dao/ActorDao.java
@@ -5,8 +5,8 @@
 import java.util.*;
 
 public class ActorDao extends Dao<Actor> {
-    public ActorDao(boolean transaction) {
-        super(DaoType.ACTOR, transaction);
+    public ActorDao() {
+        super(DaoType.ACTOR);
     }
 
     public List<Actor> getByFirstName(String firstName) throws DaoException {
diff --git a/server/src/main/java/com/balinski/api_project/database/dao/Dao.java b/server/src/main/java/com/balinski/api_project/database/dao/Dao.java
@@ -5,12 +5,10 @@
 import java.util.*;
 
 abstract class Dao<T extends DatabaseModel> {
-    protected boolean transaction;
     protected DaoType type;
 
-    protected Dao(DaoType type, boolean transaction) {
+    protected Dao(DaoType type) {
         this.type = type;
-        this.transaction = transaction;
     }
 
     public int getCount() throws DaoException {
@@ -52,10 +50,19 @@ public int add(T obj) throws DaoException {
 
         String sql = String.format("INSERT INTO %s VALUES (%s);", type.toString(), obj.asCsv());
 
-        return DaoManager.modifyData(sql, transaction);
+        return DaoManager.modifyData(sql, false);
     }
 
-    public int addAll(List<T> list) throws DaoException {
+    public int update(T obj) throws DaoException {
+        if(obj == null)
+            return 0;
+
+        String sql = String.format("INSERT INTO %s VALUES (%s);", type.toString(), obj.asCsv());
+
+        return DaoManager.modifyData(sql, false);
+    }
+
+    public int addAll(List<T> list, boolean transaction) throws DaoException {
         if(list == null || list.size() == 0)
             return 0;
 
diff --git a/server/src/main/java/com/balinski/api_project/database/dao/DaoManager.java b/server/src/main/java/com/balinski/api_project/database/dao/DaoManager.java
@@ -10,35 +10,19 @@ public class DaoManager {
     private DaoManager(){}
 
     public static ActorDao getActorDao() {
-        return new ActorDao(false);
+        return new ActorDao();
     }
 
     public static FilmDao getFilmDao() {
-        return new FilmDao(false);
+        return new FilmDao();
     }
 
     public static LanguageDao getLanguageDao() {
-        return new LanguageDao(false);
+        return new LanguageDao();
     }
 
     public static UserDao getUserDao() {
-        return new UserDao(false);
-    }
-
-    public static ActorDao getActorDao(boolean transaction) {
-        return new ActorDao( transaction);
-    }
-
-    public static FilmDao getFilmDao(boolean transaction) {
-        return new FilmDao(transaction);
-    }
-
-    public static LanguageDao getLanguageDao (boolean transaction) {
-        return new LanguageDao( transaction);
-    }
-
-    public static UserDao getUserDao (boolean transaction) {
-        return new UserDao(transaction);
+        return new UserDao();
     }
 
     static List<Map<String, Object>> getData(String sql) throws DaoException {
diff --git a/server/src/main/java/com/balinski/api_project/database/dao/FilmDao.java b/server/src/main/java/com/balinski/api_project/database/dao/FilmDao.java
@@ -11,8 +11,8 @@
 public class FilmDao extends Dao<Film> {
     static final DateTimeFormatter toDate = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
-    public FilmDao(boolean transaction) {
-        super(DaoType.FILM, transaction);
+    public FilmDao() {
+        super(DaoType.FILM);
     }
 
     public List<Film> getByTitle(String title) throws DaoException {
diff --git a/server/src/main/java/com/balinski/api_project/database/dao/LanguageDao.java b/server/src/main/java/com/balinski/api_project/database/dao/LanguageDao.java
@@ -5,8 +5,8 @@
 import java.util.*;
 
 public class LanguageDao extends Dao<Language> {
-    public LanguageDao(boolean transaction) {
-        super(DaoType.LANGUAGE, transaction);
+    public LanguageDao() {
+        super(DaoType.LANGUAGE);
     }
 
     public List<Language> getByName(String name) throws DaoException {
diff --git a/server/src/main/java/com/balinski/api_project/database/dao/UserDao.java b/server/src/main/java/com/balinski/api_project/database/dao/UserDao.java
@@ -2,12 +2,15 @@
 
 import com.balinski.api_project.database.model.User;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 
 public class UserDao extends Dao<User> {
-    public UserDao(boolean transaction) {
-        super(DaoType.USER, transaction);
+    static final DateTimeFormatter toDateTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    public UserDao() {
+        super(DaoType.USER);
     }
 
     public List<User> getByName(String name) throws DaoException {
@@ -17,4 +20,21 @@ public List<User> getByName(String name) throws DaoException {
 
         return toListOfObjects(result);
     }
+
+    public List<User> getByToken(String token) throws DaoException {
+        List<Map<String, Object>> result = DaoManager.getData(
+                String.format("SELECT * FROM USER U WHERE lower(U.token) = '%s';", token.toLowerCase())
+        );
+
+        return toListOfObjects(result);
+    }
+
+    public boolean incrementUses(int id) throws DaoException {
+        return DaoManager.modifyData(
+                String.format("UPDATE USER SET REQUESTS_SENT=" +
+                        "(SELECT U.REQUESTS_SENT FROM USERS U WHERE U.ID=%d)+1, " +
+                        "LAST_UPDATE='%s' " +
+                        "WHERE U.ID=%d;", id, LocalDateTime.now().format(toDateTime), id),
+                true) > 0;
+    }
 }
diff --git a/server/src/main/java/com/balinski/api_project/database/model/Actor.java b/server/src/main/java/com/balinski/api_project/database/model/Actor.java
@@ -52,7 +52,7 @@ public String asJson() {
 
     @Override
     public String asCsv() {
-        return String.format("'%s', '%s', TIMESTAMP '%s'",
-                firstName, lastName, lastUpdate.format(toDateTime));
+        return String.format("%d, '%s', '%s', TIMESTAMP '%s'",
+                id, firstName, lastName, lastUpdate.format(toDateTime));
     }
 }
diff --git a/server/src/main/java/com/balinski/api_project/database/model/DatabaseModel.java b/server/src/main/java/com/balinski/api_project/database/model/DatabaseModel.java
@@ -3,8 +3,8 @@
 import java.time.format.DateTimeFormatter;
 
 public abstract class DatabaseModel {
-    DateTimeFormatter toDate = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-    DateTimeFormatter toDateTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    static DateTimeFormatter toDate = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    static DateTimeFormatter toDateTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
     public abstract String asCsv();
     public abstract String asJson();
diff --git a/server/src/main/java/com/balinski/api_project/database/model/Film.java b/server/src/main/java/com/balinski/api_project/database/model/Film.java
@@ -108,8 +108,8 @@ public String asJson() {
 
     @Override
     public String asCsv() {
-        return String.format("'%s', '%s', TIMESTAMP '%s', %d, %d, %s, %d, TIMESTAMP '%s'",
-                title, description, releaseYear.format(toDate),
+        return String.format("%d, '%s', '%s', TIMESTAMP '%s', %d, %d, %s, %d, TIMESTAMP '%s'",
+                id, title, description, releaseYear.format(toDate),
                 languageId, rentalDuration, rentalRate.toPlainString(), length,
                 lastUpdate.format(toDateTime));
     }
diff --git a/server/src/main/java/com/balinski/api_project/database/model/Language.java b/server/src/main/java/com/balinski/api_project/database/model/Language.java
@@ -41,7 +41,7 @@ public String asJson() {
 
     @Override
     public String asCsv() {
-        return String.format("'%s', TIMESTAMP '%s'",
-                name, lastUpdate.format(toDateTime));
+        return String.format("%d, '%s', TIMESTAMP '%s'",
+                id, name, lastUpdate.format(toDateTime));
     }
 }
diff --git a/server/src/main/java/com/balinski/api_project/database/model/User.java b/server/src/main/java/com/balinski/api_project/database/model/User.java
@@ -63,12 +63,12 @@ public String asJson(){
         return String.format("{\"type\":\"%s\",\"id\":\"%d\",\"attributes\":" +
                         "{\"name\":\"%s\",\"token\":\"%s\",\"used\":\"%d\",\"limit\":\"%d\"," +
                         "\"dateRegistered\":\"%s\",\"lastUpdate\":\"%s\"}}",
-                "users", id, name, token, used, limit, dateRegistered.format(toDate), lastUpdate.format(toDateTime));
+                "users", id, name, token, used, limit, dateRegistered.format(toDateTime), lastUpdate.format(toDateTime));
     }
 
     @Override
     public String asCsv() {
-        return String.format("'%s', '%s', %d, %d, TIMESTAMP '%s', TIMESTAMP '%s'",
-                name, token, used, limit, dateRegistered.format(toDate), lastUpdate.format(toDateTime));
+        return String.format("%d, '%s', '%s', %d, %d, TIMESTAMP '%s', TIMESTAMP '%s'",
+                id, name, token, used, limit, dateRegistered.format(toDateTime), lastUpdate.format(toDateTime));
     }
 }
diff --git a/server/src/main/java/com/balinski/api_project/server/JettyServer.java b/server/src/main/java/com/balinski/api_project/server/JettyServer.java
@@ -1,20 +1,32 @@
 package com.balinski.api_project.server;
 
-import com.balinski.api_project.server.handler.WebAppContextWrapper;
+import com.balinski.api_project.servlet.*;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
 
 public class JettyServer {
+    private static ServletContextHandler context = new ServletContextHandler();
 
     public static void start(int port) {
         final Server server = new Server(port);
-
-        WebAppContextWrapper contextHandler = new WebAppContextWrapper();
-        server.setHandler(contextHandler.getWebAppContext());
+        context.setContextPath("/");
+        registerServlets();
+        server.setHandler(context);
 
         try {
             server.start();
         } catch (Exception e) {
             throw new RuntimeException("Could not start the server.", e);
         }
     }
+
+
+    private static void registerServlets() {
+        context.addServlet(ActorServlet.class, "/actors");
+        context.addServlet(FilmServlet.class, "/films/*");
+        context.addServlet(LanguageServlet.class, "/languages/*");
+        context.addServlet(UserServlet.class, "/users/*");
+        context.addServlet(AddUserServlet.class, "/adduser/*");
+    }
+
 }
diff --git a/server/src/main/java/com/balinski/api_project/server/handler/WebAppContextWrapper.java b/server/src/main/java/com/balinski/api_project/server/handler/WebAppContextWrapper.java
diff --git a/server/src/main/java/com/balinski/api_project/servlet/ActorServlet.java b/server/src/main/java/com/balinski/api_project/servlet/ActorServlet.java
@@ -3,7 +3,9 @@
 import com.balinski.api_project.database.dao.DaoManager;
 import com.balinski.api_project.database.dao.DaoException;
 import com.balinski.api_project.database.model.Actor;
+import com.balinski.api_project.database.model.User;
 import com.balinski.api_project.servlet.util.JsonResponseBuilder;
+import com.balinski.api_project.servlet.util.UserAuthenticator;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -22,17 +24,20 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
 
         var enumeration = req.getParameterNames();
 
-        var supportedParameters = Set.of("id", "page", "perPage", "firstName", "lastName", "order");
+        var supportedParameters = Set.of("id", "page", "perPage", "firstName", "lastName", "order", "user", "token");
         var param = Collections.list(enumeration)
                 .stream()
                 .distinct()
                 .filter(supportedParameters::contains)
                 .collect(Collectors.toMap(x -> x, req::getParameter));
 
-        List<Actor> actors;
-        var dao = DaoManager.getActorDao();
-
         try {
+            User user = UserAuthenticator.authenticateAndGet(param.get("user"), param.get("token"));
+            UserAuthenticator.incrementUses(user);
+
+            List<Actor> actors;
+            var dao = DaoManager.getActorDao();
+
             if(param.get("id") != null)
                 actors = dao.getById(Integer.parseInt(param.get("id")));
             else if(param.get("firstName") != null)
@@ -57,9 +62,7 @@ else if(param.get("perPage") != null && param.get("page") != null) {
             String response = JsonResponseBuilder.mergeFromList(actors);
             writer.print(response);
         } catch (DaoException e) {
-            System.err.println("An error occurred in ActorServlet: " + e.getMessage());
             writer.print(JsonResponseBuilder.getErrorJson(e));
-            e.printStackTrace();
         }
     }
 }
diff --git a/server/src/main/java/com/balinski/api_project/servlet/AddUserServlet.java b/server/src/main/java/com/balinski/api_project/servlet/AddUserServlet.java
diff --git a/server/src/main/java/com/balinski/api_project/servlet/UserServlet.java b/server/src/main/java/com/balinski/api_project/servlet/UserServlet.java
diff --git a/server/src/main/java/com/balinski/api_project/servlet/util/JsonResponseBuilder.java b/server/src/main/java/com/balinski/api_project/servlet/util/JsonResponseBuilder.java
diff --git a/server/src/main/java/com/balinski/api_project/servlet/util/UserAuthenticator.java b/server/src/main/java/com/balinski/api_project/servlet/util/UserAuthenticator.java
diff --git a/webapp/pom.xml b/webapp/pom.xml
diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public static int queryUpdate(String sql, boolean transaction) throws DatabaseEx`
`69`	`69`	`connection.commit();`
`70`	`70`	`}`
`71`	`71`	`} catch (SQLException e) {`
	`72`	`+ e.printStackTrace();`
`72`	`73`	`throw new DatabaseException("An error occurred when trying to update the database.", e);`
`73`	`74`	`} finally {`
`74`	`75`	`closeConnection();`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`import java.util.*;`
`6`	`6`
`7`	`7`	`public class ActorDao extends Dao<Actor> {`
`8`		`- public ActorDao(boolean transaction) {`
`9`		`- super(DaoType.ACTOR, transaction);`
	`8`	`+ public ActorDao() {`
	`9`	`+ super(DaoType.ACTOR);`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`public List<Actor> getByFirstName(String firstName) throws DaoException {`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`	`public class FilmDao extends Dao<Film> {`
`12`	`12`	`static final DateTimeFormatter toDate = DateTimeFormatter.ofPattern("yyyy-MM-dd");`
`13`	`13`
`14`		`- public FilmDao(boolean transaction) {`
`15`		`- super(DaoType.FILM, transaction);`
	`14`	`+ public FilmDao() {`
	`15`	`+ super(DaoType.FILM);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public List<Film> getByTitle(String title) throws DaoException {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`import java.util.*;`
`6`	`6`
`7`	`7`	`public class LanguageDao extends Dao<Language> {`
`8`		`- public LanguageDao(boolean transaction) {`
`9`		`- super(DaoType.LANGUAGE, transaction);`
	`8`	`+ public LanguageDao() {`
	`9`	`+ super(DaoType.LANGUAGE);`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`public List<Language> getByName(String name) throws DaoException {`