summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-08-21 16:26:06 -0700
committerJohn Keiser <jkeiser@opscode.com>2014-08-22 09:20:50 -0700
commitebba48bf268fb7ec28cc8b0ebba04d7c64dc1dbc (patch)
treeeeb5dfded77f4559eefc34b27bb9a292e06ff0ff
parent965edb4205202d9c0237041f3014af8fbdaec235 (diff)
downloadchef-zero-ebba48bf268fb7ec28cc8b0ebba04d7c64dc1dbc.tar.gz
Verify that the user exists before getting association requests
-rw-r--r--lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb2
-rw-r--r--lib/chef_zero/endpoints/user_association_requests_endpoint.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb b/lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb
index 0019bdc..0638787 100644
--- a/lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb
+++ b/lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb
@@ -6,6 +6,8 @@ module ChefZero
# /users/NAME/association_requests/count
class UserAssociationRequestsCountEndpoint < RestBase
def get(request)
+ get_data(request, request.rest_path[0..-2])
+
username = request.rest_path[1]
result = list_data(request, [ 'organizations' ]).select do |org|
exists_data?(request, [ 'organizations', org, 'association_requests', username ])
diff --git a/lib/chef_zero/endpoints/user_association_requests_endpoint.rb b/lib/chef_zero/endpoints/user_association_requests_endpoint.rb
index 24cb77e..cdff2fd 100644
--- a/lib/chef_zero/endpoints/user_association_requests_endpoint.rb
+++ b/lib/chef_zero/endpoints/user_association_requests_endpoint.rb
@@ -6,6 +6,7 @@ module ChefZero
# /users/USER/association_requests
class UserAssociationRequestsEndpoint < RestBase
def get(request)
+ get_data(request, request.rest_path[0..-2])
username = request.rest_path[1]
result = list_data(request, [ 'organizations' ]).select do |org|
exists_data?(request, [ 'organizations', org, 'association_requests', username ])