fmrest-core 0.18.0.rc3 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9070ffa50e9886a1c1a46c91575c3252469ea22423bbc0658d0b4c86f325c1ac
-  data.tar.gz: 29b2bfef12c6352492aa3fbb5f19031aaf263e39dacc3e334bf6470df07de7e7
+  metadata.gz: fdfc316e5474cc3abbf196051aa48846f6b04452e0864a320445079a09a3f449
+  data.tar.gz: d23a6c290f33ab9c43f149de58af85825859aae9f0bc781200395bc883f66009
 SHA512:
-  metadata.gz: 65ea5b666e2debed130714df05a9275e991e8127d17d44dbee94a4651a05394472ab1381e1bbf35551648234a6d3c6c174fcc4fe8025ec45148bcc27a5aef495
-  data.tar.gz: bfdc063f4701eb03ed3f8e2edc7c9b2131cb6cc82175c88462debdd67891050fd53dfa160f47f35323809d6860d4a89ec341d8116791cae6d4e69b900b7715af
+  metadata.gz: 48ddb1505f075011675b5bfbeb437d42e70dff62912a6c44b0ac454c205332e8e61da6a628c0ae0cda095214d54dded125f8f98fa0af711d2e8e34b1d24332e1
+  data.tar.gz: 16623334ee707adb60e479d6db8bff23f22aa23cac397e32b839d4dceaa7aed4a2e94558684d08b1eaaa1fb008093b9628014a73b8b7dbe93f3d2cd1bc3498fc

data/CHANGELOG.md

@@ -7,6 +7,9 @@
 * Defining an attribute on a model that would collide with an existing method
   now raises an error
 * Cleared Faraday deprecation messages on authentication methods
+* Handle FileMaker Cloud case where HTTP 401 Unauthorized with content-type
+  text/html is returned after token expiry
+* Add retry option to Rescuable mixin
 * Added fmrest-ruby/VERSION to User-Agent headers
 
 ### 0.17.1

data/lib/fmrest/v1/connection.rb

@@ -39,7 +39,7 @@ module FmRest
             yield conn, settings
           else
             conn.use TypeCoercer, settings
-            conn.response :json
+            conn.response :json, content_type: /\bjson$/
           end
 
           if settings.log
@@ -70,7 +70,7 @@ module FmRest
             conn.response :logger, FmRest.logger, bodies: true, headers: true, log_level: settings.log_level
           end
 
-          conn.response :json
+          conn.response :json, content_type: /\bjson$/
           conn.adapter Faraday.default_adapter
         end
       end

data/lib/fmrest/v1/raise_errors.rb

@@ -27,6 +27,17 @@ module FmRest
       }.freeze
 
       def on_complete(env)
+        # Sometimes, especially when using FileMaker Cloud, a failed
+        # authorization request will return a 401 (Unauthorized) with text/html
+        # content-type instead of the regular JSON, so we need to catch it
+        # manually here, emulating a regular account error
+        if !(/\bjson$/ === env.response_headers["content-type"]) && env.status == 401
+          raise FmRest::APIError::AccountError.new(212, "Authentication failed (HTTP 401: Unauthorized)")
+        end
+
+        # From this point on we want JSON
+        return unless env.body.is_a?(Hash)
+
         # Sniff for either straight JSON parsing or Spyke's format
         if env.body[:metadata] && env.body[:metadata][:messages]
           check_errors(env.body[:metadata][:messages])

data/lib/fmrest/v1/token_session.rb

@@ -132,7 +132,10 @@ module FmRest
       end
 
       def auth_connection
-        @auth_connection ||= V1.auth_connection(@settings)
+        # NOTE: this is purposely not memoized so that settings can be
+        # refreshed (since proc-based settings will not be automatically
+        # re-eval'd, for example for fmid_token-based auth)
+        V1.auth_connection(@settings)
       end
     end
   end

data/lib/fmrest/v1/type_coercer.rb

@@ -21,7 +21,7 @@ module FmRest
 
       def on_complete(env)
         return unless enabled?
-        return unless env.body.kind_of?(Hash)
+        return unless env.body.is_a?(Hash)
 
         data = env.body.dig("response", "data") || env.body.dig(:response, :data)
 

data/lib/fmrest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FmRest
-  VERSION = "0.18.0.rc3"
+  VERSION = "0.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmrest-core
 version: !ruby/object:Gem::Version
-  version: 0.18.0.rc3
+  version: 0.18.0
 platform: ruby
 authors:
 - Pedro Carbajal
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -104,9 +104,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.3
 signing_key: