verikloak-rails 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f102e217c566e0cbe01b75979d16fd5636449c8cc38f58e35d8147be44d05d8
-  data.tar.gz: 1426fccde358d9d5440b99749debff98775cbb8d2e8492be96bf468df2ff259f
+  metadata.gz: 59774b369340238296ec1189c9512e674738abfcb26546103ebe56fd090b1c98
+  data.tar.gz: 0dcea3b1e940545a5213dadb253bc0152168eefad534d9ef8fc6c547491f783b
 SHA512:
-  metadata.gz: c72c02908f4f946f4455b80341858cf329261c7d6da24d6ac6c6ab6ca484e636c45e6bf5e5ed23c29073c327e9338e7c42189e33e942ed5192b4792c44dd7ea4
-  data.tar.gz: 9bae0bcc441bb9544a7365056f3ddf214bfe0ca4c8345c98d78ce6727cfca77ea6ad5a5511c415542f1882af7a996ce999e4e2912fc9c5203018d7d47b8d6007
+  metadata.gz: b4e0710f56702485f068937a9a3d0cfabe53694fbf1cf408de1be80d56dbdb5fd1b45ed2c280f0e3627b050f5d34c35c696ab885821757b082f6033b2b2a4608
+  data.tar.gz: 465c2f918d008ca326f67a5247c7da85655cb7544c18b3b787d6fde9ab47be661b455b5a7cbbccd98c18f1b4482707bd06e9e9a381ca2f94ed08d7d0e6448c32

data/CHANGELOG.md

@@ -5,21 +5,33 @@ 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.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+---
+
+## [0.2.5] - 2025-09-23
+
+### Added
+- Integration test coverage for missing discovery URL scenarios
+- `reset!` method for configuration cleanup in test environments
+
+### Fixed
+- Graceful handling of missing or blank discovery URLs during middleware configuration
+- Skip middleware insertion and log warning when discovery URL is not configured
+- Only configure BFF header guard when base middleware is successfully inserted
+
+### Changed
+- Improved error handling and validation for discovery URL configuration
+- Enhanced middleware insertion logic with better separation of concerns
 
 ## [0.2.4] - 2025-09-23
 
 ### Fixed
 - Package the installer template so `rails g verikloak:install` works in packaged gems (no more missing `initializer.rb.erb`).
 
----
-
 ## [0.2.3] - 2025-09-22
 
 ### Changed
 - Provide a safe default audience (`'rails-api'`) so fresh installs keep `Verikloak::Middleware` active and remain compatible with the optional `verikloak-audience` gem.
 
----
-
 ## [0.2.2] - 2025-09-21
 
 ### Added
@@ -32,8 +44,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Documentation
 - Note related gems in the installer output and README, including new configuration options for middleware ordering and BFF auto-insertion.
 
----
-
 ## [0.2.1] - 2025-09-21
 
 ### Changed

data/lib/verikloak/rails/railtie.rb

@@ -17,7 +17,7 @@ module Verikloak
       # @return [void]
       initializer 'verikloak.configure' do |app|
         stack = ::Verikloak::Rails::Railtie.send(:configure_middleware, app)
-        ::Verikloak::Rails::Railtie.send(:configure_bff_guard, stack)
+        ::Verikloak::Rails::Railtie.send(:configure_bff_guard, stack) if stack
       end
 
       # Optionally include the controller concern when ActionController loads.
@@ -37,23 +37,13 @@ module Verikloak
         # @return [ActionDispatch::MiddlewareStackProxy] configured middleware stack
         def configure_middleware(app)
           apply_configuration(app)
-          base_options = Verikloak::Rails.config.middleware_options
-          stack = app.middleware
-          if (before = Verikloak::Rails.config.middleware_insert_before)
-            stack.insert_before before,
-                                ::Verikloak::Middleware,
-                                **base_options
-          else
-            after = Verikloak::Rails.config.middleware_insert_after || ::Rails::Rack::Logger
-            if after
-              stack.insert_after after,
-                                 ::Verikloak::Middleware,
-                                 **base_options
-            else
-              stack.use ::Verikloak::Middleware, **base_options
-            end
+
+          unless discovery_url_present?
+            log_missing_discovery_url_warning
+            return
           end
-          stack
+
+          insert_base_middleware(app)
         end
 
         # Insert the optional HeaderGuard middleware when verikloak-bff is present.
@@ -92,6 +82,69 @@ module Verikloak
             c.rescue_pundit = false if !rails_cfg.key?(:rescue_pundit) && defined?(::Verikloak::Pundit)
           end
         end
+
+        # Check if discovery_url is present and valid.
+        #
+        # @return [Boolean] true if discovery_url is configured and not empty
+        def discovery_url_present?
+          discovery_url = Verikloak::Rails.config.discovery_url
+          return false unless discovery_url
+
+          return !discovery_url.blank? if discovery_url.respond_to?(:blank?)
+          return !discovery_url.empty? if discovery_url.respond_to?(:empty?)
+
+          true
+        end
+
+        # Log a warning message when discovery_url is missing.
+        # Uses Rails.logger if available, falls back to warn.
+        #
+        # @return [void]
+        def log_missing_discovery_url_warning
+          message = '[verikloak] discovery_url is not configured; skipping middleware insertion.'
+          if defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger
+            ::Rails.logger.warn(message)
+          else
+            warn(message)
+          end
+        end
+
+        # Insert the base Verikloak::Middleware into the application middleware stack.
+        # Respects the configured insertion point (before or after specified middleware).
+        #
+        # @param app [Rails::Application] the Rails application
+        # @return [ActionDispatch::MiddlewareStackProxy] the configured middleware stack
+        def insert_base_middleware(app)
+          stack = app.middleware
+          base_options = Verikloak::Rails.config.middleware_options
+
+          if (before = Verikloak::Rails.config.middleware_insert_before)
+            stack.insert_before before,
+                                ::Verikloak::Middleware,
+                                **base_options
+          else
+            insert_middleware_after(stack, base_options)
+          end
+
+          stack
+        end
+
+        # Insert middleware after a specified middleware or at the default position.
+        # Handles the case where no specific insertion point is configured.
+        #
+        # @param stack [ActionDispatch::MiddlewareStackProxy] the middleware stack
+        # @param base_options [Hash] options to pass to the middleware
+        # @return [void]
+        def insert_middleware_after(stack, base_options)
+          after = Verikloak::Rails.config.middleware_insert_after || ::Rails::Rack::Logger
+          if after
+            stack.insert_after after,
+                               ::Verikloak::Middleware,
+                               **base_options
+          else
+            stack.use ::Verikloak::Middleware, **base_options
+          end
+        end
       end
     end
   end

data/lib/verikloak/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Verikloak
   module Rails
-    VERSION = '0.2.4'
+    VERSION = '0.2.5'
   end
 end

data/lib/verikloak/rails.rb

@@ -35,6 +35,16 @@ module Verikloak
       def configure
         yield(config)
       end
+
+      # Reset configuration to its default state.
+      #
+      # Primarily intended for test environments that need to ensure a clean
+      # configuration between examples.
+      #
+      # @return [void]
+      def reset!
+        @config = nil
+      end
     end
   end
 end

metadata

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