spree_auth_devise 4.3.4 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e12256ddf3e493e918afe0f529f5abf35fe8db54ac04623081c96f82c4b8bb1
-  data.tar.gz: 898d1757061761ff25aeb56dbc09a8c111d21881051526fd0e842c30a6d264e4
+  metadata.gz: dce7d97d09c213c428ce6ce21c81a2156cfa2dfd0e7373effda3980a6e4730dc
+  data.tar.gz: c5ab728a3019fe0117c9c6b0fb62d962092cb019ff81e861258daa0c26927537
 SHA512:
-  metadata.gz: b54d41d158228c72e3167d8354f1ba352030533885776a3a7c2a30dc675ac2055627bf48c5da724e5104e0004b4f8cfca1504ded6ceaed0e4c632edc9c95cce4
-  data.tar.gz: dfc8ac967964ee75c706e138c015b627e303798c7bbb88fe4ee63077149717ece0c8474d7888cc6280ea2c0a4fad363ecf1f1f4516f47ef80fe93c0abbf8cfe5
+  metadata.gz: bce33276ffcce416fb378d8c9e3fdae88efeec6166520e97304b8520263a667f2714d46ff724eacf004c34defbb876517979482824bd18e2ef2667c3b56f83b9
+  data.tar.gz: fd9b8eb25d08f6e98939d66a0a9b432452404a5d1ebf21572552ec611bfd11241cde424a910a02373f935cd8cdabd2259783f3c63019209fde2b0daafaafce21

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: pry
+    versions:
+    - 0.14.0

data/.travis.yml

@@ -11,6 +11,7 @@ addons:
 services:
   - mysql
   - postgresql
+  - redis-server
 
 language: ruby
 
@@ -22,17 +23,6 @@ env:
   - DB=mysql
   - DB=postgres
 
-gemfile:
-  - gemfiles/spree_4_1.gemfile
-  - gemfiles/spree_master.gemfile
-
-jobs:
-  exclude:
-  - rvm: 3.0
-    gemfile: gemfiles/spree_4_1.gemfile
-  allow_failures:
-  - gemfile: gemfiles/spree_master.gemfile
-
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
 

data/Gemfile

@@ -1,7 +1,10 @@
 source 'https://rubygems.org'
 
 gem 'rails-controller-testing'
-gem 'spree', github: 'spree/spree', branch: 'master'
+gem 'spree', github: 'spree/spree', branch: 'main'
+gem 'spree_backend', github: 'spree/spree', branch: 'main'
+gem 'spree_frontend', github: 'spree/spree', branch: 'main'
+gem 'spree_emails', github: 'spree/spree', branch: 'main'
 
-gem 'pry', '~> 0.13.1'
+gem 'pry', '~> 0.14.1'
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Spree Auth (Devise)
 
-[![Build Status](https://travis-ci.org/spree/spree_auth_devise.svg?branch=master)](https://travis-ci.org/spree/spree_auth_devise)
+[![Build Status](https://travis-ci.com/spree/spree_auth_devise.svg?branch=main)](https://travis-ci.org/spree/spree_auth_devise)
 [![Code Climate](https://codeclimate.com/github/spree/spree_auth_devise/badges/gpa.svg)](https://codeclimate.com/github/spree/spree_auth_devise)
 
 Provides authentication services for [Spree](https://spreecommerce.org), using the [Devise](https://github.com/plataformatec/devise) gem.

data/app/mailers/spree/user_mailer.rb

@@ -1,5 +1,5 @@
 module Spree
-  class UserMailer < BaseMailer
+  class UserMailer < defined?(Spree::BaseMailer) ? Spree::BaseMailer : ActionMailer::Base
     def reset_password_instructions(user, token, *_args)
       current_store_id = _args.inject(:merge)[:current_store_id]
       @current_store = Spree::Store.find(current_store_id) || Spree::Store.current
@@ -8,7 +8,7 @@ module Spree
       @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: @current_store.url)
       @user = user
 
-      mail to: user.email, from: from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions]), store_url: @current_store.url
+      mail to: user.email, from: @current_store.mail_from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions]), store_url: @current_store.url
     end
 
     def confirmation_instructions(user, token, _opts = {})
@@ -17,7 +17,7 @@ module Spree
       @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
+      mail to: user.email, from: @current_store.mail_from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions]), store_url: @current_store.url
     end
   end
 end

