Registry API flow add UserProxyService to get username

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

@@ -64,49 +64,17 @@ public class BeginMakeCredential extends HttpServlet {
   @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
-    // Tyler -----------------
-//    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);
-//    String rpName = getServletContext().getInitParameter("name");
-//    rpName = (rpName == null ? "" : rpName);
-//
-//    PublicKeyCredentialCreationOptions options =
-//            new PublicKeyCredentialCreationOptions(user.getNickname(), user.getEmail(), rpId, rpName);
-//
-//    String hasAdvanced = request.getParameter("advanced");
-//    if (hasAdvanced.equals("true")) {
-//      parseAdvancedOptions(request.getParameter("advancedOptions"), options);
-//    }
-//
-//    SessionData session = new SessionData(options.challenge, rpId);
-//
-//    session.save(userService.getCurrentUser().getEmail());
-//    JsonObject sessionJson = session.getJsonObject();
-//    JsonObject optionsJson = options.getJsonObject();
-//    optionsJson.add("session", sessionJson);
-//
-//    AuthenticationExtensionsClientInputs extensions = new AuthenticationExtensionsClientInputs();
-//    try {
-//      KeyPair cableKeyPair = extensions.addCableRegistrationData();
-//      // Store the KeyPair in storage
-//      CableKeyPair storedKeyPair = new CableKeyPair(cableKeyPair);
-//      storedKeyPair.save(session.getId());
-//    } catch (Exception e) {}
-//
-//    optionsJson.add("extensions", extensions.getRegistrationExtensions());
-//
-//    response.setContentType("application/json");
-//    response.getWriter().println(optionsJson.toString());
+    /* Tyler start -----------------*/
+    UserProxyService userProxyService = UserProxyService.getInstance();
     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 -----------------
+    userProxyService.setUser(new User(username, "gmail.com", userService.getCurrentUser().getUserId()));
+    User user = userProxyService.getCurrentUser();
+    log.info("make" + user.toString());
+    /* Tyler end -----------------*/
 
-    // Original Code
+    /* Original code
     User user = userService.getCurrentUser();
+     */
     // String rpId = (request.isSecure() ? "https://" : "http://") + request.getHeader("Host");
     String rpId = Iterables.get(Splitter.on(':').split(request.getHeader("Host")), 0);
     String rpName = getServletContext().getInitParameter("name");
@@ -122,7 +90,12 @@ public class BeginMakeCredential extends HttpServlet {
 
     SessionData session = new SessionData(options.challenge, rpId);
 
+    /* Tyler start -----------------*/
+    session.save(userProxyService.getCurrentUser().getEmail());
+    /* Tyler end -----------------*/
+    /* Original code
     session.save(userService.getCurrentUser().getEmail());
+     */
     JsonObject sessionJson = session.getJsonObject();
     JsonObject optionsJson = options.getJsonObject();
     optionsJson.add("session", sessionJson);

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

@@ -43,6 +43,7 @@ import com.google.webauthn.gaedemo.server.AndroidSafetyNetServer;
 import com.google.webauthn.gaedemo.server.PackedServer;
 import com.google.webauthn.gaedemo.server.PublicKeyCredentialResponse;
 import com.google.webauthn.gaedemo.server.U2fServer;
+import com.google.webauthn.gaedemo.service.UserProxyService;
 import com.google.webauthn.gaedemo.storage.CableKeyPair;
 import com.google.webauthn.gaedemo.storage.Credential;
 
@@ -64,7 +65,13 @@ public class FinishMakeCredential extends HttpServlet {
   @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
+    /* Tyler start -----------------*/
+    UserProxyService userProxyService = UserProxyService.getInstance();
+    String currentUser = userProxyService.getCurrentUser().getEmail();
+    /* Tyler end -----------------*/
+    /* Original code
     String currentUser = userService.getCurrentUser().getEmail();
+     */
     String data = request.getParameter("data");
     if (data == null) {
       data = "";

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

@@ -55,10 +55,15 @@ public class RegisteredKeys extends HttpServlet {
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
-    User cloneUser = UserProxyService.getInstance().getCurrentUser();
-    log.info("Get " + cloneUser.toString());
-    // Tyler--------------------
+    /* Tyler start -----------------*/
+    UserProxyService userProxyService = UserProxyService.getInstance();
+    User user = userProxyService.getCurrentUser();
+    String currentUser =   (user != null) ? user.getEmail() : userService.getCurrentUser().getEmail();
+    log.info("Get " + currentUser);
+    /* Tyler end -----------------*/
+    /* Original code
     String currentUser = userService.getCurrentUser().getEmail();
+     */
     List<Credential> savedCreds = Credential.load(currentUser);
 
     JsonArray result = new JsonArray();