magick-feature-flags 0.9.31 → 0.9.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0402a730af6ca869734deeddd446aa07e86bd54f3b05eeafbbc3d80dd741bbb
-  data.tar.gz: 340f12044c58457665cb6c0cb7a4d00e52475d1613463e282931381f7c39d5be
+  metadata.gz: 569716421c0b2750ca21203df7f29b3110cba2d02344ec6cf93224d8d4c8ff07
+  data.tar.gz: 61765b4d07852b6f2563b574969d5c4e8ae4b35206f98ed2cce9a8f2e151acd8
 SHA512:
-  metadata.gz: 2de6d3ad8267b993ba5b3b2633359e9afa9a7d0dabd730585d3603a412c5b6dd57fef464061b10e61332ae1894df6bb31c559e5fc11b66fdca47eb9ec63a0bd5
-  data.tar.gz: ca3a298cd3cd12b4ccaf21776356ea46e7092ca8178e8096dadc526ec416b300006a3bf7c35be780a0c8629d0e662fcdf731f3110df2c4ddb9367c1fafcfcdbd
+  metadata.gz: f36f551cf9d88e3ca262f856d89859eb117626e1ee00a5396464100f2f742d0f70e19ea297082d8dcc55cb4da14c2a06b79f06246393f57193fe51c9c9334baf
+  data.tar.gz: 62400cc86de0bdb7110c206abb1f7a9f24290d20569df7de7d6190e145f759bc5083ac536b22a1beae9cf1e08b04b1e8ae46fe1abeaaa330b84a098049eecfc0

data/lib/magick/admin_ui/engine.rb

@@ -12,21 +12,18 @@ end
 module Magick
   module AdminUI
     class Engine < ::Rails::Engine
-      # Removed isolate_namespace to prevent interference with Warden/Devise middleware
-      # isolate_namespace can create a separate middleware stack that breaks Warden authentication
-      # Instead, we'll rely on the namespace in routes and controllers to keep things organized
-      # isolate_namespace Magick::AdminUI
+      isolate_namespace Magick::AdminUI
 
       engine_name 'magick_admin_ui'
 
-      # Ensure the engine doesn't interfere with Warden/Devise middleware
-      # Rails engines by default inherit middleware from the main app, which is what we want
-      # We explicitly don't add, modify, or override any middleware that could affect Warden/Devise
-      # The engine should work alongside existing authentication middleware without modification
+      # Critical fix: Prevent the engine from interfering with Warden/Devise
+      # Rails engines with isolate_namespace create their own middleware stack
+      # This can break Warden/Devise in the main app if not handled correctly
+      # We ensure the engine doesn't modify the main app's middleware or request handling
 
-      # Critical: Don't add any middleware that could interfere with Warden/Devise
-      # The engine must use the main app's middleware stack to avoid breaking authentication
-      # Rails engines inherit middleware by default, so we don't need to do anything special
+      # Don't add any middleware that could interfere
+      # The engine will use its own middleware stack (due to isolate_namespace)
+      # but this shouldn't affect the main app's middleware stack
 
       # Rails engines automatically detect app/views and app/controllers directories
       # With isolate_namespace, views should be at:

data/lib/magick/config.rb

@@ -196,9 +196,14 @@ module Magick
       Magick.warn_on_deprecated = warn_on_deprecated
 
       # Load optional components if enabled
+      # Delay Admin UI loading until after Warden/Devise is set up to avoid interference
       return unless @enable_admin_ui && defined?(Rails)
 
-      require_relative '../magick/admin_ui' unless defined?(Magick::AdminUI)
+      # Load Admin UI in an initializer that runs after Warden/Devise setup
+      # This prevents the engine from interfering with authentication middleware
+      Rails.application.config.after_initialize do
+        require_relative '../magick/admin_ui' unless defined?(Magick::AdminUI)
+      end
     end
 
     private

data/lib/magick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '0.9.31'
+  VERSION = '0.9.32'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magick-feature-flags
 version: !ruby/object:Gem::Version
-  version: 0.9.31
+  version: 0.9.32
 platform: ruby
 authors:
 - Andrew Lobanov