Return better error message from HTTPClient

Author: zzooeeyy

lib/shopify_api/clients/http_client.rb

@@ -112,6 +112,8 @@ def request_url(request)
       def serialized_error(response)
         body = {}
         body["errors"] = response.body["errors"] if response.body["errors"]
+        body["error"] = response.body["error"] if response.body["error"]
+        body["error_description"] = response.body["error_description"] if response.body["error"]
 
         if response.headers["x-request-id"]
           id = T.must(response.headers["x-request-id"])[0]

test/clients/http_client_test.rb

@@ -175,6 +175,27 @@ def test_error_message_structure
         assert(parsed_error["error_reference"])
       end
 
+      def test_error_message_with_oauth_error_and_description
+        error_response_body = {
+          "error": "invalid_subject_token",
+          "error_description": "The subject token is invalid or has expired",
+        }.to_json
+        response_headers = {
+          "x-request-id": 9012,
+        }
+        stub_request(@request.http_method, "https://#{@shop}#{@base_path}/#{@request.path}")
+          .with(body: @request.body.to_json, query: @request.query, headers: @expected_headers)
+          .to_return(body: error_response_body, status: 400, headers: response_headers)
+
+        response = assert_raises(ShopifyAPI::Errors::HttpResponseError) do
+          @client.request(@request)
+        end
+        parsed_error = JSON.parse(response.message)
+        assert_equal("invalid_subject_token", parsed_error["error"])
+        assert_equal("The subject token is invalid or has expired", parsed_error["error_description"])
+        assert(parsed_error["error_reference"])
+      end
+
       def test_non_retriable_error_code
         stub_request(@request.http_method, "https://#{@shop}#{@base_path}/#{@request.path}")
           .with(body: @request.body.to_json, query: @request.query, headers: @expected_headers)