spree_auth_devise 4.3.2 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 632dbf0ba8467163e8cff132261a9173f5c4a9b9b670c3e93599d66bb07575a1
-  data.tar.gz: 2e400ddce6368507961c686f4e094eb9c09ab47ebb8ecd97ade3c1f425e5ce5d
+  metadata.gz: 88bd67ceeb209cf0a5429d736103ffad339942eefd7cf7f75d6b84dfbb25a553
+  data.tar.gz: 261b34f941e7f6584dfa9fb4a50dc76c8b4aae6f9785db618ef630da1f881312
 SHA512:
-  metadata.gz: b07a757183970dc752ad4187daf50acca0783f1914ee4f0ed99a68f533a5e98ee5525dac009bd509760f70c74577f3f6de0d3acf30060bd4319f1b24a495bd02
-  data.tar.gz: 1c0fb11dbf07ed2c308a7bd693118254a933c5204e535d0765958679ae6576a098f71671eb18c42b7943e7b1fd18af32eaf1b8273664090e6a8e7dd625a804b6
+  metadata.gz: 489cf73cb272c2318cc35761e736a9b65fb0549e8ba938550fdf63ed16727a562180e22bfd6f210a6e6384fd8e4bb589e9a4bebf37d0e287e0c712c83e1e7214
+  data.tar.gz: 9e16a12db4e028e6318896d5fded01acda724348587a5f6628e437c81be41ccb4f4c6e537aac344c0ed05d223c27cfc03bcf275513ea7d84fa15eafd1f6b271a

data/.gem_release.yml

@@ -0,0 +1,2 @@
+bump:
+  file: 'lib/spree/auth/version.rb'

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 gem 'rails-controller-testing'
 gem 'spree', github: 'spree/spree', branch: 'master'
 
+gem 'pry', '~> 0.13.1'
 gemspec

data/app/mailers/spree/user_mailer.rb

@@ -14,7 +14,7 @@ module Spree
     def confirmation_instructions(user, token, _opts = {})
       current_store_id = _opts[:current_store_id]
       @current_store = Spree::Store.find(current_store_id) || Spree::Store.current
-      @confirmation_url = spree_user_confirmation_url(confirmation_token: token, host: Spree::Store.current.url)
+      @confirmation_url = spree.confirmation_url(confirmation_token: token, host: Spree::Store.current.url)
       @email = user.email
 
       mail to: user.email, from: from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions]), store_url: @current_store.url

data/app/models/spree/user.rb

@@ -48,7 +48,7 @@ module Spree
       end
 
       opts = pending_reconfirmation? ? { to: unconfirmed_email } : {}
-      opts[:current_store_id] = current_store.id
+      opts[:current_store_id] = current_store&.id || Spree::Store.default.id
       send_devise_notification(:confirmation_instructions, @raw_confirmation_token, opts)
     end
 
@@ -71,6 +71,10 @@ module Spree
 
     protected
 
+    def send_on_create_confirmation_instructions(current_store = nil)
+      send_confirmation_instructions(current_store || Spree::Store.default)
+    end
+
     def password_required?
       !persisted? || password.present? || password_confirmation.present?
     end

data/config/initializers/warden.rb

@@ -3,7 +3,7 @@ Warden::Manager.after_set_user except: :fetch do |user, auth, _opts|
   token = auth.cookies.signed[:guest_token] || auth.cookies.signed[:token]
   token_attr = Spree::Order.has_attribute?(:token) ? :token : :guest_token
 
-  if token.present? && user.is_a?(Spree::User)
+  if token.present? && user.is_a?(Spree.user_class)
     Spree::Order.incomplete.where(token_attr => token, user_id: nil).each do |order|
       order.associate_user!(user)
     end

data/config/routes.rb

@@ -21,7 +21,7 @@ Spree::Core::Engine.add_routes do
     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[:confirmable]
+    get '/confirm' => 'user_confirmations#show', :as => :confirmation
   end
 
   get '/checkout/registration' => 'checkout#registration', :as => :checkout_registration
@@ -42,6 +42,8 @@ Spree::Core::Engine.add_routes 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 '/password/recover' => 'user_passwords#new', :as => :recover_password
+      post '/password/recover' => 'user_passwords#create', :as => :reset_password
     end
   end
 

data/lib/controllers/backend/spree/admin/user_sessions_controller.rb

@@ -59,4 +59,20 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
       "spree/layouts/admin"
     end
   end
+
+  def respond_to_on_destroy
+    # We actually need to hardcode this as Rails default responder doesn't
+    # support returning empty response on GET request
+    respond_to do |format|
+      format.all { head :no_content }
+      format.any(*navigational_formats) { redirect_to after_sign_out_redirect(resource_name) }
+    end
+  end
+
+  def after_sign_out_redirect(resource_or_scope)
+    scope = Devise::Mapping.find_scope!(resource_or_scope)
+    router_name = Devise.mappings[scope].router_name
+    context = router_name ? send(router_name) : self
+    context.respond_to?(:admin_login_path) ? context.admin_login_path : "/"
+  end
 end

