Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

session_timeout: make sure remember_me's before_logout hook gets called #358

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

session_timeout: make sure remember_me's before_logout hook gets called #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5d4ad2
session_timeout: make sure the remember_me submodule's before_logout
jankoegel Feb 14, 2024
3d7e57b
CHANGELOG: update.
jankoegel Feb 14, 2024
76ecae7
Merge branch 'master' into bugfix/session-timeout_validate-session
joshbuker Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog
## HEAD

* Fix to invalidate sessions with remember_me cookie [#358](https://github.com/Sorcery/sorcery/pull/358)
* Fix Rails 7.1 compatibility by using `ActiveRecord.timestamped_migrations` [#352](https://github.com/Sorcery/sorcery/pull/352)
* Change CI settings for support Ruby3.0+ Rails6.1+ [#357](https://github.com/Sorcery/sorcery/pull/357)
* Fix error when running the install generator [#339](https://github.com/Sorcery/sorcery/pull/339)
Expand Down
3 changes: 1 addition & 2 deletions lib/sorcery/controller/submodules/session_timeout.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ def register_login_time(_user, _credentials = nil)
def validate_session
session_to_use = Config.session_timeout_from_last_action ? session[:last_action_time] : session[:login_time]
if (session_to_use && sorcery_session_expired?(session_to_use.to_time)) || sorcery_session_invalidated?
reset_sorcery_session
remove_instance_variable :@current_user if defined? @current_user
logout
else
session[:last_action_time] = Time.now.in_time_zone
end
Expand Down
Loading