setsuzoku 0.11.0 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36e5b7968d72649e85fed697caf9d4b04613faa1b69e347bc347712743ddb55a
-  data.tar.gz: 11b0433cee31db3ffb7ee39d36c3c31dd4bab600b238a57a51519770d3453eff
+  metadata.gz: 576427e8c71dfaf7306d5c7de069440bc47f4d8d9de185f3eb230a8304ea8162
+  data.tar.gz: 24fc28270185bca4db25ac804b783e28ec2e6c505c17e545e35625cc2695ca8e
 SHA512:
-  metadata.gz: 27c41fe87bebe18b575359b471c3e7497292c5ba730b8698704352ad7f43f7a6d9824a8ee7d81c8d52e6d3dbb3247e7c4d3024b19cb1909c1e3bfc888fb0f823
-  data.tar.gz: 1352f256aacaeaa77d3565c5d14992bba7689717ea2c928485f3a4304b62b110db47b1c532ccb0266909f02719539c19ca8165c828973c4a8528ef8e74f23437
+  metadata.gz: 66c24bc8e924754a8b47fff0180ebd8ea73c7f42d1ddfe9694c3600850870514b6357a87f86c6b820b657e5393a081ab68d635534a2555dcc10419243540c2d7
+  data.tar.gz: f55aae400065ab41b8f5d98e66154f80ca044c8de60cd552b3e29fd3d8d9895d09a930bf9a3e7253d2d5ce835062a75ec89f26cde7275419bda7f0a389dc11f9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    setsuzoku (0.11.0)
+    setsuzoku (0.11.5)
       activesupport (~> 5.0)
       faraday (~> 0.11)
       httparty (~> 0.16.4)

data/lib/setsuzoku/api_strategy.rb

@@ -80,7 +80,7 @@ module Setsuzoku
       self.external_api_handler.call_external_api_wrapper(plugin: self.plugin, request: request, action_details: action_details) do
         begin
           # raise if the token is invalid and needs refreshed, but don't raise if we are trying to get a refresh token
-          raise Setsuzoku::Exception::InvalidAuthCredentials.new unless (request.action == :refresh_token || self.auth_strategy.auth_credential_valid?)
+          raise Setsuzoku::Exception::InvalidAuthCredentials.new unless (strategy == :auth || self.auth_strategy.auth_credential_valid?)
           raw_response = self.perform_external_call(request: request, action_details: action_details, **options)
           formatted_response = self.parse_response(response: raw_response, response_type: action_details[:actions][request.action][:response_type])
           success = true

data/lib/setsuzoku/rspec/dynamic_spec_helper.rb

@@ -2,6 +2,8 @@
 
 require 'active_support/core_ext/class/subclasses'
 require 'active_support/inflector/methods'
+require 'faraday'
+
 module Setsuzoku
   module DynamicSpecHelper
 
@@ -150,20 +152,21 @@ module Setsuzoku
         stub.each do |action_name, props|
           props.each do |propz|
             plugin.api_strategy.current_action = action_name
