finapps 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5096a6b1981fc503ff5718b188c8b54f960db534
-  data.tar.gz: 28f39fcf4370f57c640d9b7bb555585fa1fc6455
+  metadata.gz: c165121be25a140bd8e679e20ff7d9b09aabc28a
+  data.tar.gz: 7ced8cf8b1d9436b17bf2fed865f161502b8a6c6
 SHA512:
-  metadata.gz: 25f29fe1caafca96681e176dba45ce2cd941eb83a357a635ee66f93a41238cadb4a07fccb14b6b22b6d3ab3d83b6546dd5848e3a775d582f73a10a49d0d7b3b8
-  data.tar.gz: 374ea976bc0ed5e4ccb93b390b618f64858f8353c19565b7fbcd44bc201efa701e51e41c0888e43f784ba69261939a1fbd5c09c9a46b2be3c4b5201bbc315196
+  metadata.gz: b4326d7f86886911409df0a3c555d8dd8cbbfe687633d2ffb09374b6a067ac0469c556299ef53ee8e89b35eb2bf46d18af0cec822579fe55dc4e85030e96c130
+  data.tar.gz: eb6a33a750ffb3190a3e308bc03fa5a01ba6805ddfa77bdde963f998e4d91f1675b4e408d7daa1862aeb6aa7afef7cd47d30a1786c04ee5a9be4b760a23b04c5

data/lib/finapps/middleware/request/no_encoding_basic_authentication.rb

@@ -1,10 +1,20 @@
 # frozen_string_literal: true
 module FinApps
   module Middleware
-    class NoEncodingBasicAuthentication < ::Faraday::Request.load_middleware(:authorization)
-      def self.header(value)
-        sanitized = value.delete("\n")
-        super(:Basic, sanitized)
+    # Adds a custom header for basic authorization.
+    # If the value for this header already exists, it is not overriden.
+    class NoEncodingBasicAuthentication < Faraday::Middleware
+      KEY = 'Authorization' unless defined? KEY
+
+      def initialize(app, token)
+        super(app)
+        sanitized = token.to_s.strip.delete("\n")
+        @header_value = "Basic #{sanitized}"
+      end
+
+      def call(env)
+        env[:request_headers][KEY] ||= @header_value
+        @app.call(env)
       end
     end
   end

data/lib/finapps/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module FinApps
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

data/spec/middleware/request/no_encoding_basic_authentication_spec.rb

@@ -1,11 +1,32 @@
 # frozen_string_literal: true
 RSpec.describe FinApps::Middleware::NoEncodingBasicAuthentication do
   let(:valid_credentials) { VALID_CREDENTIALS }
+  let(:key) { FinApps::Middleware::NoEncodingBasicAuthentication::KEY }
 
-  describe '.header' do
-    it 'does not encode the values' do
-      actual_token = FinApps::Middleware::NoEncodingBasicAuthentication.header(valid_credentials[:token])
-      expect(actual_token).to eq("Basic #{valid_credentials[:token]}")
+  describe '#call' do
+    fake_app = proc {|env| env }
+
+    context 'when credentials were provided' do
+      let(:middleware) do
+        FinApps::Middleware::NoEncodingBasicAuthentication.new(fake_app, VALID_CREDENTIALS[:token])
+      end
+      let(:expected_header) { "Basic #{valid_credentials[:token]}" }
+
+      context 'when header was not previously set' do
+        let(:request_env) { {request_headers: {}} }
+        subject(:actual_header) { middleware.call(request_env)[:request_headers][key] }
+
+        it('generates a header') { expect(actual_header).to eq(expected_header) }
+      end
+
+      context 'when header was previously set' do
+        let(:existing_header) { {FinApps::Middleware::NoEncodingBasicAuthentication::KEY => 'foo'} }
+        let(:request_env) { {request_headers: existing_header} }
+        subject(:actual_header) { middleware.call(request_env)[:request_headers][key] }
+
+        it('does not override existing header') { expect(actual_header).to eq('foo') }
+        it('does not generate a header') { expect(actual_header).to_not eq(expected_header) }
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finapps
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Erich Quintero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday