setsuzoku 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 576427e8c71dfaf7306d5c7de069440bc47f4d8d9de185f3eb230a8304ea8162
-  data.tar.gz: 24fc28270185bca4db25ac804b783e28ec2e6c505c17e545e35625cc2695ca8e
+  metadata.gz: 3e0e78fe9c055eb1696a1df750b36fad06363646e465a3cbe4e86da69cd75215
+  data.tar.gz: 5f3c4c99f1587492b7c552205a4bfc99ff1b29631346f50206216a397686e90a
 SHA512:
-  metadata.gz: 66c24bc8e924754a8b47fff0180ebd8ea73c7f42d1ddfe9694c3600850870514b6357a87f86c6b820b657e5393a081ab68d635534a2555dcc10419243540c2d7
-  data.tar.gz: f55aae400065ab41b8f5d98e66154f80ca044c8de60cd552b3e29fd3d8d9895d09a930bf9a3e7253d2d5ce835062a75ec89f26cde7275419bda7f0a389dc11f9
+  metadata.gz: b0d1a53b0552e7cbf2941933a80cce484f1c5c4d606fd806d230692045acb6bb6bd11b42c3427ec603353d4380af690764cfc3f1fe0f5511082fdd0bd0dcb150
+  data.tar.gz: 3c1f8a24908d294f221bb7bdb8c0d731693b1e43b10e42b4b6457f66dcff3fb7f15d171cead30f8bfbf6ad8098283059c1a476a807261a8868ca9134a7308145

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    setsuzoku (0.11.5)
+    setsuzoku (0.11.6)
       activesupport (~> 5.0)
       faraday (~> 0.11)
       httparty (~> 0.16.4)
@@ -57,7 +57,7 @@ GEM
     safe_yaml (1.0.5)
     sorbet (0.5.5675)
       sorbet-static (= 0.5.5675)
-    sorbet-runtime (0.5.5862)
+    sorbet-runtime (0.5.5878)
     sorbet-static (0.5.5675-universal-darwin-14)
     thread_safe (0.3.6)
     tzinfo (1.2.7)

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

@@ -114,34 +114,23 @@ module Setsuzoku
 
             resp = self.api_strategy.call_external_api(request: request, strategy: :auth)
 
+            attrs = {}
             if resp.data && resp.data[:access_token]
-              self.credential.status = 'active' if self.credential.respond_to?(:"status=")
-              self.credential.token = resp.data[:access_token]
-              self.credential.refresh_token = resp.data[:refresh_token] if resp.data.key?(:refresh_token)
-              self.credential.expires_on = if resp.data[:expires_in]
-                                             resp.data[:expires_in].to_i.seconds.from_now
-                                           # elsif resp.data[:issued_at] && self.class.token_valid_for
-                                           #   Time.at(resp.data[:issued_at].to_i / 1000) + self.class.token_valid_for
-                                           end
-
-              self.plugin.set_credential_fields!(resp) if self.plugin.respond_to?(:set_credential_fields!)
-
-              #TODO: figure out a better way to do this  when we add other integrations...
-              #
-              # if self.is_a?(FacebookIntegration)
-              #   resp = self.exchange_for_long_lived_token
-              #   if resp && resp.data['access_token']
-              #     self.token = resp.data['access_token']
-              #     self.refresh_token = resp.data['access_token']
-              #     self.expires_on = 59.days.from_now
-              #   end
-              # end
+              attrs[:status] = 'active' if self.credential.respond_to?(:"status=")
+              attrs[:access_token] = resp.data[:access_token]
+              attrs[:refresh_token] = resp.data[:refresh_token] if resp.data.key?(:refresh_token)
+              attrs[:expires_on] = resp.data[:expires_in].to_i.seconds.from_now if resp.data[:expires_in]
+
+              plugin_attrs = self.plugin.credential_fields_to_update(resp) if self.plugin.respond_to?(:credential_fields_to_update)
+              attrs.merge!(plugin_attrs)
             else
-              self.credential.status = 'error' if self.credential.respond_to?(:"status=")
+              attrs[:status] = 'error' if self.credential.respond_to?(:"status=")
             end
 
-            if self.credential.respond_to?(:"save")
-              self.credential.save && resp.success
+            # Only save Setsuzoku known fields, and any additional attributes the plugin specifies
+            # in credential_fields_to_update.
+            if self.credential.respond_to?(:"update_attributes")
+              self.credential.update_attributes(attrs) && resp.success
             else
               resp.success
             end

data/lib/setsuzoku/version.rb

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

metadata

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