setsuzoku 0.13.0 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2000ab035e24854f6a272d61a3ee639bb3e439b9b6a30ad6fb561619329d8f67
-  data.tar.gz: 14424c08ba7e2a292df246c9ddfcc878ff40e041f969c12738eb73851fe38980
+  metadata.gz: 0c0b8c050fa9e109346e671c24de8e74926cebfeb633287d1ace06887f6f51c4
+  data.tar.gz: f848f52cfea63adb526db081c46e61988a17766d3965651de20f41eddaf55478
 SHA512:
-  metadata.gz: 805e60a36064d10811169e66b8cf897240d747771780421f9ef1c9f39fcb7d3eda6216e85644bf1f77d7087664a5dd270ca53c7799b4cd53bcac20303e6bb6c9
-  data.tar.gz: 4132dd8debf2539ec898eb3c2bbad9d2cd58ad4a4d1cb6669972a338bd5121470338fa16aa9d1b83777d7fc2b5c09dd63d57f613b6391c5ba2aba8ae7cd95f1e
+  metadata.gz: b0ec90c69f2c0b534fc2b9f8c41f8b16307b91c5a6c29dfa04f3f19b491d49ad976ebd1c1bd7d9080705d9840745255aa7311b73f156b174aa51d5121eb5d443
+  data.tar.gz: c751c9cc1d177c1aeefce1944751e361a01a5a2749c36abbfee713a2aaa564099b03092a38842839f6f5ab790515b9b88f786c123bac2dc1c3fdb4f671139d81

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    setsuzoku (0.13.0)
+    setsuzoku (0.14.3)
       activesupport (>= 5.0, < 7)
       faraday (~> 0.11)
       nokogiri (~> 1.10)
@@ -10,29 +10,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.4.2)
-    faraday (0.17.3)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
     hashdiff (1.0.1)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
     multipart-post (2.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     public_suffix (4.0.5)
+    racc (1.5.2)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -50,16 +52,15 @@ GEM
     safe_yaml (1.0.5)
     sorbet (0.5.5675)
       sorbet-static (= 0.5.5675)
-    sorbet-runtime (0.5.5937)
+    sorbet-runtime (0.5.6480)
     sorbet-static (0.5.5675-universal-darwin-14)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     webmock (3.8.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

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

@@ -147,7 +147,7 @@ module Setsuzoku
               .merge!(self.auth_strategy.get_from_context(:auth_headers).except(:authorization))
               .merge!(self.get_from_context(:api_headers))
               .merge!(action_details[:request_options] || {})
-            request_options[:authorization] = self.auth_strategy.get_from_context(:auth_headers)[:authorization]
+            request_options[:authorization] = action_details[:authorization] || self.auth_strategy.get_from_context(:auth_headers)[:authorization]
 
             content_type = case request_format
                            when :json

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

@@ -137,36 +137,14 @@ module Setsuzoku
           # @return void
           def get_token!(body, action)
             success = false
-            request = self.api_strategy.request_class.new(action: action, body: body, without_headers: true)
+            without_headers = self.credential.auth_actions[action].has_key?(:without_headers) ? self.credential.auth_actions[action][:without_headers] : true
+            request = self.api_strategy.request_class.new(action: action, body: body, without_headers: without_headers)
 
             resp = self.api_strategy.call_external_api(request: request, strategy: :auth)
 
             return false unless resp.success
 
-            attrs = self.credential.token_attributes_to_assign(resp)
-            attrs[:status] = if attrs[:token]
-                               'active'
-                             else
-                               'error'
-                             end
-
-            # Assign any additional attributes the plugin's credential needs to know about.
-            # E.g. the extension for a phone_number.
-            plugin_attrs = self.credential.additional_attributes_to_assign(resp) if self.plugin.respond_to?(:credential_fields_to_update)
-            attrs.merge!(plugin_attrs) if plugin_attrs
-
-            # Only save Setsuzoku known fields, and any additional attributes the plugin specifies
-            # in credential_fields_to_update.
-            if self.credential.respond_to?(:"update_columns")
-              # we issue an update_columns instead of a save/update_attributes
-              # so as to only mutate these attributes
-              # and not any other fields that may have been set for the credential
-              save = self.credential.update_columns(attrs)
-              self.credential.touch if save && self.credential.respond_to?(:"touch")
-              save
-            else
-              true
-            end
+            self.credential.set_token!(resp)
           end
         end
       end

data/lib/setsuzoku/service/web_service/credentials/o_auth_credential.rb

@@ -54,26 +54,6 @@ module Setsuzoku
           sig { abstract.returns(T.nilable(String)) }
           def redirect_url; end
 
-          # The token, refresh_token, and expires_at to assign for an OAuth token request.
-          #
-          # @param resp [Hash] the response hash from the external api call for a token.
-          #
-          # @return [Hash] the attributes to assign to the credential.
-          sig{ overridable.params(resp: Setsuzoku::ApiResponse).returns(T::Hash[Symbol, T.untyped]) }
-          def token_attributes_to_assign(resp)
-            attrs = {
-                token: resp.data[:access_token],
-                refresh_token: resp.data[:refresh_token]
-            }
-
-            expires_in = resp.data[:expires_in]
-            if expires_in && (expires_in.is_a?(Integer) || expires_in.match(/^\d+$/))
-              attrs[:expires_on] = expires_in.to_i.seconds.from_now
-            end
-
-            attrs
-          end
-
           # Stub an o_auth_credential-like instance.
           #
           # @return [Struct] a stubbed o_auth_credential-like struct.

data/lib/setsuzoku/service/web_service/credentials/uses_credential_token.rb

@@ -51,16 +51,16 @@ module Setsuzoku
           #
           # @return [Datetime] the time to set for the current token's expiry.
           sig{ abstract.params(val: DateTime).returns(T.nilable(DateTime)) }
-          def expires_on=(val);
+          def expires_on=(val); end
 
-          # The token fields to bet set for the custom credential.
+          # All credentials must have some implementation of storing their token details.
           #
-          # @param resp [Hash] the response hash from the external api call for a token.
+          # @param resp [Setsuzoku::ApiResponse] the response hash from the external api call for a token.
+          # @param attrs [Hash] additional attrs to be passed to super if desired.
           #
           # @return [Hash] the attributes to assign to the credential.
-          sig{ abstract.params(resp: T::Hash[Symbol, T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
-          def token_attributes_to_assign(resp); end
-          end
+          sig { abstract.params(resp: Setsuzoku::ApiResponse, attrs: T.nilable(T::Hash[Symbol, T.untyped])).void }
+          def set_token!(resp, attrs); end
         end
       end
     end

data/lib/setsuzoku/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setsuzoku
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.3
 platform: ruby
 authors:
 - Luke Stadtler
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,7 +227,7 @@ homepage: https://github.com/rocketreferrals/setsuzoku
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.1
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Extensible 3rd-party interface and functionality plugins
 test_files: []