verikloak-bff 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 255d2d606e30f92f8c562d91d975be06975a7ba373bd607aa5057e5abcc279a6
-  data.tar.gz: 6f81b6407f5a1a6e5d307cb65981f48e12c5356ec411ba05d21829681bedb084
+  metadata.gz: 8fbec3da2912582f3684c1682fb75b45f9d26c3a1ebf3b7a41d4a5392fbe36c1
+  data.tar.gz: d1b5b9f750bd3cdbbf3308f1581c8327c039f87b660cde73a799a83740f818ae
 SHA512:
-  metadata.gz: 995250cf2096de074988c0a00d4c2de0ff4b03c798089acfd0f0e0e5e3c0cdc3717da82f4f85be74db68fe40ced3cda5c27ae9f14ae41385a38a24e2eb9c4814
-  data.tar.gz: 157ddfbc41d48b9903b59f732ef8128a4d27127fee098d4a6e2388ca713ce15a749acad287b4995f87515d70233f74d4f44f7ac9d289de34d548d26bef3e9d17
+  metadata.gz: 33655caab83ec29f7159264b660aadb878a61c3ca52c4f23e4256cdb30519384833d7ea8244de5c8252368227ef3999691eb1aa282d907c42e94db69fb39ecb3
+  data.tar.gz: d1442646ce08bd0a98ca211f781f0ba623d58d51323ed86492c01cee60086a27c5f27c1fd8d65e4b7ab5ea10c52a9bf6b4942e09c0be80cc8e4d250d6bfb4f48

data/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [0.2.2] - 2025-09-23
+
+### Changed
+- Improved middleware class extraction logic to reduce code duplication while maintaining functionality
+
 ## [0.2.1] - 2025-09-23
 
 ### Fixed

data/lib/verikloak/bff/rails.rb

@@ -29,6 +29,13 @@ module Verikloak
         #     logger: Rails.logger
         #   )
         def insert_after_core(stack, logger: nil)
+          return false unless auto_insert_enabled?
+
+          unless core_present?(stack)
+            log_skip(logger)
+            return false
+          end
+
           stack.insert_after(::Verikloak::Middleware, ::Verikloak::BFF::HeaderGuard)
           true
         rescue RuntimeError => e
@@ -38,6 +45,79 @@ module Verikloak
           false
         end
 
+        # Determine whether automatic insertion is enabled via Verikloak core configuration.
+        #
+        # When the core gem exposes +auto_insert_bff_header_guard+, respect that flag so
+        # consumers can opt out of automatic middleware wiring without triggering warnings.
+        # Any failures while reading configuration default to enabling insertion in order
+        # to preserve the previous behavior.
+        #
+        # @return [Boolean]
+        def auto_insert_enabled?
+          return true unless defined?(::Verikloak)
+          return true unless ::Verikloak.respond_to?(:config)
+
+          config = ::Verikloak.config
+          return true unless config
+          return config.auto_insert_bff_header_guard if config.respond_to?(:auto_insert_bff_header_guard)
+
+          true
+        rescue StandardError
+          true
+        end
+
+        # Detect whether the Verikloak core middleware is already present in the stack.
+        #
+        # @param stack [#include?, #each, nil]
+        # @return [Boolean]
+        def core_present?(stack)
+          return false unless stack
+
+          if stack.respond_to?(:include?)
+            begin
+              return true if stack.include?(::Verikloak::Middleware)
+            rescue StandardError
+              # Fall back to manual enumeration when include? is unsupported for this stack
+            end
+          end
+
+          return false unless stack.respond_to?(:each)
+
+          stack.each do |middleware|
+            return true if middleware_matches_core?(middleware)
+          end
+
+          false
+        end
+
+        # Check whether a middleware entry represents the Verikloak core middleware.
+        #
+        # @param middleware [Object]
+        # @return [Boolean]
+        def middleware_matches_core?(middleware)
+          candidate = middleware.is_a?(Array) ? middleware.first : middleware
+
+          klass = extract_middleware_class(candidate)
+
+          klass == ::Verikloak::Middleware ||
+            (klass.is_a?(String) && klass == 'Verikloak::Middleware') ||
+            (klass.respond_to?(:name) && klass.name == 'Verikloak::Middleware')
+        end
+
+        # Extracts the class or class-like identifier from a middleware candidate.
+        #
+        # @param candidate [Object]
+        # @return [Class, String, Object]
+        def extract_middleware_class(candidate)
+          if candidate.respond_to?(:klass)
+            candidate.klass
+          elsif candidate.respond_to?(:name)
+            candidate.name
+          else
+            candidate
+          end
+        end
+
         # Checks if the error indicates missing core Verikloak middleware
         #
         # Examines a RuntimeError to determine if it was caused by attempting
@@ -75,11 +155,7 @@ module Verikloak
             [verikloak-bff] Skipping Verikloak::BFF::HeaderGuard insertion because Verikloak::Middleware is not present. Configure verikloak-rails discovery settings and restart once core verification is enabled.
           MSG
 
-          if logger
-            logger.warn(message)
-          else
-            warn(message)
-          end
+          logger ? logger.warn(message) : warn(message)
         end
       end
     end

data/lib/verikloak/bff/version.rb

@@ -5,6 +5,6 @@
 # @return [String]
 module Verikloak
   module BFF
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: verikloak-bff
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - taiyaky
@@ -98,7 +98,7 @@ metadata:
   source_code_uri: https://github.com/taiyaky/verikloak-bff
   changelog_uri: https://github.com/taiyaky/verikloak-bff/blob/main/CHANGELOG.md
   bug_tracker_uri: https://github.com/taiyaky/verikloak-bff/issues
-  documentation_uri: https://rubydoc.info/gems/verikloak-bff/0.2.1
+  documentation_uri: https://rubydoc.info/gems/verikloak-bff/0.2.2
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: