Address code review comments

Author: zzooeeyy

lib/shopify_api/auth/session.rb

@@ -48,7 +48,7 @@ def expired?
 
       sig { returns(T::Boolean) }
       def refresh_token_expired?
-        @refresh_token_expires ? @refresh_token_expires < Time.now : false
+        @refresh_token_expires ? @refresh_token_expires < Time.now + 60 : false
       end
 
       sig do

test/auth/session_test.rb

@@ -55,13 +55,13 @@ def test_expired_with_passed_expiry_date
       def test_refresh_token_expired_with_no_expiry_date
         session = ShopifyAPI::Auth::Session.new(shop: "test-shop", refresh_token_expires: nil)
 
-        assert_equal(false, session.refresh_token_expired?)
+        refute(session.refresh_token_expired?)
       end
 
       def test_refresh_token_expired_with_future_expiry_date
         session = ShopifyAPI::Auth::Session.new(shop: "test-shop", refresh_token_expires: Time.now + 1 * 60 * 60)
 
-        assert_equal(false, session.refresh_token_expired?)
+        refute(session.refresh_token_expired?)
       end
 
       def test_refresh_token_expired_with_passed_expiry_date
@@ -70,6 +70,18 @@ def test_refresh_token_expired_with_passed_expiry_date
         assert(session.refresh_token_expired?)
       end
 
+      def test_refresh_token_expiring_within_buffer
+        session = ShopifyAPI::Auth::Session.new(shop: "test-shop", refresh_token_expires: Time.now + 59)
+
+        assert(session.refresh_token_expired?)
+      end
+
+      def test_refresh_token_expiring_immediately_before_buffer
+        session = ShopifyAPI::Auth::Session.new(shop: "test-shop", refresh_token_expires: Time.now + 61)
+
+        refute(session.refresh_token_expired?)
+      end
+
       def test_temp
         session = ShopifyAPI::Auth::Session.new(shop: "test-shop1", access_token: "token1")
 

test/test_helper.rb

@@ -88,7 +88,11 @@ def modify_context(
           response_as_struct: response_as_struct || ShopifyAPI::Context.response_as_struct,
           api_host: api_host || ShopifyAPI::Context.api_host,
           expiring_offline_access_tokens:
-            expiring_offline_access_tokens || ShopifyAPI::Context.expiring_offline_access_tokens,
+            if !expiring_offline_access_tokens.nil?
+              expiring_offline_access_tokens
+            else
+              ShopifyAPI::Context.expiring_offline_access_tokens
+            end,
         )
       end
     end