add User in UserProxyService

src/main/java/com/google/webauthn/gaedemo/service/UserProxyService.java

 package com.google.webauthn.gaedemo.service;
 
+import com.google.appengine.api.users.User;
+
 public class UserProxyService {
     private static UserProxyService instance;
-    private String username;
+    private User user;
 
     public UserProxyService() {}
 
@@ -17,11 +19,11 @@ public class UserProxyService {
         return instance;
     }
 
-    public String getUsername() {
-        return username;
+    public User getCurrentUser() {
+        return user;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setUser(User user) {
+        this.user = user;
     }
 }

src/main/java/com/google/webauthn/gaedemo/servlets/BeginMakeCredential.java

@@ -65,7 +65,6 @@ public class BeginMakeCredential extends HttpServlet {
   protected void doPost(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
     // Tyler -----------------
-    String username = request.getParameter("username");
 //    User user = new User(username, "localhost");
 //    // String rpId = (request.isSecure() ? "https://" : "http://") + request.getHeader("Host");
 //    String rpId = Iterables.get(Splitter.on(':').split(request.getHeader("Host")), 0);
@@ -99,9 +98,11 @@ public class BeginMakeCredential extends HttpServlet {
 //
 //    response.setContentType("application/json");
 //    response.getWriter().println(optionsJson.toString());
-    UserProxyService.getInstance().setUsername(username);
-    String username2 = UserProxyService.getInstance().getUsername();
-    log.info("make" + username2);
+    String username = request.getParameter("username");
+    UserProxyService.getInstance().setUser(new User(username, "gmail.com",
+            userService.getCurrentUser().getUserId()));
+    User cloneUser = UserProxyService.getInstance().getCurrentUser();
+    log.info("make" + cloneUser.toString());
     // Tyler -----------------
 
     // Original Code

src/main/java/com/google/webauthn/gaedemo/servlets/Login.java

@@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletResponse;
  * Servlet implementation class Home
  */
 public class Login extends HttpServlet {
-  private final Logger log= Logger.getLogger(Login.class.getSimpleName());
   private static final long serialVersionUID = 1L;
   private final UserService userService = UserServiceFactory.getUserService();
 
@@ -39,8 +38,6 @@ public class Login extends HttpServlet {
       throws ServletException, IOException {
     String nickname = userService.getCurrentUser().getNickname();
     String logoutUrl = userService.createLogoutURL(request.getRequestURI());
-    System.out.println("Login");
-    log.info("Login");
     request.setAttribute("nickname", nickname);
     request.setAttribute("logoutUrl", logoutUrl);
     RequestDispatcher dispatcher = getServletContext().getRequestDispatcher("/login.jsp");

src/main/java/com/google/webauthn/gaedemo/servlets/RegisteredKeys.java

@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.bind.DatatypeConverter;
 
+import com.google.appengine.api.users.User;
 import com.google.appengine.api.users.UserService;
 import com.google.appengine.api.users.UserServiceFactory;
 import com.google.common.io.BaseEncoding;
@@ -54,8 +55,8 @@ public class RegisteredKeys extends HttpServlet {
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
-    String username = UserProxyService.getInstance().getUsername();
-    log.info("Get " + username);
+    User cloneUser = UserProxyService.getInstance().getCurrentUser();
+    log.info("Get " + cloneUser.toString());
     // Tyler--------------------
     String currentUser = userService.getCurrentUser().getEmail();
     List<Credential> savedCreds = Credential.load(currentUser);