Revize 4e308441

modified servlet to use helper methods from BaseServlet

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/UploadFiles.java

@@ -46 +46 @@
         Diagram diagram = new Diagram(db);
 
         List<Map<String, String>> userDiagramList = new ArrayList<>();
-        if (request.getSession().getAttribute("logged_user") == "1") {
-            int loggedUserId = (int) request.getSession().getAttribute("logged_user_id");
+        if (isLoggedIn(request)) {
+            int loggedUserId = getUserId(request);
 
             userDiagramList = diagram.getDiagramListByUserId(loggedUserId);
         }

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/LoadGraphData.java

@@ -80 +80 @@
         if(!diagram.isPublic()){
             // Diagram is not public
 
-            Integer loggedUserId = (Integer) request.getSession().getAttribute("logged_user_id");
-            if(loggedUserId == null || diagram.getUserId() != loggedUserId) {
+            if (!isLoggedIn(request) || diagram.getUserId() != getUserId(request)) {
                 return ""; // User is not logged in or is not owner of diagram
             }
         }

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/RemoveDiagram.java

@@ -13 +13 @@
     @Override
     protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
-        if (request.getSession().getAttribute("logged_user_id") == null) {
+        if (!isLoggedIn(request)) {
             response.sendError(response.SC_UNAUTHORIZED);
             return;
         }
@@ -23 +23 @@
             return;
         }
 
-        Integer loggedUserId = Integer.parseInt(request.getSession().getAttribute("logged_user_id").toString());
-        Integer diagramId = Integer.parseInt(request.getParameter("diagram_id"));
+        int loggedUserId = getUserId(request);
 
+        Integer diagramId = Integer.parseInt(request.getParameter("diagram_id"));
         DB db = new DB(getServletContext());
         Diagram diagram = new Diagram(db, diagramId);
 

sources/src/main/java/cz/zcu/kiv/offscreen/servlets/api/SaveDiagram.java

@@ -18 +18 @@
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
         // user is not logged in
-        if (request.getSession().getAttribute("logged_user_id") == null) {
+        if (!isLoggedIn(request)) {
             response.sendError(response.SC_UNAUTHORIZED);
             return;
         }
 
+        int loggedUserId = getUserId(request);
+
         request.setCharacterEncoding("UTF-8");
-        Integer loggedUserId = Integer.parseInt(request.getSession().getAttribute("logged_user_id").toString());
         String name = request.getParameter("name");
         String graphJson = request.getParameter("graph_json");
         String isPublic = StringUtils.defaultIfBlank(request.getParameter("public"), "0");
@@ -59 +60 @@
         diagramParams.put("name", name);
         diagramParams.put("public", isPublic);
         diagramParams.put("graph_json", graphJson);
-        diagramParams.put("user_id", loggedUserId.toString());
+        diagramParams.put("user_id", Integer.toString(loggedUserId));
 
         diagram.update(diagramParams);