data/db/migrate/20210728103922_change_type_of_ship_address_id_and_bill_address_id_for_spree_users.rb

@@ -0,0 +1,8 @@
+class ChangeTypeOfShipAddressIdAndBillAddressIdForSpreeUsers < ActiveRecord::Migration[4.2]
+  def change
+    change_table(:spree_users) do |t|
+      t.change :ship_address_id, :bigint
+      t.change :bill_address_id, :bigint
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
     if spree_user_signed_in?
       respond_to do |format|
         format.html {
-          flash[:success] = Spree.t(:logged_in_succesfully)
+          flash[:success] = Spree.t(:logged_in_successfully)
           redirect_back_or_default(after_sign_in_path_for(spree_current_user))
         }
         format.js {

data/{app/controllers → lib/controllers/frontend}/spree/user_sessions_controller.rb

@@ -25,7 +25,7 @@ class Spree::UserSessionsController < Devise::SessionsController
     if spree_user_signed_in?
       respond_to do |format|
         format.html {
-          flash[:success] = Spree.t(:logged_in_succesfully)
+          flash[:success] = Spree.t(:logged_in_successfully)
           redirect_back_or_default(after_sign_in_redirect(spree_current_user))
         }
         format.js {

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

@@ -6,7 +6,7 @@ class Spree::UsersController < Spree::StoreController
   include Spree::Core::ControllerHelpers
 
   def show
-    @orders = @user.orders.complete.order('completed_at desc')
+    @orders = @user.orders.for_store(current_store).complete.order('completed_at desc')
   end
 
   def create

data/lib/spree/auth/version.rb

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

data/lib/spree/testing_support/auth_helpers.rb

@@ -19,7 +19,7 @@ module Spree
         first('label', text: Spree.t(:remember_me)).click if remember_me
         click_button login_button
 
-        expect(page).to have_content Spree.t(:logged_in_succesfully)
+        expect(page).to have_content Spree.t(:logged_in_successfully)
       end
 
       def log_out

data/spec/features/admin/orders_spec.rb

@@ -16,7 +16,8 @@ RSpec.feature 'Admin orders', type: :feature do
 
   # Regression #203
   scenario 'can not edit orders' do
-    expect { visit spree.edit_admin_order_path('nodata') }.to raise_error(ActiveRecord::RecordNotFound)
+    visit spree.edit_admin_order_path('nodata')
+    expect(page).to have_text('Order is not found')
   end
 
   # Regression #203

data/spec/features/admin/sign_in_spec.rb

@@ -36,7 +36,7 @@ RSpec.feature 'Admin - Sign In', type: :feature do
     click_button login_button
 
     if Spree.version.to_f > 4.1
-      within '.navbar .dropdown-menu' do
+      within '.navbar .dropdown-menu-right' do
         expect(page).to have_text 'admin@person.com'
       end
     else

data/spec/features/sign_in_spec.rb

@@ -36,7 +36,7 @@ RSpec.feature 'Sign In', type: :feature do
 
     if Spree.version.to_f > 4.1
       click_button login_button
-      within '.navbar .dropdown-menu' do
+      within '.navbar .dropdown-menu-right' do
         expect(page).to have_text 'admin@person.com'
       end
     else

data/spec/models/user_spec.rb

@@ -27,6 +27,33 @@ RSpec.describe Spree::User, type: :model do
     end
   end
 
+  describe 'validations' do
+    context 'email' do
+      let(:user) { build(:user, email: nil) }
+
+      it 'cannot be empty' do
+        expect(user.valid?).to be false
+        expect(user.errors.messages[:email].first).to eq "can't be blank"
+      end
+    end
+
+    context 'password' do
+      let(:user) { build(:user, password_confirmation: nil) }
+
+      it 'password confirmation cannot be empty' do
+        expect(user.valid?).to be false
+        expect(user.errors.messages[:password_confirmation].first).to eq "doesn't match Password"
+      end
+
+      let(:user) { build(:user, password: 'pass1234', password_confirmation: 'pass') }
+
+      it 'passwords has to be equal to password confirmation' do
+        expect(user.valid?).to be false
+        expect(user.errors.messages[:password_confirmation].first).to eq "doesn't match Password"
+      end
+    end
+  end
+
   context '#destroy' do
     it 'will soft delete with uncompleted orders' do
       order = build(:order)

data/spec/support/confirm_helpers.rb

@@ -15,6 +15,7 @@ RSpec.configure do |config|
 
   config.before do |example|
     if example.metadata.key?(:confirmable)
+      Rails.cache.clear
       Spree::Auth::Config[:confirmable] = example.metadata[:confirmable]
 
       Spree.send(:remove_const, :User)

data/spree_auth_devise.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'devise', '~> 4.7'
   s.add_dependency 'devise-encryptable', '0.2.0'
 
-  spree_version = '>= 4.1', '< 5.0'
+  spree_version = '>= 4.3.0.rc1'
   s.add_dependency 'spree_core', spree_version
   s.add_dependency 'spree_extension'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.4.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -45,20 +45,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -96,10 +90,10 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gem_release.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -108,23 +102,13 @@ files:
 - app/controllers/metal_decorator.rb
 - app/controllers/spree/api/v2/storefront/account_confirmations_controller.rb
 - app/controllers/spree/api/v2/storefront/passwords_controller.rb
-- app/controllers/spree/user_confirmations_controller.rb
-- app/controllers/spree/user_passwords_controller.rb
-- app/controllers/spree/user_registrations_controller.rb
-- app/controllers/spree/user_sessions_controller.rb
 - app/mailers/spree/user_mailer.rb
 - app/models/spree/auth_configuration.rb
 - app/models/spree/user.rb
-- app/services/spree/account/create.rb
-- app/services/spree/account/update.rb
 - app/views/spree/user_mailer/confirmation_instructions.html.erb
 - app/views/spree/user_mailer/confirmation_instructions.text.erb
 - app/views/spree/user_mailer/reset_password_instructions.html.erb
 - app/views/spree/user_mailer/reset_password_instructions.text.erb
-- app/views/spree/user_passwords/edit.html.erb
-- app/views/spree/user_passwords/new.html.erb
-- app/views/spree/user_registrations/new.html.erb
-- app/views/spree/user_sessions/new.html.erb
 - bin/rails
 - config.ru
 - config/initializers/devise.rb
@@ -150,10 +134,8 @@ files:
 - db/migrate/20140904000425_add_deleted_at_to_users.rb
 - db/migrate/20141002154641_add_confirmable_to_users.rb
 - db/migrate/20150416152553_add_missing_indices_on_user.rb
+- db/migrate/20210728103922_change_type_of_ship_address_id_and_bill_address_id_for_spree_users.rb
 - db/seeds.rb
-- gemfiles/spree_4_1.gemfile
-- gemfiles/spree_master.gemfile
-- lib/controllers/api/spree/api/v2/storefront/account_controller_decorator.rb
 - lib/controllers/backend/spree/admin/base_controller_decorator.rb
 - lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb
 - lib/controllers/backend/spree/admin/orders_controller_decorator.rb
@@ -161,6 +143,10 @@ files:
 - lib/controllers/backend/spree/admin/user_passwords_controller.rb
 - lib/controllers/backend/spree/admin/user_sessions_controller.rb
 - lib/controllers/frontend/spree/checkout_controller_decorator.rb
+- lib/controllers/frontend/spree/user_confirmations_controller.rb
+- lib/controllers/frontend/spree/user_passwords_controller.rb
+- lib/controllers/frontend/spree/user_registrations_controller.rb
+- lib/controllers/frontend/spree/user_sessions_controller.rb
 - lib/controllers/frontend/spree/users_controller.rb
 - lib/generators/spree/auth/install/install_generator.rb
 - lib/generators/spree/auth/install/templates/config/initializers/devise.rb
@@ -181,6 +167,10 @@ files:
 - lib/views/backend/spree/layouts/login.html.erb
 - lib/views/frontend/spree/shared/_flashes.html.erb
 - lib/views/frontend/spree/shared/_login_bar.html.erb
+- lib/views/frontend/spree/user_passwords/edit.html.erb
+- lib/views/frontend/spree/user_passwords/new.html.erb
+- lib/views/frontend/spree/user_registrations/new.html.erb
+- lib/views/frontend/spree/user_sessions/new.html.erb
 - spec/controllers/spree/admin/orders_controller_spec.rb
 - spec/controllers/spree/admin/user_sessions_controller_spec.rb
 - spec/controllers/spree/api/v2/storefront/passwords_controller_spec.rb
@@ -222,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.3.4
+  changelog_uri: https://github.com/spree/spree_auth_devise/releases/tag/v4.4.0
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.3.4
+  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.4.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/Appraisals

@@ -1,9 +0,0 @@
-appraise 'spree-4-1' do
-  gem 'rails-controller-testing'
-  gem 'spree', '~> 4.1'
-end
-
-appraise 'spree-master' do
-  gem 'rails-controller-testing'
-  gem 'spree', github: 'spree/spree', branch: 'master'
-end

data/app/services/spree/account/create.rb

@@ -1,19 +0,0 @@
-module Spree
-  module Account
-    class Create
-      prepend Spree::ServiceModule::Base
-
-      def call(user_params: nil)
-        user_params ||= {}
-
-        user = Spree.user_class.new(user_params)
-
-        if user.save
-          success(user)
-        else
-          failure(user)
-        end
-      end
-    end
-  end
-end

data/app/services/spree/account/update.rb

@@ -1,17 +0,0 @@
-module Spree
-  module Account
-    class Update
-      prepend Spree::ServiceModule::Base
-
-      def call(user:, user_params: nil)
-        user_params ||= {}
-
-        if user.update(user_params)
-          success(user)
-        else
-          failure(user)
-        end
-      end
-    end
-  end
-end

data/gemfiles/spree_4_1.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails-controller-testing"
-gem "spree", "~> 4.1"
-
-gemspec path: "../"

data/gemfiles/spree_master.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails-controller-testing"
-gem "spree", github: "spree/spree", branch: "master"
-
-gemspec path: "../"

data/lib/controllers/api/spree/api/v2/storefront/account_controller_decorator.rb

@@ -1,41 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Storefront
-        module AccountControllerDecorator
-          def self.prepended(base)
-            base.skip_before_action :require_spree_current_user, only: [:create]
-          end
-
-          def create
-            result = Spree::Account::Create.call(user_params: spree_user_params)
-
-            render_payload(result)
-          end
-
-          def update
-            result = Spree::Account::Update.call(user: spree_current_user, user_params: spree_user_params)
-
-            render_payload(result)
-          end
-
-          private
-
-          def render_payload(result)
-            if result.success?
-              render_serialized_payload { serialize_resource(result.value) }
-            else
-              render_error_payload(result.error)
-            end
-          end
-
-          def spree_user_params
-            params.require(:user).permit(Spree::PermittedAttributes.user_attributes)
-          end
-        end
-      end
-    end
-  end
-end
-
-::Spree::Api::V2::Storefront::AccountController.prepend(Spree::Api::V2::Storefront::AccountControllerDecorator)