spree_auth_devise 4.0.0.rc1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 904e54a1d9b6ad58df3685c412031328c5eb7d2a3bde8c1d3682656adb8d91ba
-  data.tar.gz: 25ab57e3858000af1e81c594c8d01dde94d355b0f7379b38d399c914754fa4b5
+  metadata.gz: 118d51e3f609cac9bc6a69453d96893824814d99a44e8be828741ebd410c9aa9
+  data.tar.gz: dcb44d6ef585b73b82665d12b04821e5f9d6393ef87626cbbd4091e060390365
 SHA512:
-  metadata.gz: eb3236f668fcaab30ac537ef5b8072082d00d0e205f432671c0e37a7af838b3ec13eb62563daef69b816aad29113521e0b743e386e87335a0fa6e70e7b65d0cd
-  data.tar.gz: 2f82564fcf9e5e7c36d38611fa45965922e02593b69caf1b2068224e4dd6f20fcbc1a6e5590741e7af5180777751e17525a9fe65a25f4091dcda9d11214e91b1
+  metadata.gz: 0e3de0c4e4fd5adf202a9fa312f6025eaef63d9b61c8024703b418dc911d9dab405c76d3c25c6ed3f7e7d84f1bb867c2874a21e08dad903618c8632cf087531a
+  data.tar.gz: d650a6a697c44abba86562a2bc94b98ba117ce74a4a57f614f6e210690ea4f44f8e21f64aaf8a55458b8323b0e8686a48f3b313453337635aae8ffd2fe944dc3

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,56 +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.7
+  - 2.5
+  - 2.6
+
+env:
+  - DB=mysql
+  - DB=postgres
 
 gemfile:
-  - gemfiles/spree_3_2.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.7
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.3.7
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.5.1
-        gemfile: gemfiles/spree_3_2.gemfile
-      - rvm: 2.5.1
-        gemfile: gemfiles/spree_3_2.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,25 +1,9 @@
-appraise 'spree-3-2' do
-  gem 'spree', '~> 3.2.0'
-  gem 'rails-controller-testing'
-end
-
-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.rc3'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-4-0' do
-  gem 'spree', github: 'spree/spree', tag: 'v4.0.0.beta'
+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 'rails-controller-testing'
 gem 'spree', github: 'spree/spree', branch: 'master'
 
 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/metal_decorator.rb

@@ -1,5 +1,5 @@
 # For the API
-ActionController::Metal.class_eval do
+module MetalDecorator
   def spree_current_user
     @spree_current_user ||=  if defined? env
                                env['warden'].user
@@ -8,3 +8,5 @@ ActionController::Metal.class_eval do
                              end
   end
 end
+
+ActionController::Metal.prepend(MetalDecorator)

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,30 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
+  before_action :set_current_order
+
+  # 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

@@ -10,6 +10,8 @@ class Spree::UserPasswordsController < Devise::PasswordsController
     include SpreeI18n::ControllerLocaleHelper
   end
 
+  before_action :set_current_order
+
   # Overridden due to bug in Devise.
   #   respond_with resource, :location => new_session_path(resource_name)
   # is generating bad url /session/new.user
@@ -18,7 +20,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

@@ -11,6 +11,7 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   end
 
   before_action :check_permissions, only: [:edit, :update]
+  before_action :set_current_order
   skip_before_action :require_no_authentication
 
   # GET /resource/sign_up
@@ -29,7 +30,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 +76,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

@@ -10,6 +10,8 @@ class Spree::UserSessionsController < Devise::SessionsController
     include SpreeI18n::ControllerLocaleHelper
   end
 
+  before_action :set_current_order
+
   def create
     authenticate_spree_user!
 
@@ -17,7 +19,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 +56,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