Skip to content

Commit 3b670ba

Browse files
committed
Fix backend URL with context path
1 parent 20f4368 commit 3b670ba

2 files changed

Lines changed: 19 additions & 12 deletions

File tree

backend/src/main/java/servlets/LoginServlet.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
5353
*/
5454
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
5555
// TODO Auto-generated method stub
56-
56+
response.setContentType("application/json");
5757
System.out.println("Login Servlet hit for Request Type: "+request.getMethod());
5858
try {
5959
ObjectMapper mapper = new ObjectMapper();
@@ -64,6 +64,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
6464

6565
if (!fetcheduserdata.isPresent()) {
6666
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
67+
response.setContentType("application/json");
6768
response.getWriter().write("{\"message\":\"Invalid email\"}");
6869
return;
6970
}
@@ -73,6 +74,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
7374

7475
if(!BCrypt.checkpw(logindata.getPassword(), fetcheduser.getPassword() )) {
7576
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
77+
response.setContentType("application/json");
7678
response.getWriter().write("{\"message\":\"Invalid password\"}");
7779
return;
7880
}
@@ -115,8 +117,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
115117
}
116118
catch (Exception e) {
117119
// TODO: handle exception
118-
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
119-
response.getWriter().write("{\"message\":\"Server error\"}");
120+
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); response.setContentType("application/json"); response.getWriter().write("{\"message\":\"Server error\"}");
120121
e.printStackTrace();
121122
}
122123

backend/src/main/java/servlets/SessionValidateServlet.java

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,21 @@ public SessionValidateServlet() {
3434
*/
3535
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
3636
// TODO Auto-generated method stub
37-
ObjectMapper mapper = new ObjectMapper();
38-
UserDTO userInfo = new UserDTO();
39-
userInfo.setId(Long.parseLong((String) request.getAttribute("id")));
40-
userInfo.setFullName((String) request.getAttribute("fullName"));
41-
userInfo.setEmail((String) request.getAttribute("email")); // add if available
42-
userInfo.setRole((String) request.getAttribute("role"));
43-
44-
response.setContentType("application/json");
45-
mapper.writeValue(response.getWriter(), userInfo);
37+
response.setContentType("application/json");
38+
try {
39+
ObjectMapper mapper = new ObjectMapper();
40+
UserDTO userInfo = new UserDTO();
41+
userInfo.setId(Long.parseLong((String) request.getAttribute("id")));
42+
userInfo.setFullName((String) request.getAttribute("fullName"));
43+
userInfo.setEmail((String) request.getAttribute("email")); // add if available
44+
userInfo.setRole((String) request.getAttribute("role"));
45+
46+
mapper.writeValue(response.getWriter(), userInfo);
47+
} catch (Exception e) {
48+
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
49+
response.getWriter().write("{\"message\":\"Validation error\"}");
50+
e.printStackTrace();
51+
}
4652
}
4753

4854
/**

0 commit comments

Comments
 (0)