Load Base Controller Extension when autoloading

alchemy-devise.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "alchemy_cms", [">= 8.0.0.a", "< 9.0"]
   s.add_dependency "devise", ["~> 4.9"]
+  s.add_dependency "flickwerk", ["~> 0.3.6"]
 
   s.add_development_dependency "capybara"
   s.add_development_dependency "factory_bot_rails"

app/patches/controllers/alchemy/devise/base_controller_patch.rb

@@ -0,0 +1,20 @@
+module Alchemy
+  module Devise
+    module BaseControllerPatch
+      def self.prepended(base)
+        base.before_action(:store_user_request_time)
+      end
+
+      private
+
+      # Stores the users request time.
+      def store_user_request_time
+        if alchemy_user_signed_in?
+          current_alchemy_user.store_request_time!
+        end
+      end
+
+      Alchemy::BaseController.prepend self
+    end
+  end
+end

lib/alchemy/devise/engine.rb

@@ -1,9 +1,12 @@
 require "alchemy_cms"
 require "devise"
+require "flickwerk"
 
 module Alchemy
   module Devise
     class Engine < ::Rails::Engine
+      include Flickwerk
+
       isolate_namespace Alchemy
       engine_name "alchemy_devise"
 
@@ -16,10 +19,6 @@ class Engine < ::Rails::Engine
           "alchemy-devise.css"
         ]
       end
-
-      config.to_prepare do
-        require_relative "../../../app/controllers/alchemy/base_controller_extension"
-      end
     end
   end
 end

spec/rails_helper.rb

@@ -31,7 +31,7 @@
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
   config.use_transactional_fixtures = true
-  config.include Devise::TestHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :controller
   config.include Alchemy::Engine.routes.url_helpers
   config.include Alchemy::TestSupport::ConfigStubbing
   config.include FactoryBot::Syntax::Methods