solidus_auth_devise 2.5.9 → 2.6.1

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 class Spree::Admin::UserPasswordsController < Devise::PasswordsController
-  helper 'spree/base'
+  helper "spree/base"
 
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Store
 
-  helper 'spree/admin/navigation'
-  layout 'spree/layouts/admin'
+  helper "spree/admin/navigation"
+  layout "spree/layouts/admin"
 
   skip_before_action :require_no_authentication, only: [:create]
 
@@ -24,8 +24,9 @@ class Spree::Admin::UserPasswordsController < Devise::PasswordsController
 
     set_flash_message(:notice, :send_instructions) if is_navigational_format?
 
-    if resource.errors.empty?
-      respond_with resource, location: admin_user_path(resource)
+    if successfully_sent?(resource)
+      location = (spree_current_user && resource.persisted?) ? admin_user_path(resource) : admin_login_path
+      respond_with resource, location: location
     else
       respond_with_navigational(resource) { render :new }
     end

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 class Spree::Admin::UserSessionsController < Devise::SessionsController
-  helper 'spree/base'
+  helper "spree/base"
 
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::Store
 
-  helper 'spree/admin/navigation'
-  layout 'spree/layouts/admin'
+  helper "spree/admin/navigation"
+  layout "spree/layouts/admin"
 
   def create
     authenticate_spree_user!
@@ -16,16 +16,16 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
     if spree_user_signed_in?
       respond_to do |format|
         format.html {
-          flash[:success] = I18n.t('spree.logged_in_succesfully')
+          flash[:success] = I18n.t("spree.logged_in_succesfully")
           redirect_back_or_default(after_sign_in_path_for(spree_current_user))
         }
         format.js {
           user = resource.record
-          render json: { ship_address: user.ship_address, bill_address: user.bill_address }.to_json
+          render json: {ship_address: user.ship_address, bill_address: user.bill_address}.to_json
         }
       end
     else
-      flash.now[:error] = t('devise.failure.invalid')
+      flash.now[:error] = t("devise.failure.invalid")
       render :new
     end
   end
@@ -49,7 +49,7 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
   end
 
   def accurate_title
-    I18n.t('spree.login')
+    I18n.t("spree.login")
   end
 
   def redirect_back_or_default(default)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Spree::UserConfirmationsController < Devise::ConfirmationsController
-  helper 'spree/base', 'spree/store'
+  helper "spree/base", "spree/store"
 
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Spree::UserPasswordsController < Devise::PasswordsController
-  helper 'spree/base', 'spree/store'
+  helper "spree/base", "spree/store"
 
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
@@ -20,7 +20,7 @@ class Spree::UserPasswordsController < Devise::PasswordsController
 
     set_flash_message(:notice, :send_instructions) if is_navigational_format?
 
-    if resource.errors.empty?
+    if successfully_sent?(resource)
       respond_with resource, location: spree.login_path
     else
       respond_with_navigational(resource) { render :new }
@@ -44,7 +44,7 @@ class Spree::UserPasswordsController < Devise::PasswordsController
   protected
 
   def translation_scope
-    'devise.user_passwords'
+    "devise.user_passwords"
   end
 
   def new_session_path(resource_name)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Spree::UserRegistrationsController < Devise::RegistrationsController
-  helper 'spree/base', 'spree/store'
+  helper "spree/base", "spree/store"
 
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
@@ -29,7 +29,7 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   protected
 
   def translation_scope
-    'devise.user_registrations'
+    "devise.user_registrations"
   end
 
   def check_permissions

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Spree::UserSessionsController < Devise::SessionsController
-  helper 'spree/base', 'spree/store'
+  helper "spree/base", "spree/store"
 
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
@@ -18,7 +18,7 @@ class Spree::UserSessionsController < Devise::SessionsController
     if spree_user_signed_in?
       respond_to do |format|
         format.html do
-          flash[:success] = I18n.t('spree.logged_in_succesfully')
+          flash[:success] = I18n.t("spree.logged_in_succesfully")
           redirect_back_or_default(after_sign_in_path_for(spree_current_user))
         end
         format.js { render success_json }
@@ -26,11 +26,11 @@ class Spree::UserSessionsController < Devise::SessionsController
     else
       respond_to do |format|
         format.html do
-          flash.now[:error] = t('devise.failure.invalid')
+          flash.now[:error] = t("devise.failure.invalid")
           render :new
         end
         format.js do
-          render json: { error: t('devise.failure.invalid') },
+          render json: {error: t("devise.failure.invalid")},
             status: :unprocessable_entity
         end
       end
@@ -40,13 +40,13 @@ class Spree::UserSessionsController < Devise::SessionsController
   protected
 
   def translation_scope
