address comments

Shopify · Nov 15, 2022 · 8d6547c · 8d6547c
1 parent fd87247
commit 8d6547c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/shopify_app/controller_concerns/ensure_billing.rb b/lib/shopify_app/controller_concerns/ensure_billing.rb
@@ -56,7 +56,7 @@ def has_active_payment?(session)
     end
 
     def has_subscription?(session)
-      ShopifyApp::Logger.debug("Checking if has subscription")
+      ShopifyApp::Logger.debug("Checking if shop has subscription")
       response = run_query(session: session, query: RECURRING_PURCHASES_QUERY)
       subscriptions = response.body["data"]["currentAppInstallation"]["activeSubscriptions"]
 

diff --git a/lib/shopify_app/controller_concerns/login_protection.rb b/lib/shopify_app/controller_concerns/login_protection.rb
@@ -16,8 +16,6 @@ module LoginProtection
     ACCESS_TOKEN_REQUIRED_HEADER = "X-Shopify-API-Request-Failure-Unauthorized"
 
     def activate_shopify_session
-      ShopifyApp::Logger.debug("Activating Shopify session")
-
       if current_shopify_session.blank?
         signal_access_token_required
         ShopifyApp::Logger.debug("No session found, redirecting to login")
@@ -32,6 +30,7 @@ def activate_shopify_session
       end
 
       begin
+        ShopifyApp::Logger.debug("Activating Shopify session")
         ShopifyAPI::Context.activate_session(current_shopify_session)
         yield
       ensure
@@ -49,7 +48,7 @@ def current_shopify_session
           is_online: online_token_configured?,
         )
       rescue ShopifyAPI::Errors::CookieNotFoundError
-        ShopifyApp::Logger.info("CookiesNotFound for current Shopify session")
+        ShopifyApp::Logger.info("No cookies have been found - cookie name: #{cookie_name}")
         nil
       rescue ShopifyAPI::Errors::InvalidJwtTokenError
         ShopifyApp::Logger.info("Invalid JWT token for current Shopify session")