spree_auth_devise 4.0.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa05d3638b5f55b4d34d7fac9d9eb3cddf96eeb473f1d08fb6fc8ca479095e93
-  data.tar.gz: 5199a26bce744922a94d8364061020c9a7e7d45c7631398a19879a780b619ed5
+  metadata.gz: 7cd5aef076f37e51acf8e77f9dc7aa8c14b3c38d38bb58c689fca12e59d6fc82
+  data.tar.gz: df4827dc1c68ed09ad300257ae97c9a10ad88e564a629bff09cd9b8568df9c6f
 SHA512:
-  metadata.gz: b773b386f23743e4097751f8e471f34f984a4e34c6f20638ae6e011605c11dbb459d56c898c7b729053b59eafb30fd8aff3f481cd6dc8dda674c71cd668ba406
-  data.tar.gz: dbf83d876e7b4a8c86b8776e56462ab4c7cc33105db55d944d920cbbc96415ce4516fb981e9105650096591b400e38f4a00fd5a9da11518b710dc04d6d8636b0
+  metadata.gz: 4a07f459d80a0260fd2a19a875d0ea6f392768c7d4a33db41574a238231e5a68234dc1e73c35d2287fb4eb73d9f30f9ac0ea1cbfb86af35fe5418fb061daf116
+  data.tar.gz: b14f4d2f862e49522de9f4704baa56bb81f876185ee693e27171a5ba68eb1abe5cc2c527a2fe8e4c1dfc01620765093d4edd8d62ca98471633f9163af2fd4eda

data/.circleci/config.yml

@@ -0,0 +1,41 @@
+version: 2
+
+jobs:
+  update_staging_repository:
+    docker:
+      - image: circleci/ruby:2.6.3
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - 54:50:5e:4e:80:6d:2e:26:43:c6:99:bd:39:b2:71:dc
+      - run: mkdir -p ~/.ssh
+      - run: ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+      - run: ssh-add -D
+      - run: ssh-add ~/.ssh/id_rsa_54505e4e806d2e2643c699bd39b271dc
+      - run: git clone -b master git@github.com:spark-solutions/spree-designs.git
+      - run: gem install bundler -v 1.17.3
+      - run:
+          command: bundle update spree_auth_devise
+          working_directory: ~/project/spree-designs
+      - run:
+          command: |
+            git config user.name 'AutoDeploy'
+            git config user.email 'autodeploy@sparksolutions.co'
+          working_directory: ~/project/spree-designs
+      - run:
+          command: |
+            git add -A
+            git commit -m "Auto-commit v#${CIRCLE_BUILD_NUM}"
+          working_directory: ~/project/spree-designs
+      - run:
+          command: git push origin master
+          working_directory: ~/project/spree-designs
+
+workflows:
+  version: 2
+  update_staging_repository:
+    jobs:
+      - update_staging_repository:
+          filters:
+            branches:
+              only: master

data/.gitignore