-    'devise.user_sessions'
+    "devise.user_sessions"
   end
 
   private
 
   def accurate_title
-    I18n.t('spree.login')
+    I18n.t("spree.login")
   end
 
   def redirect_back_or_default(default)

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

@@ -4,11 +4,12 @@ class Spree::UsersController < Spree::StoreController
   skip_before_action :set_current_order, only: :show, raise: false
   prepend_before_action :authorize_actions, only: :new
 
-  def new; end
+  def new
+  end
 
   def show
     load_object
-    @orders = @user.orders.complete.order('completed_at desc')
+    @orders = @user.orders.complete.order("completed_at desc")
   end
 
   def create
@@ -37,13 +38,13 @@ class Spree::UsersController < Spree::StoreController
 
       if params[:user][:password].present?
         # this logic needed b/c devise wants to log us out after password changes
-        if Spree::Auth::Config[:signout_after_password_change]
+        if Spree::Auth::Config.signout_after_password_change
           redirect_url = spree.login_url
         else
           bypass_sign_in(@user)
         end
       end
-      redirect_to redirect_url, notice: I18n.t('spree.account_updated')
+      redirect_to redirect_url, notice: I18n.t("spree.account_updated")
     else
       render :edit
     end
@@ -65,6 +66,6 @@ class Spree::UsersController < Spree::StoreController
   end
 
   def accurate_title
-    I18n.t('spree.my_account')
+    I18n.t("spree.my_account")
   end
 end

data/lib/generators/solidus/auth/install/install_generator.rb

@@ -14,30 +14,38 @@ module Solidus
         source_root "#{__dir__}/templates"
 
         def generate_devise_key
-          template 'config/initializers/devise.rb', 'config/initializers/devise.rb', skip: true
+          template "config/initializers/devise.rb.erb", "config/initializers/devise.rb", skip: true
         end
 
         def add_migrations
-          admin_email = options[:admin_email] || (options[:interactive] && ask("Email:", default: 'admin@example.com'))
-          admin_password = options[:admin_password] || (options[:interactive] && ask("Password:", default: 'test123'))
-
-          options = []
-          options << "ADMIN_EMAIL=#{admin_email}" if admin_email
-          options << "ADMIN_PASSWORD=#{admin_password}" if admin_password
-
-          rake "railties:install:migrations FROM=solidus_auth #{options.shelljoin}"
+          rake "railties:install:migrations FROM=solidus_auth"
         end
 
         def run_migrations
           if options[:skip_migrations] ||
-            options[:auto_run_migrations] == false || # exclude nil
-            options[:interactive] && no?('Would you like to run the migrations now?')
+              options[:auto_run_migrations] == false || # exclude nil
+              options[:interactive] && no?("Would you like to run the migrations now?")
 
-            say_status :skip, 'Skipping rake db:migrate, don\'t forget to run it!', :yellow
+            @migrations_skipped = true
+            say_status :skip, "Skipping rake db:migrate, don't forget to run it!", :yellow
           else
-            rake 'db:migrate'
+            rake "db:migrate"
           end
         end
+
+        def create_admin_user
+          return if @migrations_skipped
+
+          admin_email = options[:admin_email] || (options[:interactive] && ask("Email:", default: "admin@example.com"))
+          admin_password = options[:admin_password] || (options[:interactive] && ask("Password:", default: "test123"))
+          return unless admin_email || admin_password
+
+          env = []
+          env << "ADMIN_EMAIL=#{admin_email.shellescape}" if admin_email
+          env << "ADMIN_PASSWORD=#{admin_password.shellescape}" if admin_password
+
+          rake "spree_auth:admin:create #{env.join(" ")}"
+        end
       end
     end
   end

data/lib/generators/solidus/auth/install/templates/config/initializers/devise.rb.erb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+Devise.secret_key = '<%= SecureRandom.hex(64) %>'
+Devise.email_regexp = Spree::Config.default_email_regexp

data/lib/generators/solidus_auth_devise/install/install_generator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../solidus/auth/install/install_generator'
+require_relative "../../solidus/auth/install/install_generator"
 
 module SolidusAuthDevise
   module Generators
@@ -11,7 +11,7 @@ module SolidusAuthDevise
       end
 
       def forward_to_spree_auth_install
-        generate 'solidus:auth:install', *ARGV
+        generate "solidus:auth:install", *ARGV
       end
     end
   end

