Merge pull request #44 from ioki-mobility/encoding-middleware

lib/ioki/http_adapter.rb

@@ -8,18 +8,22 @@ class HttpAdapter
 
     def self.get(config)
       ::Faraday.new(config.api_base_url, headers: headers(config)) do |f|
-        f.request :json # encode req bodies as JSON
-        f.response :json # decode response bodies as JSON
         f.adapter :net_http
-        f.request :authorization, 'Bearer', -> { config.api_token }
 
+        # The order of execution of the middleware is FiFo:
+        # 1) parsed as JSON (and implicitly is encoded properly as UTF-8)
+        # 2) logging occurs
         if config.logger
           f.response :logger, config.logger, config.logger_options do |logger|
             logger.filter(/(X-Client-Secret: )(\w+)/, '\1[REMOVED]')
             logger.filter(/(Authorization: )(\w+)/, '\1[REMOVED]')
             logger.filter(/("token":")([^"]+)/, '\1[REMOVED]')
           end
         end
+        f.response :json # decode response bodies as JSON
+
+        f.request :json # encode req bodies as JSON
+        f.request :authorization, 'Bearer', -> { config.api_token }
       end
     end
 

spec/ioki/http_adapter_spec.rb

@@ -15,7 +15,8 @@
       api_client_version:    'api_client_version',
       api_token:             'SECRET_TOKEN',
       language:              :'en-BZ',
-      logger:                logger
+      logger:                logger,
+      logger_options:        { headers: true, bodies: true }
     )
   end
   let(:logger) { nil }
@@ -59,4 +60,21 @@
     it { is_expected.to include 'X-Client-Version'    => config.api_client_version }
     it { is_expected.to include 'Authorization'       => 'Bearer SECRET_TOKEN' }
   end
+
+  describe 'encoding for logger' do
+    let(:logger) { instance_double(::Logger, 'logger') }
+
+    it 'uses the correct encoding from the Content-Type header' do
+      stub_request(:get, 'https://app.io.ki/api/platform/products').to_return(
+        status:  200,
+        body:    [{ name: 'Grüne Höhe Wägen' }].to_json.force_encoding(Encoding::ASCII_8BIT),
+        headers: { 'Content-Type' => 'application/json; charset=utf-8' }
+      )
+      allow(logger).to receive(:info) do |*_args, &block|
+        body = block.call
+        expect(body.encoding).to eq(Encoding::UTF_8)
+      end
+      http_adapter.get('platform/products')
+    end
+  end
 end