spree_auth_devise 4.0.0 → 4.3.1

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',
@@ -27,12 +27,11 @@ Spree::Core::Engine.add_routes do
   get '/checkout/registration' => 'checkout#registration', :as => :checkout_registration
   put '/checkout/registration' => 'checkout#update_registration', :as => :update_checkout_registration
 
-  get '/account_link' => 'store#account_link'
   resource :account, controller: 'users'
 
   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],
@@ -45,4 +44,14 @@ Spree::Core::Engine.add_routes do
       get '/logout' => 'user_sessions#destroy', :as => :logout
     end
   end
+
+  namespace :api, defaults: { format: 'json' } do
+    namespace :v2 do
+      namespace :storefront do
+        resource :account, controller: :account, only: %i[show create update]
+        resources :account_confirmations, only: %i[show]
+        resources :passwords, controller: :passwords, only: %i[create update]
+      end
+    end
+  end
 end

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/gemfiles/{spree_3_2.gemfile → spree_4_1.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails-controller-testing"
-gem "spree", "~> 3.2.0"
+gem "spree", "~> 4.1"
 
 gemspec path: "../"

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

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

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

@@ -6,7 +6,8 @@ module Spree::CheckoutControllerDecorator
   end
 
   def registration
-    @user = Spree::User.new
+    @user = Spree.user_class.new 
+    @title = Spree.t(:registration)
   end
 
   def update_registration
@@ -14,7 +15,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

@@ -1,5 +1,5 @@
 class Spree::UsersController < Spree::StoreController
-  skip_before_action :set_current_order, only: :show
+  before_action :set_current_order, except: :show
   prepend_before_action :load_object, only: [:show, :edit, :update]
   prepend_before_action :authorize_actions, only: :new
 
@@ -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/generators/spree/auth/install/install_generator.rb

@@ -10,10 +10,6 @@ module Spree
           paths.flatten
         end
 
-        def add_javascripts
-          append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_auth\n"
-        end
-
         def generate_devise_key
           return if ENV['CI']
           template 'config/initializers/devise.rb', 'config/initializers/devise.rb'

data/lib/spree/auth/engine.rb

@@ -42,7 +42,12 @@ module Spree
             'lib/assets/javascripts/spree/frontend/spree_auth.js',
             'lib/assets/javascripts/spree/frontend/spree_auth.css'
           ]
-          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/*/*_decorator*.rb")) do |c|
+          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/**/*_decorator*.rb")) do |c|
+            Rails.configuration.cache_classes ? require(c) : load(c)
+          end
+        end
+        if Spree::Auth::Engine.api_available?
+          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/api/**/*_decorator*.rb")) do |c|
             Rails.configuration.cache_classes ? require(c) : load(c)
           end
         end
@@ -61,6 +66,10 @@ module Spree
         @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Frontend::Engine')
       end
 
+      def self.api_available?
+        @@api_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Api::Engine')
+      end
+
       if backend_available?
         paths["app/controllers"] << "lib/controllers/backend"
         paths["app/views"] << "lib/views/backend"
@@ -71,6 +80,10 @@ module Spree
         paths["app/views"] << "lib/views/frontend"
       end
 
+      if api_available?
+        paths["app/controllers"] << "lib/controllers/api"
+      end
+
       config.to_prepare &method(:activate).to_proc
     end
   end

data/lib/spree/testing_support/auth_helpers.rb

@@ -0,0 +1,36 @@
+module Spree
+  module TestingSupport
+    module AuthHelpers
+      def log_in(email:, password:, remember_me: true)
+        visit spree.login_path
+
+        fill_in 'Email', with: email
+        fill_in 'Password', with: password
+
+        # Regression test for #1257
+        first('label', text: 'Remember me').click if remember_me
+        click_button 'Log in'
+
+        expect(page).to have_content 'Logged in successfully'
+      end
+
+      def log_out
+        show_user_menu
+        click_link 'LOG OUT'
+
+        expect(page).to have_content 'Signed out successfully'
+      end
+
+      def show_user_menu
+        find("button[aria-label='Show user menu']").click
+      end
+
+      def show_user_account
+        within '#nav-bar' do
+          show_user_menu
+          click_link 'MY ACCOUNT'
+        end
+      end
+    end
+  end
+end

data/lib/spree/testing_support/checkout_helpers.rb

@@ -0,0 +1,24 @@
+module Spree
+  module TestingSupport
+    module CheckoutHelpers
+      def fill_in_address
+        address = 'order_bill_address_attributes'
+        fill_in "#{address}_firstname", with: 'Ryan'
+        fill_in "#{address}_lastname", with: 'Bigg'
+        fill_in "#{address}_address1", with: '143 Swan Street'
+        fill_in "#{address}_city", with: 'Richmond'
+        select country.name, from: "#{address}_country_id"
+        select state.name, from: "#{address}_state_id"
+        fill_in "#{address}_zipcode", with: '12345'
+        fill_in "#{address}_phone", with: '(555) 555-5555'
+      end
+
+      def fill_in_credit_card_info(invalid: false)
+        fill_in 'name_on_card', with: 'Spree Commerce'
+        fill_in 'card_number', with: invalid ? '123' : '4111 1111 1111 1111'
+        fill_in 'card_expiry', with: '12 / 24'
+        fill_in 'card_code', with: '123'
+      end
+    end
+  end
+end

data/lib/spree_auth_devise.rb

@@ -1,5 +1,4 @@
 require 'spree_core'
 require 'spree/auth/devise'
 require 'spree/authentication_helpers'
-require 'deface'
 require 'spree_extension'

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/admin/orders_controller_spec.rb