data/lib/spree/auth/engine.rb

@@ -12,7 +12,7 @@ module Spree
       end
 
       initializer "spree_auth_devise.set_user_class", after: :load_config_initializers do
-        Spree.user_class = "Spree::User"
+        Spree.user_class = 'Spree::User' if Spree.user_class.blank? || Spree.user_class.to_s == 'Spree::LegacyUser'
       end
 
       initializer "spree_auth_devise.check_secret_token" do
@@ -29,19 +29,11 @@ module Spree
           Rails.configuration.cache_classes ? require(c) : load(c)
         end
         if Spree::Auth::Engine.backend_available?
-          Rails.application.config.assets.precompile += [
-            'lib/assets/javascripts/spree/backend/spree_auth.js',
-            'lib/assets/javascripts/spree/backend/spree_auth.css'
-          ]
           Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/backend/*/*/*_decorator*.rb")) do |c|
             Rails.configuration.cache_classes ? require(c) : load(c)
           end
         end
         if Spree::Auth::Engine.frontend_available?
-          Rails.application.config.assets.precompile += [
-            'lib/assets/javascripts/spree/frontend/spree_auth.js',
-            'lib/assets/javascripts/spree/frontend/spree_auth.css'
-          ]
           Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/**/*_decorator*.rb")) do |c|
             Rails.configuration.cache_classes ? require(c) : load(c)
           end

data/lib/spree/auth/version.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Auth
+    VERSION = '4.3.3'.freeze
+
+    def gem_version
+      Gem::Version.new(VERSION)
+    end
+  end
+end

data/lib/views/backend/spree/admin/user_sessions/new.html.erb

@@ -24,7 +24,7 @@
             <% end %>  
           </div>
           <div class="col-lg-6 text-right">
-            <%= link_to Spree.t(:forgot_password), spree.recover_password_path %>
+            <%= link_to Spree.t(:forgot_password), spree.admin_recover_password_path %>
           </div>  
         </div>      
       </div>

data/spec/features/admin/sign_in_spec.rb

@@ -33,12 +33,13 @@ RSpec.feature 'Admin - Sign In', type: :feature do
 
     fill_in 'Email', with: user.email
     fill_in 'Password', with: 'secret'
-    click_button 'Log in'
     if Spree.version.to_f > 4.1
+      click_button 'Login'
       within '.navbar .dropdown-menu' do
         expect(page).to have_text 'admin@person.com'
       end
     else
+      click_button 'Log in'
       within '.user-menu' do
         expect(page).to have_text 'admin@person.com'
       end

data/spec/features/checkout_spec.rb

@@ -89,7 +89,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
       token_url_regex = /^http:\/\/www.example.com\/user\/spree_user\/password\/edit\?reset_password_token=(.*)$/
       token = token_url_regex.match(reset_password_email.body.encoded)[1]
 
-      visit spree.edit_spree_user_password_path(reset_password_token: token).tr("%0D","")
+      visit spree.edit_spree_user_password_path(reset_password_token: token.strip).tr("%0D","")
       fill_in 'Password', with: 'password'
       fill_in 'Password Confirmation', with: 'password'
       click_button 'Update'

data/spec/features/confirmation_spec.rb

@@ -1,13 +1,10 @@
 require 'spec_helper'
 
-RSpec.feature 'Confirmation', type: :feature, reload_user: true do
+RSpec.feature 'Confirmation', type: :feature, confirmable: true do
   before do
-    set_confirmable_option(true)
     expect(Spree::UserMailer).to receive(:confirmation_instructions).with(anything, anything, { current_store_id: Spree::Store.current.id }).and_return(double(deliver: true))
   end
 
-  after(:each) { set_confirmable_option(false) }
-
   background do
     ActionMailer::Base.default_url_options[:host] = 'http://example.com'
   end

data/spec/features/sign_in_spec.rb

@@ -33,13 +33,14 @@ RSpec.feature 'Sign In', type: :feature do
 
     fill_in 'Email', with: user.email
     fill_in 'Password', with: user.password
-    click_button 'Log in'
 
     if Spree.version.to_f > 4.1
+      click_button 'Login'
       within '.navbar .dropdown-menu' do
         expect(page).to have_text 'admin@person.com'
       end
     else
+      click_button 'Log in'
       within '.user-menu' do
         expect(page).to have_text 'admin@person.com'
       end

data/spec/models/user_spec.rb

@@ -65,17 +65,48 @@ RSpec.describe Spree::User, type: :model do
     end
   end
 
