solidus_auth_devise 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a2eba838fc8a03ef6bdf7a6d113c00c1a2c76f55fc3237e73bc6cee1dcf11f7
-  data.tar.gz: c23c24fd0f9f60c4e60058905d46b56b31e57c4b4b307cefe688a5b1f7a6883f
+  metadata.gz: 3c6c2097e3d2c1eb8ab42f2041ed80caff235d27c89bae9a45f8d59942795213
+  data.tar.gz: 8c8bc99337a0955ed97db3bd395bce4fb6277f56696d71c02f72ec77b5533294
 SHA512:
-  metadata.gz: 571cf2a517b9d84e73731352c36dbba9a78d0325d28ca4247b3ae221067202616f6d11a3993bbcfb621cf8f388ce7edaa938ff7bfa941bb9035027b3d4f97b39
-  data.tar.gz: 916b836223e7d1bf6fe9872ff2616939e763d9f403c0f0148b13a16e73d58d36bbaa913c87f314fe4bf537a8ef8620dfbcb56af5693cb17a45344feaab383a2e
+  metadata.gz: '09fd7561bd89f6199043a5938f25f5d9d006a1e213cef45b5280e68b489744229957ea1cc7eb7d8c682015c1400d76f47f561e39eda9cf20c7d6f4071ba58fdc'
+  data.tar.gz: c5d6cac45f525a52ca758c97478adcacc331e099a19501d932fe73e2b3ca6cb1e7d0829fc857559a925c70d236dd6ef796cf1c4f0638e63e79728714e760ae5d

data/CHANGELOG.md

@@ -1,8 +1,7 @@
 # Change Log
 
