Rename and document unclear method

neo4j · Oct 5, 2016 · f0ef25a · f0ef25a
1 parent 9ceea99
commit f0ef25a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/security/AuthSubject.java b/community/kernel/src/main/java/org/neo4j/kernel/api/security/AuthSubject.java
@@ -41,9 +41,10 @@ public interface AuthSubject extends AccessMode
     void setPassword( String password, boolean requirePasswordChange ) throws IOException, InvalidArgumentsException;
 
     /**
-     * Changes authentication status to SUCCESS if in PASSWORD_CHANGE_REQUIRED
+     * Changes the {@link AuthenticationResult} status to {@link AuthenticationResult#SUCCESS SUCCESS} if it was {@link AuthenticationResult#PASSWORD_CHANGE_REQUIRED PASSWORD_CHANGE_REQUIRED}.
+     * This allows users that changed their password to become authorized for continued processing.
      */
-    void passwordChangeNoLongerRequired();
+    void setPasswordChangeNoLongerRequired();
 
     /**
      * Determines whether this subject is allowed to execute a procedure with the parameter string in its procedure annotation.
@@ -98,7 +99,7 @@ public void setPassword( String password, boolean requirePasswordChange )
         }
 
         @Override
-        public void passwordChangeNoLongerRequired()
+        public void setPasswordChangeNoLongerRequired()
         {
         }
 
@@ -222,7 +223,7 @@ public void setPassword( String password, boolean requirePasswordChange )
         }
 
         @Override
-        public void passwordChangeNoLongerRequired()
+        public void setPasswordChangeNoLongerRequired()
         {
         }
 

diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/AuthProcedures.java b/community/security/src/main/java/org/neo4j/server/security/auth/AuthProcedures.java
@@ -84,7 +84,7 @@ public void changePassword( @Name( "password" ) String password ) throws Invalid
             throw new AuthorizationViolationException( "Anonymous cannot change password" );
         }
         userManager.setUserPassword( authSubject.username(), password, false );
-        authSubject.passwordChangeNoLongerRequired();
+        authSubject.setPasswordChangeNoLongerRequired();
     }
 
     @Description( "Show the current user." )

diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/BasicAuthSubject.java b/community/security/src/main/java/org/neo4j/server/security/auth/BasicAuthSubject.java
@@ -94,11 +94,11 @@ public void setPassword( String password, boolean requirePasswordChange )
         authManager.setPassword( this, user.name(), password, requirePasswordChange );
 
         // Make user authenticated if successful
-        passwordChangeNoLongerRequired();
+        setPasswordChangeNoLongerRequired();
     }
 
     @Override
-    public void passwordChangeNoLongerRequired()
+    public void setPasswordChangeNoLongerRequired()
     {
         if ( authenticationResult == PASSWORD_CHANGE_REQUIRED )
         {

diff --git a/.../kernel/src/main/java/org/neo4j/kernel/enterprise/api/security/EnterpriseAuthSubject.java b/.../kernel/src/main/java/org/neo4j/kernel/enterprise/api/security/EnterpriseAuthSubject.java
@@ -114,7 +114,7 @@ public void setPassword( String password, boolean requirePasswordChange )
         }
 
         @Override
-        public void passwordChangeNoLongerRequired()
+        public void setPasswordChangeNoLongerRequired()
         {
         }
 

diff --git a/...rc/main/java/org/neo4j/server/security/enterprise/auth/StandardEnterpriseAuthSubject.java b/...rc/main/java/org/neo4j/server/security/enterprise/auth/StandardEnterpriseAuthSubject.java
@@ -73,11 +73,11 @@ public void setPassword( String password, boolean requirePasswordChange )
     {
         getUserManager().setUserPassword( shiroSubject.getPrincipal().toString(), password, requirePasswordChange );
         // Make user authenticated if successful
-        passwordChangeNoLongerRequired();
+        setPasswordChangeNoLongerRequired();
     }
 
     @Override
-    public void passwordChangeNoLongerRequired()
+    public void setPasswordChangeNoLongerRequired()
     {
         if ( getAuthenticationResult() == AuthenticationResult.PASSWORD_CHANGE_REQUIRED )
         {

diff --git a/...ity/src/main/java/org/neo4j/server/security/enterprise/auth/UserManagementProcedures.java b/...ity/src/main/java/org/neo4j/server/security/enterprise/auth/UserManagementProcedures.java
@@ -70,7 +70,7 @@ public void changeUserPassword( @Name( "username" ) String username, @Name( "new
         userManager.setUserPassword( username, newPassword, requirePasswordChange );
         if ( authSubject.hasUsername( username ) )
         {
-            authSubject.passwordChangeNoLongerRequired();
+            authSubject.setPasswordChangeNoLongerRequired();
         }
     }
 

diff --git a/...a/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionTest.java b/...a/org/neo4j/server/security/enterprise/auth/EmbeddedBuiltInProceduresInteractionTest.java
@@ -161,7 +161,7 @@ public void setPassword( String password, boolean requirePasswordChange )
             }
 
             @Override
-            public void passwordChangeNoLongerRequired()
+            public void setPasswordChangeNoLongerRequired()
             {
             }