AP-282 fix expiration issue

CHANGES.md

@@ -1,3 +1,7 @@
+# 4.1.0 (2025-01-10)
+
+- Fixed token refresh function and test
+
 # 4.0.0 (2025-01-08)
 
 - Update from Worldcat API v1 to API v2

lib/berkeley_library/location/module_info.rb

@@ -7,7 +7,7 @@ module ModuleInfo
       SUMMARY = 'Locaton-related utilities for the UC Berkeley Library'.freeze
       DESCRIPTION = 'A collection of location-related utilities for the UC Berkeley Library'.freeze
       LICENSE = 'MIT'.freeze
-      VERSION = '4.0.0'.freeze
+      VERSION = '4.1.0'.freeze
       HOMEPAGE = 'https://github.com/BerkeleyLibrary/location'.freeze
     end
   end

lib/berkeley_library/location/world_cat/oclc_auth.rb

@@ -10,6 +10,7 @@ class OCLCAuth
         attr_accessor :token
 
         def initialize
+          # Sorry Rubocop - needs to be ||= because we're dealing with a singleton
           # rubocop:disable Lint/DisjunctiveAssignmentInConstructor
           @token ||= fetch_token
           # rubocop:enable Lint/DisjunctiveAssignmentInConstructor:
@@ -29,18 +30,13 @@ def fetch_token
           JSON.parse(response.body, symbolize_names: true)
         end
 
-        # def token
-        #   @token = get_token if token_expired?
-        #   @token
-        # end
-
         def oclc_token_url
           URI.parse("#{Config.token_uri}?#{URI.encode_www_form(token_params)}")
         end
 
         # Before every request check if the token is expired (OCLC tokens expire after 20 minutes)
         def access_token
-          @token = token if token_expired?
+          @token = fetch_token if token_expired?
           @token[:access_token]
         end
 

spec/berkeley_library/location/world_cat/oclc_auth_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'time'
 
 module BerkeleyLibrary
   module Location
@@ -12,17 +13,26 @@ module WorldCat
           end
         end
 
-        it 'refreshes a token' do
+        it 'refreshes an expired token' do
           VCR.use_cassette('oclc_auth/refresh_token') do
+            # First get a token....
             token = OCLCAuth.instance.token
 
             # Need to set the token expiration to a time in the past
-            token[:expires_at] = (Time.now - 1).to_s
+            token[:expires_at] = (Time.now - 60).to_s
+            token[:access_token] = 'expired_token'
+
+            # Now we need to set the token instance to the token with the updated expiration
             OCLCAuth.instance.token = token
 
+            # Trigger a refresh by calling access_token
             OCLCAuth.instance.access_token
 
-            expect(OCLCAuth.instance.token[:access_token]).to be_a(String)
+            # Now check that the token has been refreshed
+            token = OCLCAuth.instance.token
+
+            expect(token[:access_token]).not_to eq('expired_token')
+            expect(Time.parse(token[:expires_at])).to be >= Time.now
           end
         end