-## [Unreleased](https://github.com/solidusio/solidus_auth_devise/tree/HEAD)
-
-[Full Changelog](https://github.com/solidusio/solidus_auth_devise/compare/v2.2.0...HEAD)
+## [v2.3.0](https://github.com/solidusio/solidus_auth_devise/tree/v2.3.0) (2019-08-19)
+[Full Changelog](https://github.com/solidusio/solidus_auth_devise/compare/v2.2.0...v2.3.0)
 
 **Closed issues:**
 
@@ -10,6 +9,7 @@
 
 **Merged pull requests:**
 
+- Add GitHub changelog generator [\#168](https://github.com/solidusio/solidus_auth_devise/pull/168) ([kennyadsl](https://github.com/kennyadsl))
 - Fix CI issues [\#167](https://github.com/solidusio/solidus_auth_devise/pull/167) ([kennyadsl](https://github.com/kennyadsl))
 - Stub preferences in specs instead of resetting [\#166](https://github.com/solidusio/solidus_auth_devise/pull/166) ([kennyadsl](https://github.com/kennyadsl))
 - Add appropriate classes to admin login button [\#164](https://github.com/solidusio/solidus_auth_devise/pull/164) ([jacobeubanks](https://github.com/jacobeubanks))
@@ -17,7 +17,6 @@
 - Fix minor grammar concerns in console messages [\#162](https://github.com/solidusio/solidus_auth_devise/pull/162) ([jacobherrington](https://github.com/jacobherrington))
 - Logout with DELETE verb by default [\#161](https://github.com/solidusio/solidus_auth_devise/pull/161) ([kennyadsl](https://github.com/kennyadsl))
 - Use secret\_key\_base for Rails 6 compatibility [\#160](https://github.com/solidusio/solidus_auth_devise/pull/160) ([aldesantis](https://github.com/aldesantis))
-- Improve decorators [\#159](https://github.com/solidusio/solidus_auth_devise/pull/159) ([jacobherrington](https://github.com/jacobherrington))
 - Add rubocop as a development dependency [\#158](https://github.com/solidusio/solidus_auth_devise/pull/158) ([jacobherrington](https://github.com/jacobherrington))
 - Update confusing i18n translation [\#157](https://github.com/solidusio/solidus_auth_devise/pull/157) ([jacobherrington](https://github.com/jacobherrington))
 - Remove flash errors from password recovery [\#156](https://github.com/solidusio/solidus_auth_devise/pull/156) ([jacobherrington](https://github.com/jacobherrington))
@@ -39,6 +38,7 @@
 
 **Merged pull requests:**
 
+- Improve decorators [\#159](https://github.com/solidusio/solidus_auth_devise/pull/159) ([jacobherrington](https://github.com/jacobherrington))
 - Add v2.2.0 CHANGELOG entries [\#153](https://github.com/solidusio/solidus_auth_devise/pull/153) ([kennyadsl](https://github.com/kennyadsl))
 - Add gem-release support [\#152](https://github.com/solidusio/solidus_auth_devise/pull/152) ([kennyadsl](https://github.com/kennyadsl))
 - Add missing pessimistic versioning [\#149](https://github.com/solidusio/solidus_auth_devise/pull/149) ([aitbw](https://github.com/aitbw))
@@ -59,7 +59,6 @@
 - Add Solidus v2.7 to .travis.yml [\#127](https://github.com/solidusio/solidus_auth_devise/pull/127) ([jacobherrington](https://github.com/jacobherrington))
 - Fix spree routes [\#125](https://github.com/solidusio/solidus_auth_devise/pull/125) ([jtapia](https://github.com/jtapia))
 - Remove unnecessary decorator [\#122](https://github.com/solidusio/solidus_auth_devise/pull/122) ([jhawthorn](https://github.com/jhawthorn))
-- Disable backend footer profile edit link if role cannot edit users [\#120](https://github.com/solidusio/solidus_auth_devise/pull/120) ([gianlucarizzo](https://github.com/gianlucarizzo))
 
 ## [v2.1.0](https://github.com/solidusio/solidus_auth_devise/tree/v2.1.0) (2018-01-22)
 [Full Changelog](https://github.com/solidusio/solidus_auth_devise/compare/v2.0.0...v2.1.0)
@@ -114,6 +113,7 @@
 
 **Merged pull requests:**
 
+- Disable backend footer profile edit link if role cannot edit users [\#120](https://github.com/solidusio/solidus_auth_devise/pull/120) ([gianlucarizzo](https://github.com/gianlucarizzo))
 - Remove dependency on json, multi\_json [\#91](https://github.com/solidusio/solidus_auth_devise/pull/91) ([jhawthorn](https://github.com/jhawthorn))
 - Remove Unnecessary `require` statements. [\#89](https://github.com/solidusio/solidus_auth_devise/pull/89) ([stewart](https://github.com/stewart))
 - Do not require core email validator [\#87](https://github.com/solidusio/solidus_auth_devise/pull/87) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -5,19 +5,23 @@ source "https://rubygems.org"
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem "solidus", github: "solidusio/solidus", branch: branch
 
-group :test do
-  if branch == 'master' || branch >= "v2.0"
-    gem 'rails-controller-testing', '~> 1.0'
-  else
-    gem "rails_test_params_backport"
-  end
+# Needed to help Bundler figure out how to resolve dependencies,
+# otherwise it takes forever to resolve them
+if branch == 'master' || Gem::Version.new(branch[1..-1]) >= Gem::Version.new('2.10.0')
+  gem 'rails', '~> 6.0'
+else
+  gem 'rails', '~> 5.0'
+end
 
-  gem 'factory_bot', (branch < 'v2.5' ? '4.10.0' : '> 4.10.0')
+group :test do
+  gem 'rails-controller-testing', '~> 1.0'
+  gem 'factory_bot', '> 4.10.0'
 end
 
-if ENV['DB'] == 'mysql'
+case ENV['DB']
+when 'mysql'
   gem 'mysql2', '~> 0.4.10'
-else
+when 'postgres'
   gem 'pg', '~> 0.21'
 end
 
@@ -25,6 +29,4 @@ group :development, :test do
   gem 'pry-rails', '~> 0.3.9'
 end
 
-gem 'deface', '~> 1.3', require: false
-
 gemspec

data/app/overrides/spree/admin/users/edit/_add_reset_password_form.html.erb.deface

@@ -0,0 +1,20 @@
+<!--
+  insert_before "fieldset#admin_user_edit_api_key"
+  original "904c52ff702412d1dc8d55ff44d87d7f581f6675"
+-->
+
+<% if @user != try_spree_current_user %>
+  <fieldset class="no-border-bottom" data-hook="admin_user_reset_password">
+    <legend><%= t(:'spree.forgot_password') %></legend>
+
+    <%= form_for [:admin, @user], as: :spree_user, url: admin_reset_password_path, method: :post do |f| %>
+      <%= f.hidden_field :email, value: @user.email %>
+
+      <% if can?(:update, @user) %>
+        <div class="align-center">
+          <%= f.submit Spree.user_class.human_attribute_name(:reset_password), class: "button primary" %>
+        </div>
+      <% end %>
+    <% end %>
+  </fieldset>
+<% end %>

data/config/locales/it.yml

@@ -1,8 +1,8 @@
+---
 it:
   spree:
-    admin:
-      tab:
-        users: Utenti
+    admin_login: Login Amministrazione
+    change_my_password: Cambia la password
   devise:
     confirmations:
       confirmed: Il tuo account è stato correttamente confermato. Ora sei collegato.
@@ -65,9 +65,9 @@ it:
       signed_out: Uscito correttamente.
   errors:
     messages:
-      email_is_invalid: L'indirizzo email non può essere vuoto
       already_confirmed: è stato già confermato
       confirmation_period_expired: deve essere confermato entro %{period}, richiedi una nuova conferma
+      email_is_invalid: L'indirizzo email non può essere vuoto
       expired: è scaduto, si prega di richiederne uno nuovo
       not_found: non trovato
       not_locked: non era bloccato

data/lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-Spree::Admin::Orders::CustomerDetailsController.class_eval do
-  before_action :check_authorization
+module Spree::Admin::Orders::CustomerDetailsControllerDecorator
+  def self.prepended(base)
+    base.before_action :check_authorization
+  end
 
   private
 
@@ -15,4 +17,6 @@ Spree::Admin::Orders::CustomerDetailsController.class_eval do
 
     authorize! action, resource, session[:access_token]
   end
+
+  Spree::Admin::Orders::CustomerDetailsController.prepend self
 end

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

@@ -25,7 +25,7 @@ class Spree::Admin::UserPasswordsController < Devise::PasswordsController
     set_flash_message(:notice, :send_instructions) if is_navigational_format?
 
     if resource.errors.empty?
-      respond_with resource, location: spree.admin_login_path
+      respond_with resource, location: admin_user_path(resource)
     else
       respond_with_navigational(resource) { render :new }
     end

data/lib/solidus_auth_devise.rb

@@ -4,12 +4,4 @@ require "spree_core"
 require "solidus_support"
 require "spree/auth/devise"
 require "spree/authentication_helpers"
-
-if SolidusSupport.solidus_gem_version < Gem::Version.new('2.5.x')
-  begin
-    require "deface"
-  rescue LoadError
-    warn "deface is required to run solidus_auth_devise with solidus versions < 2.5. Please add deface to your Gemfile"
-    raise
-  end
-end
+require "deface"

data/lib/spree/auth/version.rb

@@ -2,6 +2,6 @@
 
 module Spree
   module Auth
-    VERSION = '2.3.0'
+    VERSION = '2.4.0'
   end
 end

data/solidus_auth_devise.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  solidus_version = [">= 1.2.0", "< 3"]
+  solidus_version = [">= 2.6", "< 3"]
 
   s.post_install_message = "
     NOTE: Rails 6 has removed secret_token in favor of secret_key_base, which was deprecated in
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency "devise-encryptable", "0.2.0"
   s.add_dependency "solidus_core", solidus_version
   s.add_dependency "solidus_support", ">= 0.1.3"
+  s.add_dependency "deface", "~> 1.0"
 
   s.add_development_dependency "capybara", "~> 2.14"
   s.add_development_dependency "capybara-screenshot"
@@ -41,7 +42,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "ffaker"
   s.add_development_dependency "gem-release", "~> 2.0"
   s.add_development_dependency "github_changelog_generator", "~> 1.14"
-  s.add_development_dependency "rspec-rails", "~> 3.3"
+  s.add_development_dependency "rspec-rails", "~> 4.0.0.beta2"
   s.add_development_dependency "rubocop", "~> 0.71"
   s.add_development_dependency "rubocop-performance", "~> 1.4"
   s.add_development_dependency "rubocop-rails", "~> 2.2"
@@ -51,5 +52,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov", "~> 0.14"
   s.add_development_dependency "solidus_backend", solidus_version
   s.add_development_dependency "solidus_frontend", solidus_version
-  s.add_development_dependency "sqlite3", "~> 1.3.6"
+  s.add_development_dependency "sqlite3"
 end

data/spec/controllers/spree/products_controller_spec.rb

@@ -16,13 +16,9 @@ RSpec.describe Spree::ProductsController, type: :controller do
     allow(controller).to receive(:before_save_new_order)
     allow(controller).to receive(:spree_current_user) { user }
     allow(user).to receive(:has_spree_role?) { false }
-    if SolidusSupport.solidus_gem_version < Gem::Version.new('2.5.x')
+
+    expect {
       get :show, params: { id: product.to_param }
-      expect(response.status).to eq(404)
-    else
-      expect {
-        get :show, params: { id: product.to_param }
-      }.to raise_error(ActiveRecord::RecordNotFound)
-    end
+    }.to raise_error(ActiveRecord::RecordNotFound)
   end
 end

data/spec/features/admin/password_reset_spec.rb

@@ -34,4 +34,47 @@ RSpec.feature 'Admin - Reset Password', type: :feature do
   def fill_in_email
     fill_in 'Email', with: 'foobar@example.com'
   end
+
+  context 'password management' do
+    let!(:admin) do
+      create(:admin_user,
+        email: 'admin@example.com',
+        password: 'secret',
+        password_confirmation: 'secret'
+      )
+    end
+
+    let!(:user) do
+      create(:user,
+        email: 'user@example.com',
+        password: 'test123',
+        password_confirmation: 'test123'
+      )
+    end
+
+    before do
+      visit spree.admin_login_path
+      fill_in 'Email', with: admin.email
+      fill_in 'Password', with: admin.password
+      click_button 'Login'
+      visit spree.admin_users_path
+    end
+
+    context 'if currently logged-in admin' do
+      context "clicks on an user's page" do
+        it 'can reset its password' do
+          within("#spree_user_#{user.id}") do
+            click_link user.email
+          end
+
+          click_button 'Reset password'
+          expect(page).to have_content(
+            'If an account with that email address exists,
+            you will receive an email with instructions about
+            how to reset your password in a few minutes.'
+          )
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2.6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2.6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 4.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 4.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -288,7 +302,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2.6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -298,7 +312,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2.6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -308,7 +322,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2.6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -318,7 +332,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2.6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -326,16 +340,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 description: Provides authentication and authorization services for use with Solidus
   by using Devise and CanCan.
 email: contact@solidus.io
@@ -356,8 +370,7 @@ files:
 - app/mailers/spree/user_mailer.rb
 - app/models/spree/auth_configuration.rb
 - app/models/spree/user.rb
-- app/overrides/auth_admin_login_navigation_bar.rb
-- app/overrides/auth_shared_login_bar.rb
+- app/overrides/spree/admin/users/edit/_add_reset_password_form.html.erb.deface
 - bin/rails
 - config/initializers/devise.rb
 - config/initializers/warden.rb
@@ -482,8 +495,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by

data/app/overrides/auth_admin_login_navigation_bar.rb

@@ -1,10 +0,0 @@
-if SolidusSupport.solidus_gem_version < Gem::Version.new('1.2')
-  Deface::Override.new(
-    virtual_path: "spree/admin/shared/_header",
-    name: "auth_admin_login_navigation_bar",
-    insert_before: "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]",
-    partial: "spree/layouts/admin/login_nav",
-    disabled: false,
-    original: '841227d0aedf7909d62237d8778df99100087715'
-  )
-end

data/app/overrides/auth_shared_login_bar.rb

@@ -1,10 +0,0 @@
-if SolidusSupport.frontend_available? && SolidusSupport.solidus_gem_version < Gem::Version.new('2.5.x')
-  Deface::Override.new(
-    virtual_path: "spree/shared/_nav_bar",
-    name: "auth_shared_login_bar",
-    insert_before: "li#search-bar",
-    partial: "spree/shared/login_bar_items",
-    disabled: false,
-    original: 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac'
-  )
-end