reso_api 1.8.9 → 1.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b26043f928133bc54314e5b591600fc425a8302a883c0578bb2597d9f94e03e0
-  data.tar.gz: 816b9c11a937a44e7ea0644ddf1f724c43d7d77e9104ca02f596455769621b9a
+  metadata.gz: e81ebb68ef64ed1eb595cf0a92fd03044c03b28e84d40a31fa49e7660ab65a08
+  data.tar.gz: 508a035516cbbf60b0d7d606a6277edcf0e72cfb063cf5f2497761f9e1b71d7f
 SHA512:
-  metadata.gz: aa952c785b3e828357423537c8d0b161644ed8d0ca9eefdd4b22e65c0ad7e4dff22e233a8518397f2fb356e38d8c4a3066b08f97df622b9c088d48c3f0fa7976
-  data.tar.gz: 5f2e5b8e68e89554201e323fb4fcf94ef02242fdf89d545cf250a211d1e9f572e9324dda3d500c70eb16d4b9eda906f0c74baea674500e94679c8bb9c1215375
+  metadata.gz: 426229c6c88d7cf4e91f6237989a94b91086af2ef9ad04063638c5ac230851fdccd7a9520d6c30c587cb43009eb93505b93136bb40d2d5894d443fadce286a97
+  data.tar.gz: 56f7d6afc8f864cec994b91a1ca8906ef7b48e9209d51fa7e4a8974e03210e254d77f40ccd8e4a238653fbbc47497d6139f3d80d11f161033ac1bb9a5187babc

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

@@ -5,6 +5,7 @@ module RESO
       require 'net/http'
       require 'oauth2'
       require 'json'
+      require 'jwt'
       require 'tmpdir'
 
       attr_accessor :access_token, :client_id, :client_secret, :auth_url, :base_url, :scope, :osn
@@ -109,7 +110,31 @@ module RESO
       end
 
       def auth_token
-        access_token.presence ? access_token : oauth2_token
+        # If access_token is provided, check if it's expired
+        if access_token.present?
+          # Try to decode as JWT to check expiration
+          begin
+            token = JWT.decode(access_token, nil, false)
+            exp_timestamp = Hash(token.try(:first))["exp"].to_s
+            expiration = DateTime.strptime(exp_timestamp, '%s').utc rescue nil
+
+            # If token is expired and we have OAuth credentials, get a fresh token
+            if expiration && expiration <= DateTime.now.utc && can_use_oauth?
+              return oauth2_token
+            end
+          rescue JWT::DecodeError
+            # Not a JWT token, just use it as-is
+          end
+
+          return access_token
+        end
+
+        # No access_token provided, use OAuth flow
+        oauth2_token
+      end
+
+      def can_use_oauth?
+        client_id.present? && client_secret.present? && auth_url.present?
       end
 
       def oauth2_client
@@ -136,9 +161,19 @@ module RESO
       end
 
       def fresh_oauth2_payload
-        @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
+        begin
+          @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
       end
 
       def oauth2_token_path
@@ -151,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
@@ -189,8 +254,9 @@ module RESO
             fresh_oauth2_payload
             raise StandardError
           elsif response.is_a?(Hash) && response.has_key?("error")
-            puts "Error: #{response.inspect}" if debug
-            raise StandardError
+            error_msg = response.inspect
+            puts "Error: #{error_msg}" if debug
+            raise StandardError, error_msg
           elsif response.is_a?(Hash) && response.has_key?("retry-after")
             puts "Error: Retrying in #{response["retry-after"].to_i}} seconds." if debug
             sleep response["retry-after"].to_i

data/lib/reso_api/version.rb

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

data/reso_api.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_dependency 'activesupport'
   spec.add_dependency "oauth2"
+  spec.add_dependency "jwt"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: reso_api
 version: !ruby/object:Gem::Version
-  version: 1.8.9
+  version: 1.8.11
 platform: ruby
 authors:
 - Michael Edlund
 bindir: exe
 cert_chain: []
-date: 2025-04-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby wrapper for easy interaction with a RESO Web API compliant server.
 email:
 - medlund@mac.com
@@ -121,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.7.2
 specification_version: 4
 summary: RESO Web API Wrapper
 test_files: []