Skip to content

Refactor exception handling for response content type #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-leb merged 1 commit into from
Nov 27, 2025
Merged

Refactor exception handling for response content type #273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/mailjet/connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,14 @@ def method_allowed(method)
end

def handle_exception(e, additional_headers, payload = {})
return e.response_body if e.response_headers[:content_type].include?("text/plain")
response_content_type = e.response_headers&.[](:content_type) || ''
return e.response_body if response_content_type.include?("text/plain")

params = additional_headers[:params] || {}
formatted_payload = (additional_headers[:content_type] == :json) ? Yajl::Parser.parse(payload) : payload
params = params.merge!(formatted_payload) if formatted_payload.is_a?(Hash)

response_body = if e.response_headers[:content_type].include?("application/json")
response_body = if response_content_type.include?("application/json")
e.response_body
else
"{}"
Expand Down