-  describe "confirmable", reload_user: true do
-    it "is confirmable if the confirmable option is enabled" do
-      set_confirmable_option(true)
+  describe "confirmable" do
+    it "is confirmable if the confirmable option is enabled", confirmable: true do
       Spree::UserMailer.stub(:confirmation_instructions).with(anything, anything, { current_store_id: Spree::Store.current.id }).and_return(double(deliver: true))
       expect(Spree.user_class.devise_modules).to include(:confirmable)
-      set_confirmable_option(false)
     end
 
-    it "is not confirmable if the confirmable option is disabled" do
-      set_confirmable_option(false)
-      expect(Spree.user_class.devise_modules).to_not include(:confirmable)
+    it "is not confirmable if the confirmable option is disabled", confirmable: false do
+      expect(Spree.user_class.devise_modules).not_to include(:confirmable)
+    end
+  end
+
+  describe "#send_confirmation_instructions", retry: 2 do
+    let(:default_store) { Spree::Store.default }
+
+    context "when current store not exists" do
+      it 'takes default store and sends confirmation instruction', confirmable: true do
+        user = Spree.user_class.new
+        user.email = FFaker::Internet.email
+        user.password = user.password_confirmation = 'pass1234'
+        user.save
+        
+        expect(Spree::UserMailer).to receive(:confirmation_instructions).with(
+          user, anything, { current_store_id: default_store.id }).and_return(double(deliver: true)
+        )
+
+        user.send_confirmation_instructions(nil)
+      end
+    end
+
+    context "when current store exists" do
+      it 'takes current store and sends confirmation instruction', confirmable: true do
+        user = Spree.user_class.new
+        user.email = FFaker::Internet.email
+        user.password = user.password_confirmation = 'pass1234'
+        user.save
+
+        expect(Spree::UserMailer).to receive(:confirmation_instructions).with(
+          user, anything, { current_store_id: store.id }).and_return(double(deliver: true)
+        )
+
+        user.send_confirmation_instructions(store)
+      end
     end
   end
 end

data/spec/support/confirm_helpers.rb

@@ -1,11 +1,24 @@
-module ConfirmHelpers
-  def set_confirmable_option(value)
-    Spree::Auth::Config[:confirmable] = value
-    Spree.send(:remove_const, 'User')
-    load File.expand_path("../../../app/models/spree/user.rb", __FILE__)
+RSpec.configure do |config|
+  config.around do |example|
+    if example.metadata.key?(:confirmable)
+      old_user = Spree::User
+
+      begin
+        example.run
+      ensure
+        Spree.const_set('User', old_user)
+      end
+    else
+      example.run
+    end
   end
-end
 
-RSpec.configure do |c|
-  c.include ConfirmHelpers
+  config.before do |example|
+    if example.metadata.key?(:confirmable)
+      Spree::Auth::Config[:confirmable] = example.metadata[:confirmable]
+
+      Spree.send(:remove_const, :User)
+      load File.expand_path('../../../app/models/spree/user.rb', __FILE__)
+    end
+  end
 end

data/spree_auth_devise.gemspec

@@ -1,9 +1,13 @@
 # encoding: UTF-8
+lib = File.expand_path('../lib/', __FILE__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
+
+require 'spree/auth/version'
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '4.3.2'
+  s.version     = Spree::Auth::VERSION
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors:
 - Sean Schofield
 - Spark Solutions
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -95,6 +95,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".gem_release.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -166,6 +167,7 @@ files:
 - lib/spree/auth.rb
 - lib/spree/auth/devise.rb
 - lib/spree/auth/engine.rb
+- lib/spree/auth/version.rb
 - lib/spree/authentication_helpers.rb
 - lib/spree/testing_support/auth_helpers.rb
 - lib/spree/testing_support/checkout_helpers.rb
@@ -214,17 +216,16 @@ files:
 - spec/support/configuration_helpers.rb
 - spec/support/confirm_helpers.rb
 - spec/support/email.rb
-- spec/support/user_helper.rb
 - spree_auth_devise.gemspec
 homepage: https://spreecommerce.org
 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.3.2
+  changelog_uri: https://github.com/spree/spree_auth_devise/releases/tag/v4.3.3
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.3.2
-post_install_message: 
+  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.3.3
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -240,8 +241,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Provides authentication and authorization services for use with Spree by
   using Devise and CanCan.
@@ -281,4 +282,3 @@ test_files:
 - spec/support/configuration_helpers.rb
 - spec/support/confirm_helpers.rb
 - spec/support/email.rb
-- spec/support/user_helper.rb

data/spec/support/user_helper.rb

@@ -1,11 +0,0 @@
-RSpec.configure do |config|
-  # allows to keep user const after reload
-  config.around :each, :reload_user do |example|
-    old_user = Spree::User
-
-    example.run
-
-    Spree.send(:remove_const, 'User')
-    Spree.const_set('User', old_user)
-  end
-end