Applying comments from review

Shopify · Feb 9, 2024 · a249323 · a249323
1 parent e81bc92
commit a249323
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/app/controllers/shopify_app/callback_controller.rb b/app/controllers/shopify_app/callback_controller.rb
@@ -130,11 +130,11 @@ def user_access_scopes_strategy
     end
 
     def perform_post_authenticate_jobs(session)
-      # Ensure we use the offline session to install webhooks and scripttags
-      offline_session = session.online? ? shop_session : session
+      # Ensure we use the shop session to install webhooks and scripttags
+      session_for_shop = session.online? ? shop_session : session
 
-      install_webhooks(offline_session)
-      install_scripttags(offline_session)
+      install_webhooks(session_for_shop)
+      install_scripttags(session_for_shop)
 
       perform_after_authenticate_job(session)
     end

diff --git a/test/controllers/callback_controller_test.rb b/test/controllers/callback_controller_test.rb
@@ -316,9 +316,8 @@ class CallbackControllerTest < ActionController::TestCase
 
       get :callback, params: @callback_params
       assert_response 302
-    rescue => e
+    ensure
       shop_storage.clear
-      raise e
     end
 
     test "#callback performs install_scripttags job after authentication" do