spree_auth_devise 4.1.0.rc1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11fab6b968334f977554a9a95b6a80e37047b42add498201ea0db74ca0701a6a
-  data.tar.gz: cab55c1d0e6344a72c5e11ee8621f43fce3787d99e412515bf9f8059a1727e7c
+  metadata.gz: 7803bda30cc0ed9cca3df5b201c6f53e53ed57841dd26c18eecaad80888779e6
+  data.tar.gz: 615ee2f16b67ed9e082c55c2f3b011ffedd363f7ac83d392819ef6a8f24da7b0
 SHA512:
-  metadata.gz: 83bfc852ef5ac9cd03c19f6a9f8bcbdd17aac744d565102777f4ef1b2910f53d80b6663eee3d7f1dce2dc6f66f0e553270f366086f8e303963f995b72b9d8598
-  data.tar.gz: 66b5fe7c4364a068ee0b2169713480afb3b0064cc3c883f0ddbf6ee6086cd9b5caac2058b2c5c2cab9da82230a6441659df89ce071bc973a2278fd50a73e5341
+  metadata.gz: f2fddae86244f213dcdb77ab7f4ef0658b8d9ca3255b43b7d3e53ca0f750479ce0b0d7b80ec59d7a820aa0f17ee670a5b6fd34a485b826681f73b0b972a484bd
+  data.tar.gz: ec8035b779912362315ada27d8ab6bc69152609e7776d155e7f14a8a2a4fa7920d0e0a89d16968b55cef5e018bcbe967cb70f767917c077915ed40b19cdf1672

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/app/controllers/spree/user_confirmations_controller.rb

@@ -7,7 +7,29 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController
   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_registrations_controller.rb

@@ -30,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!
@@ -80,6 +80,13 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
     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
@@ -89,4 +96,14 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   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/views/spree/user_passwords/new.html.erb

@@ -8,10 +8,9 @@
         <div class="card-body">
           <p><%= Spree.t(:instructions_to_reset_password) %></p>
 
-          <%= form_for Spree::User.new, as: :spree_user, url: spree.reset_password_path do |f| %>
+          <%= form_for Spree.user_class.new, as: :spree_user, url: spree.reset_password_path do |f| %>
             <div class="form-group">
-              <%= f.label :email, Spree.t(:email), class: 'spree-flat-label' %>
-              <%= f.email_field :email, class: "spree-flat-input" %>
+              <%= f.email_field :email, class: "spree-flat-input", placeholder: Spree.t(:email) %>
             </div>
             <div>
               <%= f.submit Spree.t(:reset_password), class: 'btn btn-primary btn-block spree-btn mt-2' %>

data/config/locales/en.yml

@@ -9,6 +9,8 @@ en:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.
       send_instructions: You will receive an email with instructions about how to confirm your account in a few minutes.
+      spree_user:
+        already_confirmed: Email was already confirmed, please try signing in.
     failure:
       inactive: Your account was not activated yet.
       invalid: Invalid email or password.
@@ -41,7 +43,7 @@ en:
     user_registrations:
       destroyed: Bye! Your account was successfully cancelled. We hope to see you again soon.
       inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
-      signed_up_but_unconfirmed: You have signed up successfully.
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
       signed_up: Welcome! You have signed up successfully.
       updated: You updated your account successfully.
     user_sessions:

data/config/routes.rb

@@ -1,6 +1,6 @@
 Spree::Core::Engine.add_routes do
   devise_for :spree_user,
-             class_name: 'Spree::User',
+             class_name: Spree.user_class.to_s,
              controllers: { sessions: 'spree/user_sessions',
                                registrations: 'spree/user_registrations',
                                passwords: 'spree/user_passwords',
@@ -31,7 +31,7 @@ Spree::Core::Engine.add_routes do
 
   namespace :admin, path: Spree.admin_path do
     devise_for :spree_user,
-               class_name: 'Spree::User',
+               class_name: Spree.user_class.to_s,
                controllers: { sessions: 'spree/admin/user_sessions',
                                  passwords: 'spree/admin/user_passwords' },
                skip: [:unlocks, :omniauth_callbacks, :registrations],

data/db/migrate/20120203010234_add_reset_password_sent_at_to_spree_users.rb

@@ -1,7 +1,7 @@
 class AddResetPasswordSentAtToSpreeUsers < SpreeExtension::Migration[4.2]
   def change
-    Spree::User.reset_column_information
-    unless Spree::User.column_names.include?("reset_password_sent_at")
+    Spree.user_class.reset_column_information
+    unless Spree.user_class.column_names.include?("reset_password_sent_at")
       add_column :spree_users, :reset_password_sent_at, :datetime
     end
   end

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

@@ -6,7 +6,7 @@ module Spree::CheckoutControllerDecorator
   end
 
   def registration
-    @user = Spree::User.new
+    @user = Spree.user_class.new
   end
 
   def update_registration
@@ -14,7 +14,7 @@ module Spree::CheckoutControllerDecorator
       redirect_to spree.checkout_state_path(:address)
     else
       flash[:error] = t(:email_is_invalid, scope: [:errors, :messages])
-      @user = Spree::User.new
+      @user = Spree.user_class.new
       render 'registration'
     end
   end

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

@@ -10,7 +10,7 @@ class Spree::UsersController < Spree::StoreController
   end
 
   def create
-    @user = Spree::User.new(user_params)
+    @user = Spree.user_class.new(user_params)
     if @user.save
 
       if current_order
@@ -27,7 +27,7 @@ class Spree::UsersController < Spree::StoreController
     if @user.update(user_params)
       if params[:user][:password].present?
         # this logic needed b/c devise wants to log us out after password changes
-        Spree::User.reset_password_by_token(params[:user])
+        Spree.user_class.reset_password_by_token(params[:user])
         if Spree::Auth::Config[:signout_after_password_change]
           sign_in(@user, event: :authentication)
         else
@@ -52,7 +52,7 @@ class Spree::UsersController < Spree::StoreController
   end
 
   def authorize_actions
-    authorize! params[:action].to_sym, Spree::User.new
+    authorize! params[:action].to_sym, Spree.user_class.new
   end
 
   def accurate_title

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

@@ -5,7 +5,7 @@
 
   <p><%= Spree.t(:instructions_to_reset_password) %></p>
 
-  <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
+  <%= form_for Spree.user_class.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
     <p>
       <%= f.label :email, Spree.t(:email) %><br />
       <%= f.email_field :email %>

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

@@ -4,7 +4,7 @@
 
 <div data-hook="login" class="card border-0">
   <div class="card-body">
-    <%= form_for Spree::User.new, :as => :spree_user, :url => spree.admin_create_new_session_path do |f| %>
+    <%= form_for Spree.user_class.new, :as => :spree_user, :url => spree.admin_create_new_session_path do |f| %>
       <div id="password-credentials">
         <div class="form-group text-center">
           <%= f.label :email, Spree.t(:email) %>

data/spec/controllers/spree/user_registrations_controller_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
           order = create(:order, guest_token: 'ABC', user_id: nil, created_by_id: nil)
         end
         post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }}
