merge user services

src/main/java/wtf/beatrice/releasehive/services/AccountServiceImpl.java

@@ -43,9 +43,7 @@ public class AccountServiceImpl implements AccountService {
         authenticationManager.authenticate(
                 new UsernamePasswordAuthenticationToken(
                         user.getEmail(),
-                        user.getPassword()
-                )
-        );
+                        user.getPassword()));
 
         return userRepository.findByEmail(user.getEmail())
                 .orElseThrow();

src/main/java/wtf/beatrice/releasehive/services/UserDetailsExtendedService.java

@@ -1,25 +0,0 @@
-package wtf.beatrice.releasehive.services;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-import wtf.beatrice.releasehive.models.User;
-import wtf.beatrice.releasehive.repositories.UserRepository;
-
-@Service
-public class UserDetailsExtendedService {
-
-    private final UserRepository userRepository;
-
-    public UserDetailsExtendedService(@Autowired UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    public User loadUserByUsername(String username) throws UsernameNotFoundException {
-        return userRepository.findByUsername(username).orElseThrow(() -> new UsernameNotFoundException(username));
-    }
-
-    public User loadUserByEmail(String email) throws UsernameNotFoundException {
-        return userRepository.findByEmail(email).orElseThrow(() -> new UsernameNotFoundException(email));
-    }
-}

src/main/java/wtf/beatrice/releasehive/services/UserService.java

@@ -1,6 +1,7 @@
 package wtf.beatrice.releasehive.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import wtf.beatrice.releasehive.models.User;
 import wtf.beatrice.releasehive.repositories.UserRepository;
@@ -20,4 +21,11 @@ public class UserService
         return userRepository.findAll();
     }
 
+    public User loadUserByUsername(String username) throws UsernameNotFoundException {
+        return userRepository.findByUsername(username).orElseThrow(() -> new UsernameNotFoundException(username));
+    }
+
+    public User loadUserByEmail(String email) throws UsernameNotFoundException {
+        return userRepository.findByEmail(email).orElseThrow(() -> new UsernameNotFoundException(email));
+    }
 }