solidus_auth_devise 2.5.5 → 2.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eabe96f35091dbe9f4cac913044f4eb301bd049adb5cb1f8b7b98616847cdf0f
-  data.tar.gz: '009afc8b8585d494940949bebaae6dc3ffdf2f80fb26f16189ecd1299c65c669'
+  metadata.gz: 7714facb5fe5f4230194a4680c5f63a5f3257726811ec9a2ac337f96b20b297a
+  data.tar.gz: fac0bd47a9a25e211bf56135a334e5f1e3b9525513f290b0b18016e8d5409446
 SHA512:
-  metadata.gz: 7991cf3c2104f5e1cb21fe59d251a0d38c060ffb1b98788abc21598419034d19307879e0ebc075c1b9683a8c77bf1c2cb94438f21f197e6acb3a8105da0c76a8
-  data.tar.gz: 0abb460d4822728befdbfa648d3b190412968b3e75049e64f05b3b3304368ec4212cfb5feaedb7c3f3b1a92b8f256e7815c8daa37f82611eadb36be3ca0ab51c
+  metadata.gz: eb4378a3029e4db8ba943cdb5a4a54fe5b2303a8d2dfe07d8cc7e4b16609987aa9927b5a84b47844cf5122652899a77293a25440f49f42bb65d1b38711d063e8
+  data.tar.gz: 0332cdb250463314283e1ee3da8c3ed2ce697d0851d6c3aef946183d53c647f1d533a3f8793567fe43d15d07451890104142faaeb9b5ce74e651a7dc5f83dafb

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

@@ -17,7 +17,7 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
       respond_to do |format|
         format.html {
           flash[:success] = I18n.t('spree.logged_in_succesfully')
-          redirect_to stored_spree_user_location_or(after_sign_in_path_for(spree_current_user))
+          redirect_back_or_default(after_sign_in_path_for(spree_current_user))
         }
         format.js {
           user = resource.record
@@ -47,4 +47,9 @@ class Spree::Admin::UserSessionsController < Devise::SessionsController
   def accurate_title
     I18n.t('spree.login')
   end
+
+  def redirect_back_or_default(default)
+    redirect_to(session["spree_user_return_to"] || default)
+    session["spree_user_return_to"] = nil
+  end
 end

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

@@ -19,7 +19,7 @@ class Spree::UserSessionsController < Devise::SessionsController
       respond_to do |format|
         format.html do
           flash[:success] = I18n.t('spree.logged_in_succesfully')
-          redirect_to stored_spree_user_location_or(after_sign_in_path_for(spree_current_user))
+          redirect_back_or_default(after_sign_in_path_for(spree_current_user))
         end
         format.js { render success_json }
       end
@@ -49,6 +49,11 @@ class Spree::UserSessionsController < Devise::SessionsController
     I18n.t('spree.login')
   end
 
+  def redirect_back_or_default(default)
+    redirect_to(session["spree_user_return_to"] || default)
+    session["spree_user_return_to"] = nil
+  end
+
   def success_json
     {
       json: {

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

@@ -17,7 +17,7 @@ class Spree::UsersController < Spree::StoreController
         session[:guest_token] = nil
       end
 
-      redirect_to stored_spree_user_location_or(root_url)
+      redirect_back_or_default(root_url)
     else
       render :new
     end

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

@@ -45,6 +45,7 @@ module Spree
     def check_registration
       return unless registration_required?
 
+      store_location
       redirect_to spree.checkout_registration_path
     end
 

data/lib/solidus_auth_devise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusAuthDevise
-  VERSION = '2.5.5'
+  VERSION = '2.5.6'
 end

data/lib/spree/auth/engine.rb

@@ -59,6 +59,7 @@ module Spree
               redirect_to spree.admin_unauthorized_path
             end
           else
+            store_location
 
             if Spree::Auth::Engine.redirect_back_on_unauthorized?
               redirect_back(fallback_location: spree.admin_login_path)
@@ -69,6 +70,7 @@ module Spree
         end
       end
 
+
       def self.prepare_frontend
         Spree::BaseController.unauthorized_redirect = -> do
           if spree_current_user
@@ -80,6 +82,7 @@ module Spree
               redirect_to spree.unauthorized_path
             end
           else
+            store_location
 
             if Spree::Auth::Engine.redirect_back_on_unauthorized?
               redirect_back(fallback_location: spree.login_path)

data/lib/spree/authentication_helpers.rb

@@ -23,30 +23,5 @@ module Spree
                to: :spree,
                prefix: :spree
     end
-
-    private
-
-    def authenticate_spree_user!
-      store_spree_user_location! if storable_spree_user_location?
-
-      super
-    end
-
-    # It's important that the location is NOT stored if:
-    # - The request method is not GET (non idempotent)
-    # - The request is handled by a Devise controller such as Devise::SessionsController as that could cause an
-    #    infinite redirect loop.
-    # - The request is an Ajax request as this can lead to very unexpected behaviour.
-    def storable_spree_user_location?
-      request.get? && is_navigational_format? && !devise_controller? && !request.xhr?
-    end
-
-    def store_spree_user_location!
-      store_location_for(:spree_current_user, request.fullpath)
-    end
-
-    def stored_spree_user_location_or(fallback_location)
-      stored_location_for(:spree_current_user) || fallback_location
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.5.6
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -142,7 +142,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: contact@solidus.io
 executables: []
 extensions: []
@@ -283,7 +283,7 @@ metadata:
   homepage_uri: https://github.com/solidusio/solidus_auth_devise
   source_code_uri: https://github.com/solidusio/solidus_auth_devise
   changelog_uri: https://github.com/solidusio/solidus_auth_devise/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -301,8 +301,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by
   using Devise and CanCan.