improve

Author: ankit--sethi

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/esnative/NativeUsersStore.java

@@ -241,7 +241,7 @@ private void getUserAndPassword(final String user, final ActionListener<UserAndP
                 () -> executeAsyncWithOrigin(
                     client.threadPool().getThreadContext(),
                     SECURITY_ORIGIN,
-                    client.prepareGet(SECURITY_MAIN_ALIAS, getIdForUser(USER_DOC_TYPE, user)).request(),
+                    client.prepareGet(SECURITY_MAIN_ALIAS, getIdForUser(getDocType(user), user)).request(),
                     new ActionListener<GetResponse>() {
                         @Override
                         public void onResponse(GetResponse response) {
@@ -280,12 +280,7 @@ public void onFailure(Exception t) {
      */
     public void changePassword(final ChangePasswordRequest request, final ActionListener<Void> listener) {
         final String username = request.username();
-        final String docType;
-        if (ClientReservedRealm.isReserved(username, settings)) {
-            docType = RESERVED_USER_TYPE;
-        } else {
-            docType = USER_DOC_TYPE;
-        }
+        final String docType = getDocType(username);
 
         securityIndex.forCurrentProject().prepareIndexIfNeededThenExecute(listener::onFailure, () -> {
             executeAsyncWithOrigin(
@@ -330,6 +325,16 @@ public void onFailure(Exception e) {
         });
     }
 
+    private String getDocType(String username) {
+        final String docType;
+        if (ClientReservedRealm.isReserved(username, settings)) {
+            docType = RESERVED_USER_TYPE;
+        } else {
+            docType = USER_DOC_TYPE;
+        }
+        return docType;
+    }
+
     /**
      * Asynchronous method to create the elastic superuser with the given password hash. The cache for the user will be
      * cleared after the document has been indexed.