spree_auth_devise 4.6.1 → 4.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a01a57a067f83b53429e57919cb6264127b28a10dfa7005536c2531479b5f314
-  data.tar.gz: b969026ace1d170c5ad4c23f00b78ae178a352abfd244ae3e9afdee5a8940e81
+  metadata.gz: b97089602044828092a4848d896db4f9b87e56b0b285abe120faa765de715664
+  data.tar.gz: 9cbc7a22543f2524d62d92327f2052f930767bfe7eec95ffe7288fbc9eefa30e
 SHA512:
-  metadata.gz: '09f792afd1cc2b5f2e3c39c075ad628c23e0bb4ef9b9a6ff049ec1f390bc02cb2037568517e854ed815020aa651d4842320d8fff4772d973f095cdca1afe638f'
-  data.tar.gz: b3d8113dd54a4eff67acc34c323b0a09805224a4da0414d703a28213807b341311e5d9da8d4784a33c15bbc1fe6e90b8161e8c877d43a1424f1300cfa87357e4
+  metadata.gz: 1d488965794fec05c47da9e7515cb39f0cce5924e9a9ebd33fc7475976458b272acdd612bac96dca9dd77f0d5c12c770402f7dab6b20b93eed394374d6fe05c5
+  data.tar.gz: bc18bee0f52d26b774e64375e5c51b68cf908e30a560bdeea9e7eff657bddc12a6baeb2800ddf374d2b3065a231f670763e8fecbfebd4e6a7831f0ecb55f973b

data/Gemfile

@@ -6,10 +6,14 @@ gem 'spree_backend', github: 'spree/spree_backend', branch: 'main'
 gem 'spree_emails', github: 'spree/spree', branch: 'main'
 gem 'spree_frontend', github: 'spree/spree_legacy_frontend', branch: 'main'
 
-if ENV['DB'] == 'mysql'
-  gem 'mysql2'
-else
-  gem 'pg'
+platforms :ruby do
+  if ENV['DB'] == 'mysql'
+    gem 'mysql2'
+  elsif ENV['DB'] == 'postgres'
+    gem 'pg'
+  else
+    gem 'sqlite3', '~> 1.4'
+  end
 end
 
 gem 'pry'

data/app/models/spree/user.rb

@@ -3,15 +3,16 @@ module Spree
     include UserAddress
     include UserMethods
     include UserPaymentSource
-    if defined?(Spree::Metadata)
-      include Metadata
-    end
+    include Metadata if defined?(Spree::Metadata)
 
-    devise :database_authenticatable, :registerable, :recoverable,
-           :rememberable, :trackable, :encryptable, encryptor: 'authlogic_sha512'
+    devise :database_authenticatable if Spree::Auth::Config[:database_authenticatable]
+    devise :recoverable if Spree::Auth::Config[:recoverable]
+    devise :registerable if Spree::Auth::Config[:registerable]
     devise :confirmable if Spree::Auth::Config[:confirmable]
     devise :validatable if Spree::Auth::Config[:validatable]
 
+    devise :rememberable, :trackable, :encryptable, encryptor: 'authlogic_sha512'
+
     acts_as_paranoid
     after_destroy :scramble_email_and_password
 

data/config/routes.rb

@@ -11,16 +11,29 @@ Spree::Core::Engine.add_routes do
               path_prefix: :user
 
     devise_scope :spree_user do
-      get '/login' => 'user_sessions#new', :as => :login
-      post '/login' => 'user_sessions#create', :as => :create_new_session
       get '/logout' => 'user_sessions#destroy', :as => :logout
-      get '/signup' => 'user_registrations#new', :as => :signup
-      post '/signup' => 'user_registrations#create', :as => :registration
-      get '/password/recover' => 'user_passwords#new', :as => :recover_password
-      post '/password/recover' => 'user_passwords#create', :as => :reset_password
-      get '/password/change' => 'user_passwords#edit', :as => :edit_password
-      put '/password/change' => 'user_passwords#update', :as => :update_password
-      get '/confirm' => 'user_confirmations#show', :as => :confirmation
+
+      if Spree::Auth::Config[:database_authenticatable]
+        get '/login' => 'user_sessions#new', :as => :login
+        post '/login' => 'user_sessions#create', :as => :create_new_session
+
+        get '/password/change' => 'user_passwords#edit', :as => :edit_password
+        put '/password/change' => 'user_passwords#update', :as => :update_password
+      end
+
+      if Spree::Auth::Config[:registerable]
+        get '/signup' => 'user_registrations#new', :as => :signup
+        post '/signup' => 'user_registrations#create', :as => :registration
+      end
+
+      if Spree::Auth::Config[:recoverable]
+        get '/password/recover' => 'user_passwords#new', :as => :recover_password
+        post '/password/recover' => 'user_passwords#create', :as => :reset_password
+      end
+
+      if Spree::Auth::Config[:confirmable]
+        get '/confirm' => 'user_confirmations#show', :as => :confirmation
+      end
     end
 
     if Spree::Core::Engine.frontend_available?
