diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-09-09 04:10:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-09 04:10:44 +0200 |
commit | 2288d50a7bb4afcec4cfbcaa4b5cffaabd1df437 (patch) | |
tree | 7280431cffebdd35edcf99b53e92321b8a693dad /app/controllers/auth | |
parent | 2492c12281e4fc692fc4f0fe9dc0abb0455b50d8 (diff) |
Add force_login option to OAuth authorize page (#8655)
* Add force_login option to OAuth authorize page For when a user needs to sign into an app from multiple accounts on the same server * When logging out from modal header, redirect back after re-login
Diffstat (limited to 'app/controllers/auth')
-rw-r--r-- | app/controllers/auth/sessions_controller.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index b0d974ff8..bc980009e 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -28,8 +28,10 @@ class Auth::SessionsController < Devise::SessionsController end def destroy + tmp_stored_location = stored_location_for(:user) super flash.delete(:notice) + store_location_for(:user, tmp_stored_location) if continue_after? end protected @@ -124,8 +126,14 @@ class Auth::SessionsController < Devise::SessionsController end def clear_site_data + return if continue_after? + # Should be '"*"' but that doen't work in Chrome (neither does '"executionContexts"') # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Clear-Site-Data response.headers['Clear-Site-Data'] = '"cache", "cookies", "storage"' end + + def continue_after? + truthy_param?(:continue) + end end |