1 files changed, 4 insertions, 13 deletions
diff --git a/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb b/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb
index 608d548..e1b6a7e 100644
--- a/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb
@@ -6,23 +6,14 @@ module ChefZero
     # /organizations/ORG/association_requests
     class OrganizationAssociationRequestsEndpoint < RestBase
       def post(request)
-        json = FFI_Yajl::Parser.parse(request.body, :create_additions => false)
-        username = json['user']
-        orgname = request.rest_path[1]
-        id = "#{username}-#{orgname}"
-
-        if exists_data?(request, [ 'organizations', orgname, 'users', username ])
-          raise RestErrorResponse.new(409, "User #{username} is already in organization #{orgname}")
-        end
-
-        create_data(request, request.rest_path, username, '{}')
-        json_response(201, { "uri" => build_uri(request.base_uri, request.rest_path + [ id ]) })
+        ChefZero::Endpoints::OrganizationUserBase.post(self, request, 'user')
       end
 
       def get(request)
         orgname = request.rest_path[1]
-        result = list_data(request).map { |username| { "id" => "#{username}-#{orgname}", 'username' => username } }
-        json_response(200, result)
+        ChefZero::Endpoints::OrganizationUserBase.get(self, request) do |username|
+          { "id" => "#{username}-#{orgname}", 'username' => username }
+        end
       end
     end
   end