diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 94feb81d59bfabbf35ee31e32e85eee6b8b6359b..8f24854fe80c6fa9134e0191c9dd40d5cd12b674 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> - <wb-module deploy-name="dummy-service-1.0.0"> + <wb-module deploy-name="authentication-service-1.0.0"> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <property name="java-output-path" value="/api-gateway/target/classes"/> - <property name="context-root" value="dummy-service"/> + <property name="context-root" value="authentication-service"/> </wb-module> </project-modules> diff --git a/src/main/java/de/rtuni/ms/as/JwtUsernameAndPasswordAuthenticationFilter.java b/src/main/java/de/rtuni/ms/as/JwtUsernameAndPasswordAuthenticationFilter.java index 4e9627fae371b730f96fa4e81e48fb2d779b117c..033581f4b9b08659d4a2ceffb09d259dfc0bff33 100644 --- a/src/main/java/de/rtuni/ms/as/JwtUsernameAndPasswordAuthenticationFilter.java +++ b/src/main/java/de/rtuni/ms/as/JwtUsernameAndPasswordAuthenticationFilter.java @@ -73,12 +73,13 @@ public class JwtUsernameAndPasswordAuthenticationFilter HttpServletResponse response) throws AuthenticationException { try { // 1. Get credentials from request - UserCredentials creds = + UserCredentials credentials = new ObjectMapper().readValue(request.getInputStream(), UserCredentials.class); + // 2. Create auth object (contains credentials) which will be used by auth manager - UsernamePasswordAuthenticationToken authToken = - new UsernamePasswordAuthenticationToken( - creds.getUsername(), creds.getPassword(), Collections.emptyList()); + UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken( + credentials.getUsername(), credentials.getPassword(), Collections.emptyList()); + // 3. Authentication manager authenticate the user, and use // UserDetailsServiceImpl::loadUserByUsername() method to load the user.