Fixes #14852 - do not pass in "data" param unless needed #436
Conversation
|
note: this PR should fix the katello dev setup 401 issue during proxy registration |
|
The expectations will need to be adjusted in here too: https://github.com/theforeman/puppet-foreman/blob/master/spec/unit/foreman_resource_rest_v3_spec.rb |
|
this PR has a bug related to POSTing. I am looking into it now and will update. |
| if [:post, :put, :patch].include?(method) | ||
| response = oauth_consumer.request(method, uri.to_s, generate_token, {}, data, headers) | ||
| else | ||
| response = oauth_consumer.request(method, uri.to_s, generate_token, {}, headers) |
There was a problem hiding this comment.
Is GET the only one this applies to? I might flip the conditions around in that case. Could :delete for example be a possible method?
There was a problem hiding this comment.
It could be flipped, I did it like that so it's the inverse of what the oauth gem does.
in 0.4.7 it's:
if [:post, :put].include?(http_method)
data = arguments.shift
end
Later versions added :patch so I added it here as well.
|
Tested, clean installer run, and the proxy gets registered. |
|
travis fails on 1.8.7: This appears to not be related to this PR. |
|
#437 should fix the webmock error. Tested this and it works fine, I'm guessing you've enabled oauth_map_users, which is why the contents of the headers are important. Seems to fix it for me. |
|
@beav please rebase. |
Previously, the "data" param was passed to all oauth requests. This caused issues with `GET` requests, since `data` and `headers` gets mashed into `*arguments`, and then the oauth gem will `shift` off the first argument if there's a `POST` or `PUT` method. The end result was that headers weren't being sent on `GET` requests. Instead, only supply the "data" param if we are doing a `POST` or `PUT`.
|
@mmoll rebased |
|
merged, thanks @beav! |
) Previously, the "data" param was passed to all oauth requests. This caused issues with `GET` requests, since `data` and `headers` gets mashed into `*arguments`, and then the oauth gem will `shift` off the first argument if there's a `POST` or `PUT` method. The end result was that headers weren't being sent on `GET` requests. Instead, only supply the "data" param if we are doing a `POST` or `PUT`.
Previously, the "data" param was passed to all oauth requests. This caused
issues with
GETrequests, sincedataandheadersgets mashed into*arguments, and then the oauth gem willshiftoff the first argument ifthere's a
POSTorPUTmethod. The end result was that headers weren't beingsent on
GETrequests.Instead, only supply the "data" param if we are doing a
POSTorPUT.