Refactoring of proc-test leading to minor discovered mistakes, that a…

…re now fixed.
neo4j · Jul 4, 2016 · 69b0898 · 69b0898
1 parent a1b5b3f
commit 69b0898
Show file tree

Hide file tree

Showing 4 changed files with 228 additions and 215 deletions.
diff --git a/...curity/src/main/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealm.java b/...curity/src/main/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealm.java
@@ -430,10 +430,20 @@ public User assertAndGetUser( String username ) throws IllegalArgumentException
         return u;
     }
 
+    public User assertCredentialsAndGetUser( String username ) throws IllegalCredentialsException
+    {
+        User u = getUser( username );
+        if ( u == null )
+        {
+            throw new IllegalCredentialsException( "User " + username + " does not exist." );
+        }
+        return u;
+    }
+
     @Override
     public void setUserPassword( String username, String password ) throws IOException, IllegalCredentialsException
     {
-        User existingUser = assertAndGetUser( username );
+        User existingUser = assertCredentialsAndGetUser( username );
 
         passwordPolicy.validatePassword( password );