Skip to content

Commit eac5f29

Browse files
committed
Improve deprecation messages for the Auth module
1 parent 26f1193 commit eac5f29

1 file changed

Lines changed: 5 additions & 12 deletions

File tree

  • core/lib/spree/core/controller_helpers

core/lib/spree/core/controller_helpers/auth.rb

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ def current_ability
3737
end
3838

3939
def redirect_back_or_default(default)
40-
Spree::Deprecation.warn <<~MSG
41-
'Please use #stored_spree_user_location_or when using solidus_auth_devise.
42-
Otherwise, please utilize #redirect_back provided in Rails 5+ or
43-
#redirect_back_or_to in Rails 7+ instead'
44-
MSG
45-
4640
redirect_to(session["spree_user_return_to"] || default)
4741
session["spree_user_return_to"] = nil
4842
end
@@ -57,11 +51,6 @@ def set_guest_token
5751
end
5852

5953
def store_location
60-
Spree::Deprecation.warn <<~MSG
61-
store_location is being deprecated in solidus 4.0
62-
without replacement
63-
MSG
64-
6554
Spree::UserLastUrlStorer.new(self).store_location
6655
end
6756

@@ -83,7 +72,11 @@ def try_spree_current_user
8372
end
8473
end
8574

86-
deprecate try_spree_current_user: :spree_current_user, deprecator: Spree::Deprecation
75+
deprecate \
76+
try_spree_current_user: :spree_current_user,
77+
redirect_back_or_default: 'Please use `redirect_to stored_spree_user_location_or(...)` when using solidus_auth_devise.',
78+
store_location: 'Please use `store_location_for(:spree_user, request.fullpath)` when using solidus_auth_devise.',
79+
deprecator: Spree::Deprecation
8780
end
8881
end
8982
end

0 commit comments

Comments
 (0)