From 4fab4e8df0defce8338b48eda0349a15724d1d4e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 21 Aug 2018 12:34:56 +0300
Subject: User refactoring

---
 .../java/com/juick/service/security/HashParamAuthenticationFilter.java  | 2 +-
 .../main/java/com/juick/service/security/JuickUserDetailsService.java   | 2 +-
 .../service/security/deprecated/CookieSimpleHashRememberMeServices.java | 2 +-
 .../service/security/deprecated/RequestParamHashRememberMeServices.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'juick-common/src/main/java/com/juick/service/security')

diff --git a/juick-common/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java b/juick-common/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
index b56b98c8..9215d09a 100644
--- a/juick-common/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
+++ b/juick-common/src/main/java/com/juick/service/security/HashParamAuthenticationFilter.java
@@ -69,7 +69,7 @@ public class HashParamAuthenticationFilter extends OncePerRequestFilter {
             User user = userService.getUserByHash(hash);
 
             if (!user.isAnonymous()) {
-                User userWithPassword = userService.getFullyUserByName(user.getName());
+                User userWithPassword = userService.getUserByName(user.getName());
                 userWithPassword.setAuthHash(userService.getHashByUID(userWithPassword.getUid()));
                 Authentication authentication = new RememberMeAuthenticationToken(
                         ((AbstractRememberMeServices)rememberMeServices).getKey(), new JuickUser(userWithPassword), JuickUser.USER_AUTHORITY);
diff --git a/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java b/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java
index f6ae8909..adb0ab44 100644
--- a/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java
+++ b/juick-common/src/main/java/com/juick/service/security/JuickUserDetailsService.java
@@ -41,7 +41,7 @@ public class JuickUserDetailsService implements UserDetailsService {
         if (StringUtils.isBlank(username))
             throw new UsernameNotFoundException("Invalid user name " + username);
 
-        com.juick.User user = userService.getFullyUserByName(username);
+        com.juick.User user = userService.getUserByName(username);
 
         if (user != null) {
             user.setAuthHash(userService.getHashByUID(user.getUid()));
diff --git a/juick-common/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java b/juick-common/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
index bda5e902..e385d7dd 100644
--- a/juick-common/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
+++ b/juick-common/src/main/java/com/juick/service/security/deprecated/CookieSimpleHashRememberMeServices.java
@@ -115,7 +115,7 @@ public class CookieSimpleHashRememberMeServices extends AbstractRememberMeServic
 
         Assert.isTrue(userOptional.isPresent());
 
-        return new JuickUser(userService.getFullyUserByName(userOptional.get().getName()));
+        return new JuickUser(userService.getUserByName(userOptional.get().getName()));
     }
 
     @Override
diff --git a/juick-common/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java b/juick-common/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
index 71159e17..3631e5a4 100644
--- a/juick-common/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
+++ b/juick-common/src/main/java/com/juick/service/security/deprecated/RequestParamHashRememberMeServices.java
@@ -81,7 +81,7 @@ public class RequestParamHashRememberMeServices extends AbstractRememberMeServic
         if (StringUtils.isNotBlank(hash)) {
             User user = userService.getUserByHash(hash);
             if (!user.isAnonymous())
-                return new JuickUser(userService.getFullyUserByName(user.getName()));
+                return new JuickUser(userService.getUserByName(user.getName()));
         }
         throw new UsernameNotFoundException("User not found by hash " + hash);
     }
-- 
cgit v1.2.3