Redirect loop after approving billing charge

[elioncho]

Issue summary

Before opening this issue, I have:

• Upgraded to the latest version of the package
  • shopify_app version: 22.2.1
  • Ruby version: 3.3.0
  • Operating system: macOS Catalina
• [x] Set log_level: :debug in my configuration, if applicable
• [x] Found a reliable way to reproduce the problem that indicates it's a problem with the package
• [x] Looked for similar issues in this repository
• [x] Checked that this isn't an issue with a Shopify API
  • If it is, please create a post in the Shopify community forums or report it to Shopify Partner Support

I am using the latest version of the gem with authentication done via TokenExchange. After approving the billing charge, my app gets into an infinite loop.

routes.rb:

  root to: "home#index"
  get '/home', to: 'home#index'

home_controller.rb

class HomeController < AuthenticatedController
  def index; end
end

authenticated_controller.rb

class AuthenticatedController < ApplicationController
  include ShopifyApp::EnsureAuthenticatedLinks
  include ShopifyApp::EnsureHasSession

  before_action :set_shop_origin

  helper_method :current_shop

  def current_shop
    @current_shop ||= Shop.find_by(shopify_domain: current_shopify_domain)
  end

  def default_url_options
    { shop: @shop_origin }
  end

  private

  def set_shop_origin
    @shop_origin = current_shopify_domain
  end
end

In the image you can see the redirects. It looks like the id_token is not present.

Expected behavior

My app should show the home view.

Actual behavior

Infinite loop since id_token is not found. The ShopifyApp::EnsureAuthenticatedLinks redirects to the splash screen, which in my app is the same home controller.

[elioncho]

I changed the order of the include statements and it worked.

class AuthenticatedController < ApplicationController
  include ShopifyApp::EnsureHasSession
  include ShopifyApp::EnsureAuthenticatedLinks
...
..
.