Commit dc8dcb46 authored by Josh Ji's avatar Josh Ji

login bug fix

send username form "getAssertion" function in webauthn.js
set a new user in BeginGetAssertion servlet in BeginGetAssertion.java
parent f1fc93eb
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<module name="gaedemo" /> <module name="gaedemo" />
<module name="webauthn-demo-josh" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
</component> </component>
......
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
<project version="4"> <project version="4">
<component name="Encoding"> <component name="Encoding">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component> </component>
</project> </project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="FacetManager">
<facet type="app-engine-standard" name="Google App Engine Standard">
<configuration />
</facet>
</component>
</module>
\ No newline at end of file
...@@ -49,8 +49,10 @@ public class BeginGetAssertion extends HttpServlet { ...@@ -49,8 +49,10 @@ public class BeginGetAssertion extends HttpServlet {
@Override @Override
protected void doPost(HttpServletRequest request, HttpServletResponse response) protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException { throws ServletException, IOException {
String username = request.getParameter("username");
/* Tyler start -----------------*/ /* Tyler start -----------------*/
UserProxyService userProxyService = UserProxyService.getInstance(); UserProxyService userProxyService = UserProxyService.getInstance();
userProxyService.setUser(new User(username,"gmail.com"));
User user = userProxyService.getCurrentUser(); User user = userProxyService.getCurrentUser();
String currentUser = user.getEmail(); String currentUser = user.getEmail();
/* Tyler end -----------------*/ /* Tyler end -----------------*/
......
...@@ -443,7 +443,8 @@ function getAssertion() { ...@@ -443,7 +443,8 @@ function getAssertion() {
show('#active'); show('#active');
let _parameters; let _parameters;
_fetch('/BeginGetAssertion').then(parameters => { let username = document.querySelector('.mdl-textfield__input').value;
_fetch('/BeginGetAssertion', {username:username}).then(parameters => {
const requestOptions = {}; const requestOptions = {};
_parameters = parameters; _parameters = parameters;
......
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