@@ -5,7 +5,7 @@ module Spree
 
       context '#authorize_admin' do
         it 'grants access to users with an admin role' do
-          spree_get :new
+          get :new
           expect(response).to redirect_to spree.cart_admin_order_path(Order.last)
         end
       end

data/spec/controllers/spree/admin/user_sessions_controller_spec.rb

@@ -2,7 +2,7 @@ RSpec.describe Spree::Admin::UserSessionsController, type: :controller do
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
 
   describe '#authorization_failure' do
-    subject { spree_get :authorization_failure }
+    subject { get :authorization_failure }
 
     context 'user signed in' do
       before { allow(controller).to receive(:spree_current_user) { build_stubbed(:user) } }

data/spec/controllers/spree/api/v2/storefront/passwords_controller_spec.rb

@@ -0,0 +1,63 @@
+RSpec.describe Spree::Api::V2::Storefront::PasswordsController, type: :controller do
+  let(:user) { create(:user) }
+  let(:password) { 'new_password' }
+  let(:store) { create(:store) }
+
+  describe 'POST create' do
+    before { post :create, params: params }
+
+    context 'when the user email has not been specified' do
+      let(:params) { { user: { email: '' } } }
+      it 'responds with not found status' do
+        expect(response.code).to eq('404')
+      end
+    end
+
+    context 'when the user email not found' do
+      let(:params) { { user: { email: 'dummy_email@example.com' } } }
+      it 'responds with not found status' do
+        expect(response.code).to eq('404')
+      end
+    end
+
+    context 'when the user email has been specified' do
+      let(:params) { { user: { email: user.email } } }
+      it_behaves_like 'returns 200 HTTP status'
+    end
+  end
+
+  describe 'PATCH update' do
+    before { patch :update, params: params }
+
+    context 'when updating password with blank password' do
+      let(:params) {
+        {
+          id: user.send_reset_password_instructions(Spree::Store.current),
+          user: {
+            password: '',
+            password_confirmation: ''
+          }
+        }
+      }
+
+      it 'responds with error' do
+        expect(response.code).to eq('422')
+        expect(JSON.parse(response.body)['error']).to eq("Password can't be blank")
+      end
+    end
+
+    context 'when updating password with specified password' do
+      let(:params) {
+        {
+          id: user.send_reset_password_instructions(Spree::Store.current),
+          user: {
+            password: password,
+            password_confirmation: password
+          }
+        }
+      }
+
+      it_behaves_like 'returns 200 HTTP status'
+    end
+  end
+end

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -19,14 +19,14 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         before { allow(controller).to receive(:spree_current_user) { user } }
 
         it 'proceeds to the first checkout step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to render_template :edit
         end
       end
 
       context 'when authenticated as guest' do
         it 'redirects to registration step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to redirect_to spree.checkout_registration_path
         end
       end
@@ -42,14 +42,14 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         before { allow(controller).to receive(:spree_current_user) { user } }
 
         it 'proceeds to the first checkout step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to render_template :edit
         end
       end
 
       context 'when authenticated as guest' do
         it 'proceeds to the first checkout step' do
-          spree_get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to render_template :edit
         end
       end
@@ -81,9 +81,8 @@ RSpec.describe Spree::CheckoutController, type: :controller do
           else
             request.cookie_jar.signed[:guest_token] = 'ABC'
           end
-          spree_post :update, { state: 'confirm' }
+          post :update, params: { state: 'confirm' }
           expect(response).to redirect_to spree.order_path(order)
-          expect(flash.notice).to eq Spree.t(:order_processed_successfully)
         end
       end
 
@@ -99,7 +98,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         end
 
         it 'redirects to the standard order view' do
-          spree_post :update, { state: 'confirm' }
+          post :update, params: { state: 'confirm' }
           expect(response).to redirect_to spree.order_path(order)
         end
       end
@@ -110,7 +109,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
     it 'does not check registration' do
       allow(controller).to receive(:check_authorization)
       expect(controller).not_to receive(:check_registration)
-      spree_get :registration
+      get :registration
     end
 
     it 'checks if the user is authorized for :edit' do
@@ -120,7 +119,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       else
         request.cookie_jar.signed[:guest_token] = token
       end
-      spree_get :registration, {}
+      get :registration, params: {}
     end
   end
 
@@ -131,12 +130,12 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       controller.stub :check_authorization
       order.stub update: true
       controller.should_not_receive :check_registration
-      spree_put :update_registration, { order: {} }
+      put :update_registration, params: { order: {} }
     end
 
     it 'renders the registration view if unable to save' do
       allow(controller).to receive(:check_authorization)
-      spree_put :update_registration, { order: { email: 'invalid' } }
+      put :update_registration, params: { order: { email: 'invalid' } }
       expect(flash[:error]).to eq I18n.t(:email_is_invalid, scope: [:errors, :messages])
       expect(response).to render_template :registration
     end
@@ -144,7 +143,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
     it 'redirects to the checkout_path after saving' do
       allow(order).to receive(:update) { true }
       allow(controller).to receive(:check_authorization)
-      spree_put :update_registration, { order: { email: 'jobs@spreecommerce.com' } }
+      put :update_registration, params: { order: { email: 'jobs@spreecommerce.com' } }
       expect(response).to redirect_to spree.checkout_state_path(:address)
     end
 
@@ -156,7 +155,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       end
       allow(order).to receive(:update) { true }
       expect(controller).to receive(:authorize!).with(:edit, order, token)
-      spree_put :update_registration, { order: { email: 'jobs@spreecommerce.com' } }
+      put :update_registration, params: { order: { email: 'jobs@spreecommerce.com' } }
     end
   end
 end