Commit 9131c78d authored by 0Tyler's avatar 0Tyler

get username dynamic

parent 30f1a61f
......@@ -52,7 +52,7 @@ public class BeginGetAssertion extends HttpServlet {
/* Tyler start -----------------*/
UserProxyService userProxyService = UserProxyService.getInstance();
User user = userProxyService.getCurrentUser();
String currentUser = (user != null) ? user.getEmail() : userService.getCurrentUser().getEmail();
String currentUser = user.getEmail();
/* Tyler end -----------------*/
/* Original code
String currentUser = userService.getCurrentUser().getEmail();
......
......@@ -63,7 +63,7 @@ public class FinishGetAssertion extends HttpServlet {
/* Tyler start -----------------*/
UserProxyService userProxyService = UserProxyService.getInstance();
User user = userProxyService.getCurrentUser();
String currentUser = (user != null) ? user.getEmail() : userService.getCurrentUser().getEmail();
String currentUser = user.getEmail();
/* Tyler end -----------------*/
/* Original code
String currentUser = userService.getCurrentUser().getEmail();
......
......@@ -58,7 +58,7 @@ public class RegisteredKeys extends HttpServlet {
/* Tyler start -----------------*/
UserProxyService userProxyService = UserProxyService.getInstance();
User user = userProxyService.getCurrentUser();
String currentUser = (user != null) ? user.getEmail() : userService.getCurrentUser().getEmail();
String currentUser = (user != null) ? user.getEmail() : userService.getCurrentUser().getEmail();
log.info("Get " + currentUser);
/* Tyler end -----------------*/
/* Original code
......
......@@ -47,7 +47,7 @@ public class RemoveCredential extends HttpServlet {
/* Tyler start -----------------*/
UserProxyService userProxyService = UserProxyService.getInstance();
User user = userProxyService.getCurrentUser();
String currentUser = (user != null) ? user.getEmail() : userService.getCurrentUser().getEmail();
String currentUser = user.getEmail();
/* Tyler end -----------------*/
/* Original code
String currentUser = userService.getCurrentUser().getEmail();
......
Markdown is supported
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