Revize 05381d82

minor servlet improvements

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

@@ -24 +24 @@
 
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        doPost(request, response);
-    }
-
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-        if (ServletFileUpload.isMultipartContent(request)) {
-            String jsonGraph = new FileManager("","").loadFile(request);
-
-            if(Strings.isNullOrEmpty(jsonGraph)){
-                request.setAttribute("errorMessage", "<strong>Unsupported file</strong><br/>");
-            } else {
-                request.getSession().setAttribute("json_graph", jsonGraph);
-                response.sendRedirect(getServletContext().getInitParameter("HOME_URL") + "graph");
-                return;
-            }
-        }
-
         DB db = new DB(getServletContext());
         Diagram diagram = new Diagram(db);
 
@@ -60 +42 @@
         RequestDispatcher rd = getServletContext().getRequestDispatcher("/uploadFiles.jsp");
         rd.forward(request, response);
     }
+
+    @Override
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String jsonGraph = new FileManager("","").loadFile(request);
+
+        if (Strings.isNullOrEmpty(jsonGraph)) {
+            request.setAttribute("errorMessage", "<strong>Unsupported file</strong><br/>");
+            doGet(request, response);
+        } else {
+            request.getSession().setAttribute("json_graph", jsonGraph);
+            response.sendRedirect(getServletContext().getInitParameter("HOME_URL") + "graph");
+        }
+    }
 }

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

@@ -13 +13 @@
 import cz.zcu.kiv.offscreen.user.Diagram;
 import net.sf.json.JSONObject;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -30 +29 @@
      * graph is returned as JSON in response body.
      */
     @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/json");
         response.setCharacterEncoding("UTF-8");
 
         if (request.getSession().getAttribute("demo_id") == null) {
-
             String diagram_id = request.getParameter("diagramId");
 
             if (diagram_id == null) {
@@ -66 +63 @@
 
             return json.toString();
         }
-        return "";
+
+        return "";  // TODO: ugly fallback
     }
 
     /**
      * Return json of diagram which is taken from database. Permissions of user to this diagram is checked.
      */
     private String getDiagramById(HttpServletRequest request, int diagramId){
-
         DB db = new DB(getServletContext());
         Diagram diagram = new Diagram(db, diagramId);
 
-        if(!diagram.isPublic()){
-            // Diagram is not public
+        if (diagram.isPublic()) {
+            return diagram.getJsonDiagram();
+        }
+
+        // diagram is not public
+        if (isLoggedIn(request)) {
+            int loggedUserId = getUserId(request);
 
-            if (!isLoggedIn(request) || diagram.getUserId() != getUserId(request)) {
-                return ""; // User is not logged in or is not owner of diagram
+            if (diagram.getUserId() == loggedUserId) {
+                return diagram.getJsonDiagram();
             }
         }
 
-        return diagram.getJsonDiagram();
+        // User is not logged in or is not owner of diagram
+        return "";  // TODO: ugly fallback
     }
 
     /**

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

@@ -59 +59 @@
     		errors.put("user_password", "Passwords must be at least 5 characters long.");
     	}
 
-    	JSONObject json = new JSONObject();
-    	
     	if (errors.isEmpty()) {
     		Map<String, String> userMap = new HashMap<>();
     		userMap.put("name", name);
@@ -74 +72 @@
 			response.setStatus(HttpServletResponse.SC_CREATED);
 
     	} else {
-    		json.put("error", errors);
-			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-    	}
+			JSONObject json = new JSONObject();
+			json.put("error", new JSONObject(errors));
 
-		response.setContentType("application/json");
-		response.getWriter().write(json.toString());
-		response.getWriter().flush();
+			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+			response.setContentType("application/json");
+			response.getWriter().write(json.toString());
+			response.getWriter().flush();
+		}
     }
     
     /**

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

@@ -12 +12 @@
 
     @Override
     protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
         if (!isLoggedIn(request)) {
-            response.sendError(response.SC_UNAUTHORIZED);
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
             return;
         }
 
-        if(request.getParameter("diagram_id") == null){
-            response.sendError(response.SC_BAD_REQUEST);
+        if (request.getParameter("diagram_id") == null) {
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             return;
         }
 
@@ -29 +28 @@
         DB db = new DB(getServletContext());
         Diagram diagram = new Diagram(db, diagramId);
 
-        if(diagram.getUserId() != loggedUserId){
-            response.sendError(response.SC_UNAUTHORIZED);
+        if (diagram.getUserId() != loggedUserId) {
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
             return;
         }
 
         diagram.delete();
-        response.sendRedirect("/");
+
+        response.setStatus(HttpServletResponse.SC_NO_CONTENT);
     }
 }

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

@@ -16 +16 @@
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
-        // user is not logged in
         if (!isLoggedIn(request)) {
-            response.sendError(response.SC_UNAUTHORIZED);
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
             return;
         }
 
@@ -32 +30 @@
 
         // input parameters are invalid
         if (Strings.isNullOrEmpty(name) || Strings.isNullOrEmpty(graphJson)) {
-            response.sendError(response.SC_BAD_REQUEST);
+            response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             return;
         }
 
@@ -50 +48 @@
 
             // user is not owner of the diagram
             if (loggedUserId != diagram.getUserId()) {
-                response.sendError(response.SC_UNAUTHORIZED);
+                response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
                 return;
             }
         }
 
-
         Map<String, String> diagramParams = new HashMap<>();
         diagramParams.put("name", name);
         diagramParams.put("public", isPublic);