-        user = Spree::User.find_by_email('foobar@example.com')
+        user = Spree.user_class.find_by_email('foobar@example.com')
 
         order.reload
         expect(order.user_id).to eq user.id

data/spec/features/checkout_spec.rb

@@ -126,7 +126,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
       click_button 'Save and Continue'
 
       expect(page).to have_text 'Order placed successfully'
-      expect(Spree::Order.first.user).to eq Spree::User.find_by_email('test@person.com')
+      expect(Spree::Order.first.user).to eq Spree.user_class.find_by_email('test@person.com')
     end
   end
 end

data/spec/features/confirmation_spec.rb

@@ -20,7 +20,7 @@ RSpec.feature 'Confirmation', type: :feature, reload_user: true do
     fill_in 'Password Confirmation', with: 'password'
     click_button 'Sign Up'
 
-    expect(page).to have_text 'You have signed up successfully.'
-    expect(Spree::User.last.confirmed?).to be(false)
+    expect(page).to have_text I18n.t('devise.user_registrations.signed_up_but_unconfirmed')
+    expect(Spree.user_class.last.confirmed?).to be(false)
   end
 end

data/spec/features/sign_up_spec.rb

@@ -10,7 +10,7 @@ RSpec.feature 'Sign Up', type: :feature do
       click_button 'Sign Up'
 
       expect(page).to have_text 'You have signed up successfully.'
-      expect(Spree::User.count).to eq(1)
+      expect(Spree.user_class.count).to eq(1)
     end
   end
 
@@ -25,7 +25,7 @@ RSpec.feature 'Sign Up', type: :feature do
       click_button 'Sign Up'
 
       expect(page).to have_css '#errorExplanation'
-      expect(Spree::User.count).to eq(0)
+      expect(Spree.user_class.count).to eq(0)
     end
   end
 end

data/spec/models/user_spec.rb

@@ -31,9 +31,9 @@ RSpec.describe Spree::User, type: :model do
       order.save
       user = order.user
       user.destroy
-      expect(Spree::User.find_by_id(user.id)).to be_nil
-      expect(Spree::User.with_deleted.find_by_id(user.id).id).to eq(user.id)
-      expect(Spree::User.with_deleted.find_by_id(user.id).orders.first).to eq(order)
+      expect(Spree.user_class.find_by_id(user.id)).to be_nil
+      expect(Spree.user_class.with_deleted.find_by_id(user.id).id).to eq(user.id)
+      expect(Spree.user_class.with_deleted.find_by_id(user.id).orders.first).to eq(order)
 
       expect(Spree::Order.find_by_user_id(user.id)).not_to be_nil
       expect(Spree::Order.where(user_id: user.id).first).to eq(order)
@@ -67,13 +67,13 @@ RSpec.describe Spree::User, type: :model do
     it "is confirmable if the confirmable option is enabled" do
       set_confirmable_option(true)
       Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))
-      expect(Spree::User.devise_modules).to include(:confirmable)
+      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.devise_modules).to_not include(:confirmable)
+      expect(Spree.user_class.devise_modules).to_not include(:confirmable)
     end
   end
 end

data/spree_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '4.1.0.rc1'
+  s.version     = '4.1.0'
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-rails', '~> 4.0.0.beta2'
   s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'selenium-webdriver'
-  s.add_development_dependency 'shoulda-matchers', '~> 3.1'
+  s.add_development_dependency 'shoulda-matchers', '~> 4.3'
   s.add_development_dependency 'simplecov', '~> 0.12'
   s.add_development_dependency 'spree_backend', spree_version
   s.add_development_dependency 'spree_frontend', spree_version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc1
+  version: 4.1.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -330,14 +330,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -561,9 +561,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.0.2