@@ -20,3 +20,4 @@ public/spree
 .ruby-gemset
 gemfiles/*.gemfile.lock
 *.gem
+.bundle

data/.travis.yml

@@ -1,51 +1,44 @@
-sudo: required
-dist: trusty
-
-script:
-  - bundle exec rake test_app
-  - bundle exec rake spec
+os: linux
+dist: bionic
 
 addons:
-  chrome: stable
-  postgresql: 9.4
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
 
-env:
-  - DB=mysql
-  - DB=postgres
+services:
+  - mysql
+  - postgresql
 
 language: ruby
 
 rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.8
+  - 2.5
+  - 2.6
+
+env:
+  - DB=mysql
+  - DB=postgres
 
 gemfile:
-  - gemfiles/spree_3_5.gemfile
-  - gemfiles/spree_3_7.gemfile
-  - gemfiles/spree_4_0.gemfile
+  - gemfiles/spree_4_1.gemfile
   - gemfiles/spree_master.gemfile
 
-matrix:
-    allow_failures:
-      - gemfile: gemfiles/spree_master.gemfile
-    exclude:
-      - rvm: 2.3.8
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.3.8
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.5.1
-        gemfile: gemfiles/spree_3_5.gemfile
+jobs:
+  allow_failures:
+    - gemfile: gemfiles/spree_master.gemfile
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
-  - wget -N https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -P ~/
-  - unzip ~/chromedriver_linux64.zip -d ~/
-  - rm ~/chromedriver_linux64.zip
-  - sudo mv -f ~/chromedriver /usr/local/share/
-  - sudo chmod +x /usr/local/share/chromedriver
-  - sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
+
+before_script:
+  - CHROME_MAIN_VERSION=`google-chrome-stable --version | sed -E 's/(^Google Chrome |\.[0-9]+ )//g'`
+  - CHROMEDRIVER_VERSION=`curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_MAIN_VERSION"`
+  - curl "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip" -O
+  - unzip chromedriver_linux64.zip -d ~/bin
+
+script:
+  - bundle exec rake test_app
+  - bundle exec rake spec

data/Appraisals

@@ -1,20 +1,9 @@
-appraise 'spree-3-5' do
-  gem 'spree', '~> 3.5.0'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-3-7' do
-  gem 'sass-rails'
-  gem 'spree', '~> 3.7.0'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-4-0' do
-  gem 'spree', '~> 4.0.0.rc2'
+appraise 'spree-4-1' do
   gem 'rails-controller-testing'
+  gem 'spree', '~> 4.1'
 end
 
 appraise 'spree-master' do
-  gem 'spree', github: 'spree/spree', branch: 'master'
   gem 'rails-controller-testing'
+  gem 'spree', github: 'spree/spree', branch: 'master'
 end

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "rails-controller-testing"
-gem 'spree', github: 'spree/spree', branch: 'master'
+gem 'rails-controller-testing'
+gem 'spree', '~> 4.2.0'
 
 gemspec

data/README.md

@@ -10,20 +10,11 @@ Provides authentication services for [Spree](https://spreecommerce.org), using t
 
 1. Add this extension to your Gemfile with this line:
 
-  #### Spree >= 3.1
-
-  ```ruby
-  gem 'spree_auth_devise', '~> 3.3'
-  ```
-
-  #### Spree 3.0 and Spree 2.x
-
   ```ruby
-  gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'X-X-stable'
+  gem 'spree_auth_devise'
   ```
-
-  The `branch` option is important: it must match the version of Spree you're using.
-  For example, use `3-0-stable` if you're using Spree `3-0-stable` or any `3.0.x` version.
+  
+  if you run into any version-mismatch problems please run `bundle update`
 
 2. Install the gem using Bundler:
   ```ruby

data/Rakefile

@@ -2,14 +2,20 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new
 
-task default: :spec
+task :default do
+  if Dir["spec/dummy"].empty?
+    Rake::Task[:test_app].invoke
+    Dir.chdir("../../")
+  end
+  Rake::Task[:spec].invoke
+end
 
 desc 'Generates a dummy app for testing'
 task :test_app do
   ENV['LIB_NAME'] = 'spree/auth'
-  Rake::Task['common:test_app'].invoke("Spree::User")
+  Rake::Task['extension:test_app'].invoke
 end

data/app/controllers/spree/api/v2/storefront/account_confirmations_controller.rb

@@ -0,0 +1,20 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class AccountConfirmationsController < ::Spree::Api::V2::BaseController
+
+          def show
+            user = Spree.user_class.confirm_by_token(params[:id])
+
+            if user.errors.empty?
+              render json: { data: { state: user.respond_to?(:state) ? user.state : '' } }, status: :ok
+            else
+              render json: { error: user.errors.full_messages.to_sentence }, status: :unprocessable_entity
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/passwords_controller.rb

@@ -0,0 +1,35 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class PasswordsController < ::Spree::Api::V2::BaseController
+          include Spree::Core::ControllerHelpers::Store
+
+          def create
+            user = Spree.user_class.find_by(email: params[:user][:email])
+
+            if user&.send_reset_password_instructions(current_store)
+              head :ok
+            else
+              head :not_found
+            end
+          end
+
+          def update
+            user = Spree.user_class.reset_password_by_token(
+              password: params[:user][:password],
+              password_confirmation: params[:user][:password_confirmation],
+              reset_password_token: params[:id]
+            )
+
+            if user.errors.empty?
+              head :ok
+            else
+              render json: { error: user.errors.full_messages.to_sentence }, status: :unprocessable_entity
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/user_confirmations_controller.rb

@@ -6,6 +6,39 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
+
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
+
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
+
+  # GET /resource/confirmation?confirmation_token=abcdef
+  def show
+    self.resource = resource_class.confirm_by_token(params[:confirmation_token])
+    yield resource if block_given?
+
+    if resource.errors.empty?
+      set_flash_message!(:notice, :confirmed)
+      respond_with_navigational(resource) do
+        redirect_to after_confirmation_path_for(resource_name, resource)
+      end
+    elsif resource.confirmed?
+      set_flash_message(:error, :already_confirmed)
+      respond_with_navigational(resource) do
+        redirect_to after_confirmation_path_for(resource_name, resource)
+      end
+    else
+      respond_with_navigational(resource.errors, status: :unprocessable_entity) do
+        render :new
+      end
+    end
+  end
+
   protected
 
   def after_confirmation_path_for(resource_name, resource)

data/app/controllers/spree/user_passwords_controller.rb

@@ -6,9 +6,18 @@ class Spree::UserPasswordsController < Devise::PasswordsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
+
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
+
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
+
+  before_action :set_current_order
 
   # Overridden due to bug in Devise.
   #   respond_with resource, :location => new_session_path(resource_name)
@@ -18,7 +27,7 @@ class Spree::UserPasswordsController < Devise::PasswordsController
   #   respond_with resource, :location => spree.login_path
   #
   def create
-    self.resource = resource_class.send_reset_password_instructions(params[resource_name])
+    self.resource = resource_class.send_reset_password_instructions(params[resource_name], current_store)
 
     if resource.errors.empty?
       set_flash_message(:notice, :send_instructions) if is_navigational_format?

data/app/controllers/spree/user_registrations_controller.rb

@@ -6,11 +6,19 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
+
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
+
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
 
   before_action :check_permissions, only: [:edit, :update]
+  before_action :set_current_order
   skip_before_action :require_no_authentication
 
   # GET /resource/sign_up
@@ -29,7 +37,7 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
         set_flash_message :notice, :signed_up
         sign_up(resource_name, resource)
         session[:spree_user_signup] = true
-        respond_with resource, location: after_sign_up_path_for(resource)
+        redirect_to_checkout_or_account_path(resource)
       else
         set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}"
         expire_data_after_sign_in!
@@ -75,9 +83,34 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
     'devise.user_registrations'
   end
 
+  def after_sign_up_path_for(resource)
+    after_sign_in_redirect(resource) if is_navigational_format?
+  end
+
+  def after_inactive_sign_up_path_for(resource)
+    scope = Devise::Mapping.find_scope!(resource)
+    router_name = Devise.mappings[scope].router_name
+    context = router_name ? send(router_name) : self
+    context.respond_to?(:login_path) ? context.login_path : "/login"
+  end
+
   private
 
   def spree_user_params
     params.require(:spree_user).permit(Spree::PermittedAttributes.user_attributes)
   end
+
+  def after_sign_in_redirect(resource_or_scope)
+    stored_location_for(resource_or_scope) || account_path
+  end
+
+  def redirect_to_checkout_or_account_path(resource)
+    resource_path = after_sign_up_path_for(resource)
+
+    if resource_path == spree.checkout_state_path(:address)
+      respond_with resource, location: spree.checkout_state_path(:address)
+    else
+      respond_with resource, location: spree.account_path
+    end
+  end
 end

data/app/controllers/spree/user_sessions_controller.rb

@@ -6,9 +6,18 @@ class Spree::UserSessionsController < Devise::SessionsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
+
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
+
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
+
+  before_action :set_current_order
 
   def create
     authenticate_spree_user!
@@ -17,7 +26,7 @@ class Spree::UserSessionsController < Devise::SessionsController
       respond_to do |format|
         format.html {
           flash[:success] = Spree.t(:logged_in_succesfully)
-          redirect_back_or_default(after_sign_in_path_for(spree_current_user))
+          redirect_back_or_default(after_sign_in_redirect(spree_current_user))
         }
         format.js {
           render json: { user: spree_current_user,
@@ -54,4 +63,24 @@ class Spree::UserSessionsController < Devise::SessionsController
     redirect_to(session["spree_user_return_to"] || default)
     session["spree_user_return_to"] = nil
   end
+
+  def after_sign_in_redirect(resource_or_scope)
+    stored_location_for(resource_or_scope) || account_path
+  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?(:login_path) ? context.login_path : "/"
+  end
 end

data/app/mailers/spree/user_mailer.rb

@@ -1,9 +1,13 @@
 module Spree
   class UserMailer < BaseMailer
     def reset_password_instructions(user, token, *_args)
-      @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: Spree::Store.current.url)
+      current_store_id = _args.inject(:merge)[:current_store_id]
+      @current_store = Spree::Store.find(current_store_id) || Spree::Store.current
+      @locale = @current_store.has_attribute?(:default_locale) ? @current_store.default_locale : I18n.default_locale
+      I18n.locale = @locale if @locale.present?
+      @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: @current_store.url)
 
-      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions])
+      mail to: user.email, from: from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions])
     end
 
     def confirmation_instructions(user, token, _opts = {})

data/app/models/spree/user.rb

@@ -27,6 +27,23 @@ module Spree
       has_spree_role?('admin')
     end
 
+    def self.send_reset_password_instructions(attributes={}, current_store)
+      recoverable = find_or_initialize_with_errors(reset_password_keys, attributes, :not_found)
+      recoverable.send_reset_password_instructions(current_store) if recoverable.persisted?
+      recoverable
+    end
+
+    def send_reset_password_instructions(current_store)
+      token = set_reset_password_token
+      send_reset_password_instructions_notification(token, current_store.id)
+
+      token
+    end
+
+    def send_reset_password_instructions_notification(token, current_store_id)
+      send_devise_notification(:reset_password_instructions, token, { current_store_id: current_store_id })
+    end
+
     protected
 
     def password_required?

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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,17 @@
+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/app/views/spree/user_mailer/confirmation_instructions.text.erb

@@ -1,5 +1,5 @@
-Welcome <%= @email %>!
+<%= Spree.t('confirmation_instructions.welcome', email: @email) %>
 
-You can confirm your account email through the url below:
+<%= Spree.t('confirmation_instructions.confirm') %>
 
-<%= @confirmation_url %>
+<%= @confirmation_url %>

data/app/views/spree/user_mailer/reset_password_instructions.text.erb

@@ -1,10 +1,5 @@
-A request to reset your password has been made.
-If you did not make this request, simply ignore this email.
-
-If you did make this request just click the link below:
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_1') %>
 
 <%= @edit_password_reset_url %>
 
-If the above URL does not work try copying and pasting it into your browser.
-If you continue to have problems please feel free to contact us.
-
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_2') %>

data/app/views/spree/user_passwords/edit.html.erb

@@ -1,22 +1,25 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
-<div class="col-lg-6 offset-lg-3">
-  <div class="card mb-3">
-    <div class="card-header">
-      <h3 class="card-title mb-0 h6"><%= Spree.t(:change_your_password) %></h3>
-    </div>
-    <div class="card-body">
-      <%= form_for @spree_user, :as => :spree_user, :url => spree.update_password_path, :method => :put do |f| %>
-        <div class="form-group">
-          <%= f.label :password, Spree.t(:password) %>
-          <%= f.password_field :password, :class => "form-control" %>
-        </div>
-        <div class="form-group">
-          <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
-          <%= f.password_field :password_confirmation, :class => "form-control" %>
+
+<div class="container user-passwords">
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="card mb-3 user-passwords-no-border">
+        <h3 class="spree-mb-large spree-mt-large spree-header"><%= Spree.t(:change_your_password) %></h3>
+        <div class="card-body">
+          <%= form_for @spree_user, as: :spree_user, url: spree.update_password_path, method: :put do |f| %>
+            <div class="form-group">
+              <%= f.label :password, Spree.t(:password), class: 'spree-flat-label' %>
+              <%= f.password_field :password, class: "spree-flat-input" %>
+            </div>
+            <div class="form-group">
+              <%= f.label :password_confirmation, Spree.t(:confirm_password), class: 'spree-flat-label' %>
+              <%= f.password_field :password_confirmation, class: "spree-flat-input" %>
+            </div>
+            <%= f.hidden_field :reset_password_token %>
+            <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block spree-btn mt-2' %>
+          <% end %>
         </div>
-        <%= f.hidden_field :reset_password_token %>
-        <%= f.submit Spree.t(:update), :class => 'btn btn-lg btn-success btn-block' %>
-      <% end %>
+      </div>
     </div>
   </div>
 </div>