Skip to content

Commit

Permalink
Temp: Use unreleased solidus_support
Browse files Browse the repository at this point in the history
  • Loading branch information
mamhoff committed Jan 14, 2025
1 parent 0c1beb5 commit bf17075
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 18 deletions.
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
gem 'async', '< 3', require: false
end

# Temporarily use the `solidus_support` gem with Flickwerk support
gem "solidus_support", github: "mamhoff/solidus_support", branch: "re-enable-flickwerk"

# 'net/smtp' is required by 'mail', see:
# - https://github.com/ruby/net-protocol/issues/10
# - https://stackoverflow.com/a/72474475
Expand Down
18 changes: 1 addition & 17 deletions lib/spree/auth/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,17 @@
require 'devise'
require 'devise-encryptable'
require 'spree/auth/version'
require 'flickwerk'

module Spree
module Auth
class Engine < Rails::Engine
include SolidusSupport::EngineExtensions

include Flickwerk

isolate_namespace Spree
engine_name 'solidus_auth'

Spree.user_class = "Spree::User"

initializer "spree.auth.frontend_patch_paths", before: "flickwerk.add_paths" do
if SolidusSupport.frontend_available?
patch_paths = root.join("lib/patches/frontend").glob("*")
Flickwerk.patch_paths += patch_paths
end
end

initializer "spree.auth.backend_patch_paths", before: "flickwerk.add_paths" do
if SolidusSupport.backend_available?
patch_paths = root.join("lib/patches/backend").glob("*")
Flickwerk.patch_paths += patch_paths
end
end

initializer "spree.auth.environment", before: :load_config_initializers do |_app|
require 'spree/auth_configuration'

Expand Down
1 change: 0 additions & 1 deletion solidus_auth_devise.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
spec.add_dependency 'deface', '~> 1.0'
spec.add_dependency 'devise', '~> 4.1'
spec.add_dependency 'devise-encryptable', '0.2.0'
spec.add_dependency 'flickwerk', '~> 0.3.1'
spec.add_dependency 'solidus_core', ['>= 3', '< 5']
spec.add_dependency 'solidus_support', '~> 0.11'

Expand Down

0 comments on commit bf17075

Please sign in to comment.