Use expired? from shopify_api 13.3.1

santoshkpatro · Jan 23, 2024 · f69d52d · f69d52d
1 parent c653b19
commit f69d52d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/shopify_app/controller_concerns/login_protection.rb b/lib/shopify_app/controller_concerns/login_protection.rb
@@ -30,8 +30,7 @@ def activate_shopify_session
         return redirect_to_login
       end
 
-      if ShopifyApp.configuration.check_session_expiry_date && current_shopify_session.expires &&
-          current_shopify_session.expires < Time.now
+      if ShopifyApp.configuration.check_session_expiry_date && current_shopify_session.expired?
         ShopifyApp::Logger.debug("Session expired, redirecting to login")
         clear_shopify_session
         return redirect_to_login

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -58,6 +58,7 @@ def mock_session(shop: "my-shop.myshopify.com", scope: ShopifyApp.configuration.
     mock_session.stubs(:scope).returns(ShopifyAPI::Auth::AuthScopes.new(scope))
     mock_session.stubs(:shopify_session_id).returns(1)
     mock_session.stubs(:expires).returns(nil)
+    mock_session.stubs(:expired?).returns(false)
 
     mock_session
   end