From 2838287e31926736946d3b7ae02bca9fe94bd0b9 Mon Sep 17 00:00:00 2001
From: Tyler Lee <jabcckdef@gmail.com>
Date: Fri, 19 Nov 2021 17:42:03 +0800
Subject: [PATCH] add log for userProxyService

---
 .../gaedemo/service/UserProxyService.java     | 27 +++++++++++++++++++
 .../gaedemo/servlets/BeginMakeCredential.java |  9 +++++--
 .../gaedemo/servlets/RegisteredKeys.java      |  6 +++++
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/google/webauthn/gaedemo/service/UserProxyService.java

diff --git a/src/main/java/com/google/webauthn/gaedemo/service/UserProxyService.java b/src/main/java/com/google/webauthn/gaedemo/service/UserProxyService.java
new file mode 100644
index 0000000..76bac0b
--- /dev/null
+++ b/src/main/java/com/google/webauthn/gaedemo/service/UserProxyService.java
@@ -0,0 +1,27 @@
+package com.google.webauthn.gaedemo.service;
+
+public class UserProxyService {
+    private static UserProxyService instance;
+    private String username;
+
+    public UserProxyService() {}
+
+    public static UserProxyService getInstance(){
+        if(instance == null){
+            synchronized(UserProxyService.class){
+                if(instance == null){
+                    instance = new UserProxyService();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/src/main/java/com/google/webauthn/gaedemo/servlets/BeginMakeCredential.java b/src/main/java/com/google/webauthn/gaedemo/servlets/BeginMakeCredential.java
index 5c23f97..0f0ed3c 100644
--- a/src/main/java/com/google/webauthn/gaedemo/servlets/BeginMakeCredential.java
+++ b/src/main/java/com/google/webauthn/gaedemo/servlets/BeginMakeCredential.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -42,12 +43,13 @@ import com.google.webauthn.gaedemo.objects.PublicKeyCredentialCreationOptions;
 import com.google.webauthn.gaedemo.objects.PublicKeyCredentialDescriptor;
 import com.google.webauthn.gaedemo.objects.PublicKeyCredentialType;
 import com.google.webauthn.gaedemo.objects.UserVerificationRequirement;
+import com.google.webauthn.gaedemo.service.UserProxyService;
 import com.google.webauthn.gaedemo.storage.CableKeyPair;
 import com.google.webauthn.gaedemo.storage.Credential;
 import com.google.webauthn.gaedemo.storage.SessionData;
 
 public class BeginMakeCredential extends HttpServlet {
-
+  private static final Logger log = Logger.getLogger(BeginMakeCredential.class.getName());
   private static final long serialVersionUID = 1L;
   private final UserService userService = UserServiceFactory.getUserService();
 
@@ -63,7 +65,7 @@ public class BeginMakeCredential extends HttpServlet {
   protected void doPost(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
     // Tyler -----------------
-//    String username = request.getParameter("username");
+    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);
@@ -97,6 +99,9 @@ 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);
     // Tyler -----------------
 
     // Original Code
diff --git a/src/main/java/com/google/webauthn/gaedemo/servlets/RegisteredKeys.java b/src/main/java/com/google/webauthn/gaedemo/servlets/RegisteredKeys.java
index f4e1a44..c612662 100644
--- a/src/main/java/com/google/webauthn/gaedemo/servlets/RegisteredKeys.java
+++ b/src/main/java/com/google/webauthn/gaedemo/servlets/RegisteredKeys.java
@@ -16,6 +16,7 @@ package com.google.webauthn.gaedemo.servlets;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.logging.Logger;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -31,12 +32,14 @@ import com.google.gson.JsonObject;
 import com.google.webauthn.gaedemo.objects.AttestationObject;
 import com.google.webauthn.gaedemo.objects.AuthenticatorAttestationResponse;
 import com.google.webauthn.gaedemo.objects.CredentialPublicKey;
+import com.google.webauthn.gaedemo.service.UserProxyService;
 import com.google.webauthn.gaedemo.storage.Credential;
 
 /**
  * Servlet implementation class RegisteredKeys
  */
 public class RegisteredKeys extends HttpServlet {
+  private static final Logger log = Logger.getLogger(RegisteredKeys.class.getName());
   private static final long serialVersionUID = 1L;
   private final UserService userService = UserServiceFactory.getUserService();
 
@@ -51,6 +54,9 @@ 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);
+    // Tyler--------------------
     String currentUser = userService.getCurrentUser().getEmail();
     List<Credential> savedCreds = Credential.load(currentUser);
 
-- 
2.26.0