setsuzoku 0.12.59 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e75181c6010018c0ccb02179d910c7105925bfa77be612655fd44f5990f74f
-  data.tar.gz: d9f769db0a64eb941f0edb89820bf76000af714d95a06f7d7f8478cad40582e1
+  metadata.gz: 8112cbd43e8c0b19c96ed0197a6b91ca7df547c4e8ce58bcb40f531dae3eff2b
+  data.tar.gz: 80a90a90db0ad55bc69ec5fc087319261df453c5a247fd8e0772db674a34fd22
 SHA512:
-  metadata.gz: de97461b4cfbd53e0066b11b237b676420895a9979184fcb922ad73c3016d55dd4eca505a6132b69f13746182955f4c7690fab264ac67300334d4465455c6996
-  data.tar.gz: 6900195befc6a9f5e03e190913dee68197c1a632497d3ba3bc3a2d014e7f58fab3152e6f16de9b1a6aa70b0435e9e83d17804625fe7718a831af1963950aff36
+  metadata.gz: b4ee3cc74093cd713d6a0bec429a42639cfd5b552c2038100014ccf82b5f115e60e50096453cd6e0b1f3f99e426f01a2942bc095fd07f8b67538f2e23f5f2bf8
+  data.tar.gz: e03952368397f59b1ec4a8a425e1a96ea0c7f4cc5bec67477ba25e76981ffff13af2fc507e988c92a539f02e2b4b949308bd9f2b935704ff9bb44713854510cb

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    setsuzoku (0.12.59)
-      activesupport (~> 5.0)
+    setsuzoku (0.14.1)
+      activesupport (>= 5.0, < 7)
       faraday (~> 0.11)
       nokogiri (~> 1.10)
       sorbet-runtime (~> 0.5)
@@ -10,11 +10,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.3)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     concurrent-ruby (1.1.7)
@@ -27,7 +28,7 @@ GEM
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     multipart-post (2.1.1)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
@@ -49,7 +50,7 @@ GEM
     safe_yaml (1.0.5)
     sorbet (0.5.5675)
       sorbet-static (= 0.5.5675)
-    sorbet-runtime (0.5.5935)
+    sorbet-runtime (0.5.5937)
     sorbet-static (0.5.5675-universal-darwin-14)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
@@ -58,6 +59,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

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

@@ -65,12 +65,12 @@ module Setsuzoku
                   image = open(url, 'rb')
                   Faraday::UploadIO.new(image, T.must(image).content_type, File.basename(url))
                 end
-                payload[options[:attachment_url_key]] = attachments
                 if request_properties[:request_format] == :json
                   payload[:json] = Faraday::UploadIO.new(StringIO.new(full_request), 'application/json')
                 else
                   payload.merge!(full_request)
                 end
+                payload[options[:attachment_url_key]] = attachments
                 req.body = payload
               end
             else
@@ -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{ override.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::Hash[Symbol, T.untyped]).void }
+          def set_token!; end
         end
       end
     end

data/lib/setsuzoku/version.rb

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

data/setsuzoku.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "3.8"
   spec.add_development_dependency "webmock", "3.8"
-  spec.add_runtime_dependency "activesupport", "~> 5.0"
+  spec.add_runtime_dependency "activesupport", ">= 5.0", '< 7'
   spec.add_development_dependency "sorbet", "~> 0.5"
   spec.add_runtime_dependency "sorbet-runtime", "~> 0.5"
   #TODO: we should remove httparty if we can just use faraday

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setsuzoku
 version: !ruby/object:Gem::Version
-  version: 0.12.59
+  version: 0.14.2
 platform: ruby
 authors:
 - Luke Stadtler
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: sorbet
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +227,7 @@ homepage: https://github.com/rocketreferrals/setsuzoku
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -237,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: []