reso_api 1.8.10 → 1.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18e40c3f261c325789a3e55ba23453cc6a199ff05defabef866a7b845c8215c8
-  data.tar.gz: d124374abd3661b8ad20a71d6ff5f32df36383d0108828b5ea4f15b7270d5fa2
+  metadata.gz: e81ebb68ef64ed1eb595cf0a92fd03044c03b28e84d40a31fa49e7660ab65a08
+  data.tar.gz: 508a035516cbbf60b0d7d606a6277edcf0e72cfb063cf5f2497761f9e1b71d7f
 SHA512:
-  metadata.gz: 453c8f983d9f0332ba1e3ef31a0fcea4d9b93e01bbb3dd6230ab020b7b584b2a4643a54fe133535bca397d69e45bf5978a61fb3f68ff2fcdbd65bb7e51be6579
-  data.tar.gz: 23feeb93fe496c10ff89808e5d9d3bd6c22592db8cb492e62b0917a4876cf8b489e7b2bb55b46aff92b794b89c1e75face7c4f469b9c1bbaf171831777631e28
+  metadata.gz: 426229c6c88d7cf4e91f6237989a94b91086af2ef9ad04063638c5ac230851fdccd7a9520d6c30c587cb43009eb93505b93136bb40d2d5894d443fadce286a97
+  data.tar.gz: 56f7d6afc8f864cec994b91a1ca8906ef7b48e9209d51fa7e4a8974e03210e254d77f40ccd8e4a238653fbbc47497d6139f3d80d11f161033ac1bb9a5187babc

data/lib/reso_api/app/models/reso/api/client.rb

@@ -165,6 +165,12 @@ module RESO
           @oauth2_payload = oauth2_client.client_credentials.get_token('client_id' => client_id, 'client_secret' => client_secret, 'scope' => scope.presence)
           File.write(oauth2_token_path, @oauth2_payload.to_hash.to_json)
           return @oauth2_payload
+        rescue OAuth2::Error => e
+          # Provide detailed error message for OAuth failures
+          error_details = "OAuth token refresh failed for #{base_url}"
+          error_details += "\n  Scope attempted: #{scope.inspect}"
+          error_details += "\n  OAuth error: #{e.message}"
+          raise StandardError, error_details
         rescue => e
           raise StandardError, "Failed to refresh OAuth token: #{e.message}"
         end
@@ -180,13 +186,43 @@ module RESO
 
       def get_oauth2_payload
         if File.exist?(oauth2_token_path)
-          persisted = File.read(oauth2_token_path)
-          payload = OAuth2::AccessToken.from_hash(oauth2_client, JSON.parse(persisted))
-        else
+          begin
+            persisted = File.read(oauth2_token_path)
+            parsed = JSON.parse(persisted)
+
+            # Check if the persisted data is a valid token (has access_token or token field)
+            if parsed['access_token'].present? || parsed['token'].present?
+              payload = OAuth2::AccessToken.from_hash(oauth2_client, parsed)
+
+              # Verify the payload actually has a token
+              if payload.token.present?
+                return payload
+              end
+            end
+
+            # If we get here, the cached token is invalid - delete it and get fresh
+            File.delete(oauth2_token_path)
+          rescue JSON::ParserError, StandardError => e
+            # If there's any error reading/parsing the cached token, delete it
+            File.delete(oauth2_token_path) if File.exist?(oauth2_token_path)
+          end
+        end
+
+        # Get fresh token
+        begin
           payload = oauth2_client.client_credentials.get_token('client_id' => client_id, 'client_secret' => client_secret, 'scope' => scope.presence)
           File.write(oauth2_token_path, payload.to_hash.to_json)
+          return payload
+        rescue OAuth2::Error => e
+          # Clean up any bad cached token
+          File.delete(oauth2_token_path) if File.exist?(oauth2_token_path)
+
+          # Provide detailed error message
+          error_details = "OAuth token request failed for #{base_url}"
+          error_details += "\n  Scope attempted: #{scope.inspect}"
+          error_details += "\n  OAuth error: #{e.message}"
+          raise StandardError, error_details
         end
-        return payload
       end
 
       def uri_for_endpoint endpoint

data/lib/reso_api/version.rb

@@ -1,3 +1,3 @@
 module ResoApi
-  VERSION = "1.8.10"
+  VERSION = "1.8.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reso_api
 version: !ruby/object:Gem::Version
-  version: 1.8.10
+  version: 1.8.11
 platform: ruby
 authors:
 - Michael Edlund