From ee8cb5c3df782ff0b02944881b29d83529938c7e Mon Sep 17 00:00:00 2001 From: Elia Schito Date: Thu, 12 Jan 2023 13:47:39 +0100 Subject: [PATCH] Improve deprecation messages for the Auth module --- core/lib/spree/core/controller_helpers/auth.rb | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/core/lib/spree/core/controller_helpers/auth.rb b/core/lib/spree/core/controller_helpers/auth.rb index 35afa14534d..924341cdb0c 100644 --- a/core/lib/spree/core/controller_helpers/auth.rb +++ b/core/lib/spree/core/controller_helpers/auth.rb @@ -37,12 +37,6 @@ def current_ability end def redirect_back_or_default(default) - Spree::Deprecation.warn <<~MSG - 'Please use #stored_spree_user_location_or when using solidus_auth_devise. - Otherwise, please utilize #redirect_back provided in Rails 5+ or - #redirect_back_or_to in Rails 7+ instead' - MSG - redirect_to(session["spree_user_return_to"] || default) session["spree_user_return_to"] = nil end @@ -57,11 +51,6 @@ def set_guest_token end def store_location - Spree::Deprecation.warn <<~MSG - store_location is being deprecated in solidus 4.0 - without replacement - MSG - Spree::UserLastUrlStorer.new(self).store_location end @@ -83,7 +72,11 @@ def try_spree_current_user end end - deprecate try_spree_current_user: :spree_current_user, deprecator: Spree::Deprecation + deprecate \ + try_spree_current_user: :spree_current_user, + redirect_back_or_default: 'Please use `redirect_to stored_spree_user_location_or(...)` when using solidus_auth_devise.', + store_location: 'Please use `store_location_for(:spree_user, request.fullpath)` when using solidus_auth_devise.', + deprecator: Spree::Deprecation end end end