[CHEF-5328] Fixed Chef::User.list API error with inflate=true

1 files changed, 11 insertions, 11 deletions

diff --git a/lib/chef/user.rb b/lib/chef/user.rb
index 3f592e4b65..b8ec91b7ee 100644
--- a/lib/chef/user.rb
+++ b/lib/chef/user.rb
@@ -144,18 +144,18 @@ class Chef
     end
 
     def self.list(inflate=false)
-      response = if inflate
-                   users = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest('users')
-                   users.map do |name|
-                     Chef::User.load(name)
-                   end
-                 else
-                   Chef::REST.new(Chef::Config[:chef_server_url]).get_rest('users')
-                 end
-      if response.is_a? Array
-        transform_ohc_list_response(response)
+      response = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest('users')
+      users = if response.is_a?(Array)
+        transform_ohc_list_response(response) # OHC/OPC
       else
-        response
+        response # OSC
+      end
+      if inflate
+        Hash[users.map do |name, url|
+          [name, Chef::User.load(name)]
+        end]
+      else
+        users
       end
     end