Merge remote-tracking branch 'origin' into refactor/shared

Author: ElMassimo

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.2.0] - 2024-06-19
+
+* Refactor the internals of shared Inertia data to use controller instance variables instead of module level variables that run a higher risk of being leaked between requests. Big thanks to @ledermann for the initial work many years ago and to @PedroAugustoRamalhoDuarte for finishing it up!
+* Change the Inertia response to set the `Vary` header to `X-Inertia` instead of `Accept`, Thanks @osbre!
+* Always set the `XSRF-TOKEN` in an `after_action` request instead of only on non-Inertia requests. This fixes a bug where logging out (and resetting the session) via Inertia would create a CSRF token mismatch on a subsequent Inertia request (until you manually hard refreshed the page). Thanks @jordanhiltunen!
+
 ## [3.1.4] - 2024-04-28
 
 * Reset Inertia shared data after each RSpec example where `inertia: true` is used. Thanks @coreyaus!

lib/inertia_rails/middleware.rb

@@ -19,7 +19,7 @@ def response
         status, headers, body = @app.call(@env)
         request = ActionDispatch::Request.new(@env)
 
-        # Inertia errors are added to the session via redirect_to 
+        # Inertia errors are added to the session via redirect_to
         request.session.delete(:inertia_errors) unless keep_inertia_errors?(status)
 
         status = 303 if inertia_non_post_redirect?(status)
@@ -96,4 +96,3 @@ def copy_xsrf_to_csrf!
     end
   end
 end
-

lib/inertia_rails/renderer.rb

@@ -26,7 +26,7 @@ def initialize(component, controller, request, response, render_method, props: n
 
     def render
       if @request.headers['X-Inertia']
-        @response.set_header('Vary', 'Accept')
+        @response.set_header('Vary', 'X-Inertia')
         @response.set_header('X-Inertia', 'true')
         @render_method.call json: page, status: @response.status, content_type: Mime[:json]
       else

lib/inertia_rails/version.rb

@@ -1,3 +1,3 @@
 module InertiaRails
-  VERSION = "3.1.4"
+  VERSION = "3.2.0"
 end

spec/dummy/app/controllers/inertia_conditional_sharing_controller.rb

@@ -0,0 +1,22 @@
+class InertiaConditionalSharingController < ApplicationController
+  before_action :conditionally_share_props, only: [:show]
+  inertia_share normal_shared_prop: 1
+
+  def index
+    render inertia: 'EmptyTestComponent', props: {
+      index_only_prop: 1,
+    }
+  end
+
+  def show
+    render inertia: 'EmptyTestComponent', props: {
+      show_only_prop: 1,
+    }
+  end
+
+  protected
+
+  def conditionally_share_props
+    self.class.inertia_share conditionally_shared_show_prop: 1
+  end
+end

spec/dummy/app/controllers/inertia_share_test_controller.rb

@@ -4,11 +4,17 @@ class InertiaShareTestController < ApplicationController
   inertia_share do
     {
       position: 'center',
-      number: 29,
+      number: number,
     }
   end
-  
+
   def share
     render inertia: 'ShareTestComponent'
   end
+
+  private
+
+  def number
+    29
+  end
 end

spec/dummy/app/controllers/inertia_test_controller.rb

@@ -64,4 +64,8 @@ def content_type_test
       format.xml { render xml: [ 1, 2, 3 ] }
     end
   end
+
+  def redirect_to_share_test
+    redirect_to share_path
+  end
 end

spec/dummy/config/application.rb

@@ -34,4 +34,3 @@ class Application < Rails::Application
     config.secret_key_base = SecureRandom.hex
   end
 end
-

spec/dummy/config/environments/test.rb

@@ -29,7 +29,7 @@
   config.cache_store = :null_store
 
   # Raise exceptions instead of rendering exception templates.
-  config.action_dispatch.show_exceptions = false
+  config.action_dispatch.show_exceptions = :none
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false

spec/dummy/config/routes.rb

@@ -34,6 +34,7 @@
   get 'default_component_test' => 'inertia_rails_mimic#default_component_test'
   get 'provided_props_test' => 'inertia_rails_mimic#provided_props_test'
 
+  post 'redirect_to_share_test' => 'inertia_test#redirect_to_share_test'
   inertia 'inertia_route' => 'TestComponent'
 
   get 'merge_shared' => 'inertia_merge_shared#merge_shared'
@@ -46,4 +47,7 @@
   get 'initialize_session' => 'inertia_session_continuity_test#initialize_session'
   post 'submit_form_to_test_csrf' => 'inertia_session_continuity_test#submit_form_to_test_csrf'
   delete 'clear_session' => 'inertia_session_continuity_test#clear_session'
+
+  get 'conditional_share_index' => 'inertia_conditional_sharing#index'
+  get 'conditional_share_show' => 'inertia_conditional_sharing#show'
 end