#5100: Fix unknown format error on expired session

Author: dorner

app/controllers/application_controller.rb

@@ -15,7 +15,9 @@ class ApplicationController < ActionController::Base
 
   rescue_from ActiveRecord::RecordNotFound, with: :not_found!
 
-  rescue_from ActionController::InvalidAuthenticityToken do
+  rescue_from ActionController::InvalidAuthenticityToken, with: :session_expired
+
+  def session_expired
     flash[:error] = "Your session expired. This could be due to leaving a page open for a long time, or having multiple tabs open. Try resubmitting."
     redirect_back fallback_location: root_path
   end

app/controllers/concerns/validatable.rb

@@ -0,0 +1,13 @@
+module Validatable
+  extend ActiveSupport::Concern
+
+  included do
+    rescue_from ActionController::InvalidAuthenticityToken do
+      if action_name == 'validate'
+        render json: { valid: false }
+      else
+        session_expired
+      end
+    end
+  end
+end

app/controllers/distributions_controller.rb

@@ -6,6 +6,7 @@
 class DistributionsController < ApplicationController
   include DateRangeHelper
   include DistributionHelper
+  include Validatable
 
   before_action :enable_turbo!, only: %i[new show]
   skip_before_action :authenticate_user!, only: %i(calendar)

app/controllers/partners/family_requests_controller.rb

@@ -1,5 +1,6 @@
 module Partners
   class FamilyRequestsController < BaseController
+    include Validatable
     before_action :verify_partner_is_active
     before_action :authorize_verified_partners
 

app/controllers/partners/individuals_requests_controller.rb

@@ -1,5 +1,6 @@
 module Partners
   class IndividualsRequestsController < BaseController
+    include Validatable
     before_action :verify_partner_is_active
     before_action :authorize_verified_partners
 

app/controllers/partners/requests_controller.rb

@@ -1,5 +1,6 @@
 module Partners
   class RequestsController < BaseController
+    include Validatable
     skip_before_action :require_partner, only: [:new, :create, :validate]
     before_action :require_partner_or_org_admin, only: [:new, :create, :validate]
     layout :layout