Use Flickwerk for patches

Gemfile

@@ -19,6 +19,7 @@ group :test do
   gem "pg", "~> 1.0" if ENV["DB"] == "postgresql"
 end
 
+gem "solidus_support", github: "mamhoff/solidus_support", branch: "re-enable-flickwerk"
 gem "github_fast_changelog", require: false
 
 gem "standardrb", "~> 1.0", require: false

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

@@ -0,0 +1,19 @@
+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,11 @@
 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,12 +18,6 @@ class Engine < ::Rails::Engine
           "alchemy-devise.css"
         ]
       end
-
-      config.to_prepare do
-        Rails.autoloaders.main.on_load("Alchemy::BaseController") do
-          Alchemy::BaseControllerExtension
-        end
-      end
     end
   end
 end