diff options
author | ThibG <thib@sitedethib.com> | 2020-01-24 17:28:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-24 17:28:22 +0100 |
commit | 0be67df4f0a64367d9e376b06bd3fd2fb9ca8195 (patch) | |
tree | 2eaa85c899033aab9bd1b2f9da2d727ce5788e16 /app/controllers/auth | |
parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
parent | bdc1581556b86ba25a385c9309db714eeaba1ca1 (diff) |
Merge pull request #1265 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/auth')
-rw-r--r-- | app/controllers/auth/passwords_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/auth/registrations_controller.rb | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb index a59806f0d..c224e1a03 100644 --- a/app/controllers/auth/passwords_controller.rb +++ b/app/controllers/auth/passwords_controller.rb @@ -7,6 +7,12 @@ class Auth::PasswordsController < Devise::PasswordsController layout 'auth' + def update + super do |resource| + resource.session_activations.destroy_all if resource.errors.empty? + end + end + private def check_validity_of_reset_password_token diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index a9d075a45..531df7751 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -23,10 +23,17 @@ class Auth::RegistrationsController < Devise::RegistrationsController not_found end + def update + super do |resource| + resource.clear_other_sessions(current_session.session_id) if resource.saved_change_to_encrypted_password? + end + end + protected def update_resource(resource, params) params[:password] = nil if Devise.pam_authentication && resource.encrypted_password.blank? + super end |