1 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef_zero/endpoints/organization_user_endpoint.rb b/lib/chef_zero/endpoints/organization_user_endpoint.rb
index 8b3f20b..ef922d4 100644
--- a/lib/chef_zero/endpoints/organization_user_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_user_endpoint.rb
@@ -1,4 +1,4 @@
-require 'json'
+require 'ffi_yajl'
 require 'chef_zero/rest_base'
 
 module ChefZero
@@ -9,14 +9,14 @@ module ChefZero
         username = request.rest_path[3]
         get_data(request) # 404 if user is not in org
         user = get_data(request, [ 'users', username ])
-        user = JSON.parse(user, :create_additions => false)
+        user = FFI_Yajl::Parser.parse(user, :create_additions => false)
         json_response(200, ChefData::DataNormalizer.normalize_user(user, username, ['username'], server.options[:osc_compat], request.method))
       end
 
       def delete(request)
         user = get_data(request)
         delete_data(request)
-        user = JSON.parse(user, :create_additions => false)
+        user = FFI_Yajl::Parser.parse(user, :create_additions => false)
         json_response(200, ChefData::DataNormalizer.normalize_user(user, request.rest_path[3], ['username'], server.options[:osc_compat]))
       end
 
@@ -25,7 +25,7 @@ module ChefZero
         username = request.rest_path[3]
 
         users = get_data(request, [ 'organizations', orgname, 'groups', 'users' ])
-        users = JSON.parse(users, :create_additions => false)
+        users = FFI_Yajl::Parser.parse(users, :create_additions => false)
 
         create_data(request, [ 'organizations', orgname, 'users' ], username, '{}')
 
@@ -39,7 +39,7 @@ module ChefZero
         if !users['users'] || !users['users'].include?(username)
           users['users'] ||= []
           users['users'] |= [ username ]
-          set_data(request, [ 'organizations', orgname, 'groups', 'users' ], JSON.pretty_generate(users))
+          set_data(request, [ 'organizations', orgname, 'groups', 'users' ], FFI_Yajl::Encoder.encode(users, :pretty => true))
         end
         json_response(200, {})
       end