Simplified helper code for common user repository setup

neo4j · Aug 18, 2016 · 75a8b39 · 75a8b39
1 parent 8ff79ba
commit 75a8b39
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/community/security/src/main/java/org/neo4j/commandline/admin/security/UsersCommand.java b/community/security/src/main/java/org/neo4j/commandline/admin/security/UsersCommand.java
@@ -210,8 +210,8 @@ private static List<Class<?>> settings()
     private FileUserRepository getUserRepository() throws Throwable
     {
         Config config = loadNeo4jConfig( homeDir, configDir );
-        Path userStoreFile = BasicAuthManagerFactory.getUserStoreFile( config );
+        FileUserRepository userRepository =
-        FileUserRepository userRepository = new FileUserRepository( userStoreFile, NullLogProvider.getInstance() );
+                BasicAuthManagerFactory.getUserRepository( config, NullLogProvider.getInstance() );
         userRepository.start();
         return userRepository;
     }

diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/BasicAuthManagerFactory.java b/community/security/src/main/java/org/neo4j/server/security/auth/BasicAuthManagerFactory.java
@@ -40,7 +40,7 @@ public class BasicAuthManagerFactory extends AuthManager.Factory
 {
     private static final String USER_STORE_FILENAME = "auth";
 
-    public static Path getUserStoreFile( Config config )
+    public static FileUserRepository getUserRepository( Config config, LogProvider logProvider )
     {
         // Resolve auth store file names
         File authStoreDir = config.get( DatabaseManagementSystemSettings.auth_store_directory );
@@ -52,7 +52,7 @@ public static Path getUserStoreFile( Config config )
         {
             userStoreFile = new File( authStoreDir, USER_STORE_FILENAME );
         }
-        return userStoreFile.toPath();
+        return new FileUserRepository( userStoreFile.toPath(), logProvider );
     }
 
     public interface Dependencies
@@ -75,8 +75,7 @@ public AuthManager newInstance( Config config, LogProvider logProvider )
                     "configuration setting auth_enabled=false" );
         }
 
-        final Path userStoreFile = getUserStoreFile( config );
+        final UserRepository userRepository = getUserRepository( config, logProvider );
-        final UserRepository userRepository = new FileUserRepository( userStoreFile, logProvider );
 
         final PasswordPolicy passwordPolicy = new BasicPasswordPolicy();
 

diff --git a/...src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManagerFactory.java b/...src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManagerFactory.java
@@ -86,11 +86,9 @@ public AuthManager newInstance( Config config, LogProvider logProvider )
     private static InternalFlatFileRealm createInternalRealm( Config config, LogProvider logProvider )
     {
         // Resolve auth store and roles file names
-        Path userStoreFile = getUserStoreFile( config );
         File authStoreDir = config.get( DatabaseManagementSystemSettings.auth_store_directory );
         File roleStoreFile = new File( authStoreDir, ROLE_STORE_FILENAME );
-
+        final UserRepository userRepository = getUserRepository( config, logProvider );
-        final UserRepository userRepository = new FileUserRepository( userStoreFile, logProvider );
 
         final RoleRepository roleRepository =
                 new FileRoleRepository( roleStoreFile.toPath(), logProvider );