[Fix] Handle JSON::Parser Error

Signed-off-by: Michael Marusyk <[email protected]>

lib/easyship/handlers/response_body_handler.rb

@@ -7,7 +7,9 @@ class ResponseBodyHandler
       def self.handle_response(response)
         body = response.body
 
-        JSON.parse(body, symbolize_names: true) unless body.nil? || body.empty?
+        JSON.parse(body, symbolize_names: true)
+      rescue JSON::ParserError
+        nil
       end
     end
   end

lib/easyship/middleware/error_handler_middleware.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 require_relative '../error'
+
 module Easyship
   module Middleware
     # Response middleware that raises an error based on the response status code
     class ErrorHandlerMiddleware < Faraday::Middleware
       def on_complete(env)
         status_code = env[:status].to_i
-        body = JSON.parse(env[:body], symbolize_names: true) if json?(env[:body])
+        body = response_body(env[:body])
 
         handle_status_code(status_code, body)
       end
@@ -54,8 +55,10 @@ def format_by_default(body)
         { details: body, message: 'Something went wrong.' }
       end
 
-      def json?(body)
-        !body.nil? && body.is_a?(String)
+      def response_body(body)
+        JSON.parse(body, symbolize_names: true)
+      rescue JSON::ParserError
+        nil
       end
     end
   end

spec/easyship/client_spec.rb

@@ -15,8 +15,6 @@
     end
 
     context 'when invalid api_key' do
-      let(:path) { '/2023-01/account' }
-
       it 'raises an InvalidTokenError' do
         VCR.use_cassette('invalid_token') do
           expect { client.get(path) }.to raise_error(Easyship::Errors::InvalidTokenError)
@@ -33,6 +31,14 @@
         end
       end
     end
+
+    context 'when internal server error' do
+      it 'raises an ServerError' do
+        VCR.use_cassette('server_error') do
+          expect { client.get(path) }.to raise_error(Easyship::Errors::ServerError)
+        end
+      end
+    end
   end
 
   describe '#post' do