data/lib/{decorators/backend/controllers/spree/admin/base_controller_decorator.rb → patches/backend/controllers/solidus_auth_devise/admin/base_controller_patch.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-module Spree
+module SolidusAuthDevise
   module Admin
-    module BaseControllerDecorator
+    module BaseControllerPatch
       protected
 
       def model_class

data/lib/patches/backend/controllers/solidus_auth_devise/admin/orders/customer_details_controller_patch.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module SolidusAuthDevise
+  module Admin
+    module Orders
+      module CustomerDetailsControllerPatch
+        def self.prepended(base)
+          base.before_action :check_authorization
+        end
+
+        private
+
+        def check_authorization
+          load_order
+          session[:access_token] ||= params[:token]
+
+          resource = @order
+          action = params[:action].to_sym
+          action = :edit if action == :show # show route renders :edit for this controller
+
+          authorize! action, resource, session[:access_token]
+        end
+
+        Spree::Admin::Orders::CustomerDetailsController.prepend self
+      end
+    end
+  end
+end

data/lib/{decorators/frontend/controllers/spree/checkout_controller_decorator.rb → patches/frontend/controllers/solidus_auth_devise/checkout_controller_patch.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module Spree
-  module CheckoutControllerDecorator
+module SolidusAuthDevise
+  module CheckoutControllerPatch
     def self.prepended(base)
       base.before_action :check_registration, except: [:registration, :update_registration]
       base.before_action :check_authorization
@@ -21,20 +21,20 @@ module Spree
       else
         flash[:registration_error] = t(:email_is_invalid, scope: [:errors, :messages])
         @user = Spree::User.new
-        render 'registration'
+        render "registration"
       end
     end
 
     private
 
     def order_params
-      params.
-        fetch(:order, {}).
-        permit(:email)
+      params
+        .fetch(:order, {})
+        .permit(:email)
     end
 
     def skip_state_validation?
-      %w(registration update_registration).include?(params[:action])
+      %w[registration update_registration].include?(params[:action])
     end
 
     def check_authorization
@@ -50,7 +50,7 @@ module Spree
     end
 
     def registration_required?
-      Spree::Auth::Config[:registration_step] &&
+      Spree::Auth::Config.registration_step &&
         !already_registered?
     end
 
@@ -60,7 +60,7 @@ module Spree
 
     def guest_authenticated?
       current_order&.email.present? &&
-        Spree::Config[:allow_guest_checkout]
+        Spree::Config.allow_guest_checkout
     end
 
     # Overrides the equivalent method defined in Spree::Core.  This variation of the method will ensure that users

data/lib/solidus_auth_devise/configuration.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'spree/auth_configuration'
+require "spree/auth_configuration"

data/lib/solidus_auth_devise/engine.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'spree/auth/engine'
+require "spree/auth/engine"

data/lib/solidus_auth_devise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusAuthDevise
-  VERSION = '2.5.9'
+  VERSION = "2.6.1"
 end

data/lib/solidus_auth_devise.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require 'solidus_core'
-require 'solidus_support'
-require 'deface'
-require 'devise'
-require 'devise-encryptable'
-require 'cancan'
+require "solidus_core"
+require "solidus_support"
+require "deface"
+require "devise"
+require "devise-encryptable"
+require "cancan"
 
-require 'solidus_auth_devise/configuration'
-require 'solidus_auth_devise/version'
-require 'solidus_auth_devise/engine'
-
-require 'spree/authentication_helpers'
+require "solidus_auth_devise/configuration"
+require "solidus_auth_devise/version"
+require "solidus_auth_devise/engine"

data/lib/spree/auth/engine.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'solidus_auth_devise'
-require 'devise'
-require 'devise-encryptable'
-require 'spree/auth/version'
+require "solidus_auth_devise"
+require "devise"
+require "devise-encryptable"
+require "spree/auth/version"
 
 module Spree
   module Auth
@@ -11,23 +11,19 @@ module Spree
       include SolidusSupport::EngineExtensions
 
       isolate_namespace Spree
-      engine_name 'solidus_auth'
+      engine_name "solidus_auth"
+
+      Spree.user_class = "Spree::User"
 
       initializer "spree.auth.environment", before: :load_config_initializers do |_app|
-        require 'spree/auth_configuration'
+        require "spree/auth_configuration"
 
         Spree::Auth::Config = Spree::AuthConfiguration.new
       end
 
-      initializer "solidus_auth_devise.set_user_class", after: :load_config_initializers do
-        Spree.user_class = "Spree::User"
-      end
-
       config.to_prepare do
         Spree::Auth::Engine.prepare_backend if SolidusSupport.backend_available?
         Spree::Auth::Engine.prepare_frontend if SolidusSupport.frontend_available?
-
-        ApplicationController.include Spree::AuthenticationHelpers
       end
 
       def self.redirect_back_on_unauthorized?
@@ -51,7 +47,7 @@ module Spree
       def self.prepare_backend
         Spree::Admin::BaseController.unauthorized_redirect = -> do
           if spree_current_user
-            flash[:error] = I18n.t('spree.authorization_failure')
+            flash[:error] = I18n.t("spree.authorization_failure")
 
             if Spree::Auth::Engine.redirect_back_on_unauthorized?
               redirect_back(fallback_location: spree.admin_unauthorized_path)
@@ -70,11 +66,10 @@ module Spree
         end
       end
 
-
       def self.prepare_frontend
         Spree::BaseController.unauthorized_redirect = -> do
           if spree_current_user
-            flash[:error] = I18n.t('spree.authorization_failure')
+            flash[:error] = I18n.t("spree.authorization_failure")
 
             if Spree::Auth::Engine.redirect_back_on_unauthorized?
               redirect_back(fallback_location: spree.unauthorized_path)

data/lib/spree/auth/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'solidus_auth_devise/version'
+require "solidus_auth_devise/version"
 
 module Spree
   module Auth

data/lib/tasks/auth.rake

@@ -4,7 +4,7 @@ namespace :spree_auth do
   namespace :admin do
     desc "Create admin username and password"
     task create: :environment do
-      require File.join(File.dirname(__FILE__), '..', '..', 'db', 'default', 'users.rb')
+      require File.join(File.dirname(__FILE__), "..", "..", "db", "default", "users.rb")
       puts "Done!"
     end
   end

data/lib/views/frontend/spree/checkout/registration.html.erb

@@ -4,7 +4,7 @@
   <div id="account" class="columns alpha eight">
     <%= render template: 'spree/user_sessions/new' %>
   </div>
-  <% if Spree::Config[:allow_guest_checkout] %>
+  <% if Spree::Config.allow_guest_checkout %>
     <div id="guest_checkout" data-hook class="columns omega eight">
       <h6><%= t('spree.guest_user_account') %></h6>
       <% if flash[:registration_error] %>

data/solidus_auth_devise.gemspec

@@ -1,41 +1,40 @@
 # frozen_string_literal: true
 
-require_relative 'lib/solidus_auth_devise/version'
+require_relative "lib/solidus_auth_devise/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'solidus_auth_devise'
+  spec.name = "solidus_auth_devise"
   spec.version = SolidusAuthDevise::VERSION
-  spec.authors = ['Solidus Team']
-  spec.email = 'contact@solidus.io'
+  spec.authors = ["Solidus Team"]
+  spec.email = "contact@solidus.io"
 
-  spec.summary = 'Provides authentication and authorization services for use with Solidus by using Devise and CanCan.'
-  spec.homepage = 'https://github.com/solidusio/solidus_auth_devise'
-  spec.license = 'BSD-3-Clause'
+  spec.summary = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
+  spec.homepage = "https://github.com/solidusio/solidus_auth_devise"
+  spec.license = "BSD-3-Clause"
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/solidusio/solidus_auth_devise'
-  spec.metadata['changelog_uri'] = 'https://github.com/solidusio/solidus_auth_devise/releases'
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/solidusio/solidus_auth_devise"
+  spec.metadata["changelog_uri"] = "https://github.com/solidusio/solidus_auth_devise/releases"
 
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 4')
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5", "< 5")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
 
   spec.files = files.grep_v(%r{^(test|spec|features)/})
-  spec.test_files = files.grep(%r{^(test|spec|features)/})
   spec.bindir = "exe"
   spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'deface', '~> 1.0'
-  spec.add_dependency 'devise', '~> 4.1'
-  spec.add_dependency 'devise-encryptable', '0.2.0'
-  spec.add_dependency 'solidus_core', ['>= 3', '< 5']
-  spec.add_dependency 'solidus_support', '~> 0.5'
+  spec.add_dependency "deface", "~> 1.0"
+  spec.add_dependency "devise", ">= 4.1"
+  spec.add_dependency "devise-encryptable", "0.2.0"
+  spec.add_dependency "solidus_core", [">= 3", "< 5"]
+  spec.add_dependency "solidus_support", "~> 0.11"
 
-  spec.add_development_dependency 'solidus_backend'
-  spec.add_development_dependency 'solidus_frontend'
-  spec.add_development_dependency 'solidus_dev_support', '~> 2.5'
-  spec.add_development_dependency 'rails-controller-testing'
+  spec.add_development_dependency "solidus_backend"
+  spec.add_development_dependency "solidus_frontend"
+  spec.add_development_dependency "solidus_dev_support", "~> 2.10"
+  spec.add_development_dependency "rails-controller-testing"
 end