From e48898cc8f7d9e9a82092a99f6c1d68b697cba41 Mon Sep 17 00:00:00 2001
From: Julian Horner <julianhorner@web.de>
Date: Wed, 18 Dec 2019 17:41:02 +0100
Subject: [PATCH] Minor improvements
---
.settings/org.eclipse.wst.common.component | 4 ++--
.../as/JwtUsernameAndPasswordAuthenticationFilter.java | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 94feb81..8f24854 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 4e9627f..033581f 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.
--
GitLab