@@ -33,12 +46,13 @@ Spree::Core::Engine.add_routes do
     if Spree.respond_to?(:admin_path) && Spree::Core::Engine.backend_available?
       namespace :admin, path: Spree.admin_path do
         devise_for :spree_user,
-                  class_name: Spree.user_class.to_s,
+                  class_name: Spree.admin_user_class.to_s,
                   controllers: { sessions: 'spree/admin/user_sessions',
-                                    passwords: 'spree/admin/user_passwords' },
+                                   passwords: 'spree/admin/user_passwords' },
                   skip: [:unlocks, :omniauth_callbacks, :registrations],
                   path_names: { sign_out: 'logout' },
                   path_prefix: :user
+
         devise_scope :spree_user do
           get '/authorization_failure', to: 'user_sessions#authorization_failure', as: :unauthorized
           get '/login' => 'user_sessions#new', :as => :login

data/db/default/users.rb

@@ -71,7 +71,7 @@ end
 
 if Spree::User.admin.empty?
   create_admin_user
-else
+elsif !ENV['AUTO_ACCEPT']
   puts 'Admin user has already been previously created.'
   if agree('Would you like to create a new admin user? (yes/no)')
     create_admin_user

data/lib/controllers/frontend/spree/users_controller.rb

@@ -1,6 +1,5 @@
 class Spree::UsersController < Spree::StoreController
   before_action :set_current_order, except: :show
-  prepend_before_action :authorize_actions, only: :new
 
   include Spree::Core::ControllerHelpers
 

data/lib/spree/auth/configuration.rb

@@ -4,12 +4,18 @@ module Spree
       attr_accessor :registration_step,
                     :signout_after_password_change,
                     :confirmable,
+                    :database_authenticatable,
+                    :recoverable,
+                    :registerable,
                     :validatable
 
       def initialize
         self.registration_step = true
         self.signout_after_password_change = true
         self.confirmable = false
+        self.database_authenticatable = true
+        self.recoverable = true
+        self.registerable = true
         self.validatable = true
       end
 

data/lib/spree/auth/version.rb

@@ -1,6 +1,6 @@
 module Spree
   module Auth
-    VERSION = '4.6.1'.freeze
+    VERSION = '4.6.3'.freeze
 
     def gem_version
       Gem::Version.new(VERSION)

data/lib/views/frontend/spree/user_sessions/new.html.erb

@@ -7,9 +7,12 @@
           <%= render partial: 'spree/shared/login' %>
           <div data-hook="login_extras"></div>
         </div>
-        <div class="col-lg-11 mx-auto" data-hook="registration">
-          <%= render partial: 'spree/shared/registration', locals: { registration_button: 'registration-button' } %>
-        </div>
+
+        <% if Spree::Auth::Config[:registerable] %>
+          <div class="col-lg-11 mx-auto" data-hook="registration">
+            <%= render partial: 'spree/shared/registration', locals: { registration_button: 'registration-button' } %>
+          </div>
+        <% end %>
       </div>
     </div>
   </div>

data/spec/models/user_spec.rb

@@ -106,6 +106,8 @@ RSpec.describe Spree::User, type: :model do
   describe "#send_confirmation_instructions", retry: 2 do
     let(:default_store) { Spree::Store.default }
 
+    before { Rails.application.reload_routes! }
+
     context "when current store not exists" do
       it 'takes default store and sends confirmation instruction', confirmable: true do
         user = Spree.user_class.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.3
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -212,9 +212,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_auth_devise/issues
-  changelog_uri: https://github.com/spree/spree_auth_devise/releases/tag/v4.6.1
+  changelog_uri: https://github.com/spree/spree_auth_devise/releases/tag/v4.6.3
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.6.1
+  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.6.3
 post_install_message:
 rdoc_options: []
 require_paths: