Add fix for weird csrf problems in updated version of rails

modeset · May 3, 2021 · 28ad383 · 28ad383
1 parent ba01dd2
commit 28ad383
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/app/helpers/adminsimple/modules/application_helper.rb b/app/helpers/adminsimple/modules/application_helper.rb
@@ -0,0 +1,8 @@
+module Adminsimple::Modules::ApplicationHelper
+  def rescued_csrf_meta_tags
+    csrf_meta_tags
+  rescue ArgumentError
+    request.reset_session
+    csrf_meta_tags
+  end
+end
diff --git a/app/views/layouts/adminsimple/application.html.haml b/app/views/layouts/adminsimple/application.html.haml
@@ -5,7 +5,7 @@
     %meta{ charset: "UTF-8" }
     %meta{ name: "viewport", content: "width=device-width, initial-scale=1.0" }
     = render partial: "/adminsimple/layout/head"
-    = csrf_meta_tags
+    = rescued_csrf_meta_tags
     :javascript
       if(typeof Storage !== undefined && localStorage.theme) {document.querySelector('html').setAttribute('id', "adminsimple_" + localStorage.theme);}
     = stylesheet_link_tag 'adminsimple'

diff --git a/app/views/layouts/adminsimple/devise.html.haml b/app/views/layouts/adminsimple/devise.html.haml
@@ -4,7 +4,7 @@
     %title= t('adminsimple.site_name')
     %meta{ charset: "UTF-8" }
     %meta{ name: "viewport", content: "width=device-width, initial-scale=1.0" }
-    = csrf_meta_tags
+    = rescued_csrf_meta_tags
     :javascript
       if(typeof Storage !== undefined && localStorage.theme) {document.querySelector('html').setAttribute('id', "adminsimple_" + localStorage.theme);}
     = stylesheet_link_tag 'adminsimple'

diff --git a/lib/adminsimple/version.rb b/lib/adminsimple/version.rb
@@ -1,3 +1,3 @@
 module Adminsimple
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end