Revize ef8cdd70

Login and Register servlets return details on why the request failed

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

@@ -3 +3 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.google.common.base.Strings;
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
 import cz.zcu.kiv.offscreen.user.DB;
 import cz.zcu.kiv.offscreen.user.User;
 import cz.zcu.kiv.offscreen.vo.UserVO;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 public class Login extends BaseServlet {
 
     @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) {
-        DB db = new DB(getServletContext());
-        User user = new User(db);
-
+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
         String username = request.getParameter("username");
         String password = request.getParameter("password");
 
-        if (user.login(username, password)) {
-            UserVO userVO = new UserVO();
-            userVO.setId(user.getId());
-            userVO.setUsername(user.getNick());
+        Map<String, String> errors = new HashMap<>();
+
+        if (Strings.isNullOrEmpty(username)) {
+            errors.put("username", "Please enter username.");
+        }
+
+        if (Strings.isNullOrEmpty(password)) {
+            errors.put("password", "Please enter password.");
+        }
+
+        if (errors.isEmpty()) {
+            DB db = new DB(getServletContext());
+            User user = new User(db);
+
+            if (user.login(username, password)) {
+                UserVO userVO = new UserVO();
+                userVO.setId(user.getId());
+                userVO.setUsername(user.getNick());
+
+                request.getSession().setAttribute("isLoggedIn", true);
+                request.getSession().setAttribute("userId", userVO.getId());
+                request.getSession().setAttribute("user", userVO);
+
+                response.setStatus(HttpServletResponse.SC_ACCEPTED);
 
-            request.getSession().setAttribute("isLoggedIn", true);
-            request.getSession().setAttribute("userId", userVO.getId());
-            request.getSession().setAttribute("user", userVO);
+            } else {
+                request.getSession().setAttribute("isLoggedIn", false);
+                request.getSession().setAttribute("userId", null);
+                request.getSession().setAttribute("user", null);
 
-            response.setStatus(HttpServletResponse.SC_ACCEPTED);
+                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+            }
 
         } else {
-            request.getSession().setAttribute("isLoggedIn", false);
-            request.getSession().setAttribute("userId", null);
-            request.getSession().setAttribute("user", null);
+            JSONObject json = new JSONObject();
+            json.put("error", new JSONObject(errors));
 
-            response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+            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/Register.java

@@ -8 +8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.google.common.base.Strings;
 import org.json.JSONObject;
 
 import cz.zcu.kiv.offscreen.servlets.BaseServlet;
@@ -33 +34 @@
 
 		Map<String, String> errors = new HashMap<>();
 
-		if (name == null || name.length() == 0) {
-			errors.put("user_name", "Please enter name.");
+		if (Strings.isNullOrEmpty(name)) {
+			errors.put("name", "Please enter name.");
 		}
 
-		if (email == null || email.length() == 0) {
-			errors.put("user_email", "Please enter e-mail address.");
+		if (Strings.isNullOrEmpty(email)) {
+			errors.put("email", "Please enter e-mail address.");
 		} else if (!isEmailAddressValid(email)) {
-			errors.put("user_email", "Please enter valid e-mail address.");
+			errors.put("email", "Please enter valid e-mail address.");
 		} else if (user.existsEmail(email)) {
-			errors.put("user_email", "E-mail already exists.");
+			errors.put("email", "E-mail already exists.");
 		}
 
-		if (username == null || username.length() == 0) {
-			errors.put("user_nick", "Please enter username.");
+		if (Strings.isNullOrEmpty(username)) {
+			errors.put("username", "Please enter username.");
 		} else if (user.existsNick(username)) {
-			errors.put("user_nick", "Nickname already exists.");
+			errors.put("username", "Nickname already exists.");
 		}
     	
-    	if (password == null || password.length() == 0 || passwordCheck == null || passwordCheck.length() == 0) {
-    		errors.put("user_password", "Please enter password.");
-    	} else if (!password.equals(passwordCheck)) {
-    		errors.put("user_password", "Passwords must be equal.");
+    	if (Strings.isNullOrEmpty(password) || Strings.isNullOrEmpty(passwordCheck)) {
+    		errors.put("password", "Please enter password.");
     	} else if (password.length() < 5) {
-    		errors.put("user_password", "Passwords must be at least 5 characters long.");
+    		errors.put("password", "Passwords must be at least 5 characters long.");
+		} else if (!password.equals(passwordCheck)) {
+			errors.put("passwordCheck", "Passwords must be equal.");
     	}
 
     	if (errors.isEmpty()) {