-            default_headers = plugin.api_strategy.request_options(propz[:request_format])[:headers] || { 'Authorization' => 'Bearer stubbed_token', 'Content-Type' => "application/#{propz[:request_format]}" }
+            default_headers = plugin.api_strategy.request_options(propz[:request_format])[:headers] || { 'Content-Type' => "application/#{propz[:request_format]}" }
             if plugin.auth_strategy.is_a?(Setsuzoku::Service::WebService::AuthStrategies::BasicAuthStrategy)
               basic_auth = plugin.api_strategy.request_options(propz[:request_format])[:basic_auth]
               auth_header = { 'Authorization' => "Basic #{Base64.encode64("#{basic_auth[:username]}:#{basic_auth[:password]}").gsub("\n", '')}" }
-              default_headers.merge!(auth_header)
+            elsif plugin.auth_strategy.is_a?(Setsuzoku::Service::WebService::AuthStrategies::OAuthStrategy)
+              auth_header = { 'Authorization' => "Bearer #{plugin.api_strategy.request_options(propz[:request_format])[:token]}" }
             end
+            default_headers.merge!(auth_header) if auth_header
             headers = propz[:headers] ? [propz[:headers]] : [default_headers]
             stub_directory ||= "#{plugin.class.plugin_namespace}/#{provider}"
+
             headers.each do |header|
-              header = {
-                  'Accept'=>'*/*',
-                  'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-                  'User-Agent'=>'Ruby'
-              }.merge(header.deep_stringify_keys)
+              header = Faraday.new.headers
+                        .merge({'Accept'=>'*/*','Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3'})
+                        .merge(header.deep_stringify_keys)
 
               if propz[:stub_data]
                 # we have specified specific stub data for this action

data/lib/setsuzoku/service/web_service/api_strategies/rest_strategy.rb

@@ -33,7 +33,7 @@ module Setsuzoku
           #   media_type - 'json'
           #
           # @return [Hash] the parsed response object.
-          sig { override.params(request: T.untyped, action_details: T::Hash[T.untyped, T.untyped], options: T.untyped).returns(Faraday::Response) }
+          sig { override.params(request: RestAPIRequest, action_details: T::Hash[T.untyped, T.untyped], options: T.untyped).returns(Faraday::Response) }
           def perform_external_call(request:, action_details:, **options)
             request_properties = self.get_request_properties(action_name: request.action, action_details: action_details, req_params: request.body)
             request_options = self.request_options(request_properties[:request_format], action_details[:actions][request.action])
@@ -43,11 +43,14 @@ module Setsuzoku
             @faraday = Faraday.new(url: request_properties[:formatted_full_url], request: { params_encoder: Faraday::FlatParamsEncoder }) do |faraday|
               faraday.request(:multipart) if options[:attachments].present?
               faraday.request(:url_encoded)
-              # faraday.basic_auth(request_options[:basic_auth][:username], request_options[:basic_auth][:password]) if request_options[:basic_auth]
-              faraday.request(:basic_auth, request_options[:basic_auth][:username], request_options[:basic_auth][:password]) if request_options[:basic_auth]
-              # faraday.response request_properties[:response_format] if request_properties[:response_format]
-              faraday.authorization(:Bearer, request_properties[:token]) if request_properties[:token]
-              # request_options[:headers][:Authorization].prepend('Bearer ') if request_options[:headers][:Authorization]
+              #TODO: change these to faraday = self.auth_strategy.set_authorization!(request: faraday)
+              unless request.without_headers
+                if request_options[:token]
+                  faraday.authorization(:Bearer, request_options[:token])
+                elsif request_options[:basic_auth]
+                  faraday.request(:basic_auth, request_options[:basic_auth][:username], request_options[:basic_auth][:password])
+                end
+              end
               faraday.adapter Faraday.default_adapter
             end
 
@@ -60,7 +63,11 @@ module Setsuzoku
                 req.body = payload
               end
             else
-              @faraday.headers = request_options[:headers] if request_options[:headers]
+              if request.without_headers
+                @faraday.headers = {}
+              elsif request_options[:headers]
+                @faraday.headers = (@faraday.headers || {}).merge(request_options[:headers])
+              end
               resp = @faraday.send(request_properties[:request_method], request_properties[:formatted_full_url], full_request)
             end
             resp
@@ -81,7 +88,6 @@ module Setsuzoku
             request_method = request_method.downcase.to_sym
             request_format = action[:request_type]
             response_format = action[:response_type]
-            token = action[:token]
             stub_data = action[:stub_data] if for_stub
             full_url = url + endpoint
             formatted_full_url, req_params = self.replace_dynamic_vars(full_url: full_url, req_params: req_params)
@@ -93,7 +99,6 @@ module Setsuzoku
                 formatted_full_url: formatted_full_url,
                 req_params: req_params,
                 stub_data: stub_data,
-                token: token
             }
           end
 

data/lib/setsuzoku/service/web_service/auth_strategies/o_auth_strategy.rb

@@ -31,9 +31,7 @@ module Setsuzoku
           sig { override.returns(T::Hash[Symbol, T.untyped]) }
           def auth_headers
             {
-                headers: {
-                    'Authorization': "Bearer #{self.credential.token}"
-                }
+              token: self.credential.token
             }
           end
 
@@ -112,7 +110,7 @@ module Setsuzoku
           sig { params(body: T::Hash[Symbol, String], action: Symbol).void }
           def get_token!(body, action)
             success = false
-            request = self.api_strategy.request_class.new(action: action, body: body)
+            request = self.api_strategy.request_class.new(action: action, body: body, without_headers: true)
 
             resp = self.api_strategy.call_external_api(request: request, strategy: :auth)
 

data/lib/setsuzoku/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Setsuzoku
-  VERSION = '0.11.0'
+  VERSION = '0.11.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setsuzoku
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.5
 platform: ruby
 authors:
 - Luke Stadtler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler