Skip to content

Commit 54cd05d

Browse files
authored
Merge pull request #869 from pixelhandler/loosen-accept-header-check
Loosen Accept header check to allow starts with :api_json
2 parents e1ec8b6 + ee8cf2c commit 54cd05d

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

lib/jsonapi/acts_as_resource_controller.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ def valid_accept_media_type?
162162
media_types = media_types_for('Accept')
163163

164164
media_types.blank? ||
165-
media_types.any? do |media_type|
166-
(media_type == JSONAPI::MEDIA_TYPE || media_type == ALL_MEDIA_TYPES)
167-
end
165+
media_types.any? do |media_type|
166+
(media_type == JSONAPI::MEDIA_TYPE || media_type.start_with?(ALL_MEDIA_TYPES))
167+
end
168168
end
169169

170170
def media_types_for(header)

test/controllers/controller_test.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ def test_accept_header_all
5656
assert_response :success
5757
end
5858

59+
def test_accept_header_all_modified
60+
@request.headers['Accept'] = "*/*;q=0.8"
61+
62+
assert_cacheable_get :index
63+
assert_response :success
64+
end
65+
5966
def test_accept_header_not_jsonapi
6067
@request.headers['Accept'] = 'text/plain'
6168

0 commit comments

Comments
 (0)