Skip to content
Snippets Groups Projects
Commit e8379013 authored by Kevin Erdiza Yogatama's avatar Kevin Erdiza Yogatama
Browse files

Modify gitignore and fixing null parameter from request

parent 10035c18
1 merge request!43KIA -13515016 - Kevin Erdiza Yogatama
ChatService/node_modules/* ChatService/node_modules/*
ChatService/package-lock.json ChatService/package-lock.json
.vscode
.project
.classpath
org.eclipse.buildship.core.prefs
...@@ -18,7 +18,7 @@ public class LoginServlet extends IdentityServlet { ...@@ -18,7 +18,7 @@ public class LoginServlet extends IdentityServlet {
@Override @Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
req.getRequestDispatcher("/login.jsp").forward(req, resp); req.getRequestDispatcher("/webapp/login.jsp").forward(req, resp);
} }
@Override @Override
...@@ -27,8 +27,14 @@ public class LoginServlet extends IdentityServlet { ...@@ -27,8 +27,14 @@ public class LoginServlet extends IdentityServlet {
String password = req.getParameter("password"); String password = req.getParameter("password");
//===================================================// //===================================================//
String userAgent = req.getParameter("User-Agent").replace(';',':'); String userAgent = req.getParameter("User-Agent");
String ipAddress = req.getParameter("Ip-Address").replace(';',':'); if (userAgent != null) {
userAgent.replace(';', ':');
}
String ipAddress = req.getParameter("Ip-Address");
if (ipAddress != null) {
ipAddress.replace(';', ':');
}
System.out.println("Log - identity-user " + userAgent); System.out.println("Log - identity-user " + userAgent);
System.out.println("Log - identity-ip " + ipAddress); System.out.println("Log - identity-ip " + ipAddress);
...@@ -39,7 +45,7 @@ public class LoginServlet extends IdentityServlet { ...@@ -39,7 +45,7 @@ public class LoginServlet extends IdentityServlet {
String token = ""; String token = "";
String refreshToken = ""; String refreshToken = "";
Date tokenExpired = null; Date tokenExpired = null;
Config config = (Config) servletContext.getAttribute("identityConfig"); Config config = (Config) servletContext.getAttribute("identityConfig");
Integer tokenAge = config != null ? config.getTokenAge() : 3600000; Integer tokenAge = config != null ? config.getTokenAge() : 3600000;
if (tokenAge == null) if (tokenAge == null)
...@@ -53,8 +59,8 @@ public class LoginServlet extends IdentityServlet { ...@@ -53,8 +59,8 @@ public class LoginServlet extends IdentityServlet {
// refreshToken = StringUtil.randomToken(32); // refreshToken = StringUtil.randomToken(32);
//=============================================================// //=============================================================//
token = StringUtil.randomToken(10)+"#"+userAgent+"#"+ipAddress; token = StringUtil.randomToken(10) + "#" + userAgent + "#" + ipAddress;
refreshToken = StringUtil.randomToken(10)+"#"+userAgent+"#"+ipAddress; refreshToken = StringUtil.randomToken(10) + "#" + userAgent + "#" + ipAddress;
//=============================================================// //=============================================================//
tokenExpired = new Date(new Date().getTime() + tokenAge); tokenExpired = new Date(new Date().getTime() + tokenAge);
...@@ -72,7 +78,7 @@ public class LoginServlet extends IdentityServlet { ...@@ -72,7 +78,7 @@ public class LoginServlet extends IdentityServlet {
errorMessage = "Invalid username or password"; errorMessage = "Invalid username or password";
} }
Map<String,Object> response = new HashMap<>(); Map<String, Object> response = new HashMap<>();
if (success) { if (success) {
response.put("success", new Boolean(true)); response.put("success", new Boolean(true));
response.put("status", "success"); response.put("status", "success");
......
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
"url": "", "url": "",
"username": "", "username": "",
"password": "" "password": ""
} },
"defaultProfPicUrl": "" "defaultProfPicUrl": ""
} }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment