summaryrefslogtreecommitdiff
path: root/config/initializers
diff options
context:
space:
mode:
authorMarkus Koller <markus-koller@gmx.ch>2017-02-08 20:23:43 +0100
committerAlexis Reigel <mail@koffeinfrei.org>2017-03-07 15:08:15 +0100
commitb2ca28d24bfbb0a574fccdf1ea05d549ccd6bf66 (patch)
treece374df20ddf29206e419e5a2a75d23beabdf629 /config/initializers
parent972678b6bfe83bf21971b108b8f767ce37529916 (diff)
downloadgitlab-ce-b2ca28d24bfbb0a574fccdf1ea05d549ccd6bf66.tar.gz
Add specs for Doorkeeper resource_owner_authenticator
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/doorkeeper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 52551a5d5eb..a5636765774 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -6,11 +6,11 @@ Doorkeeper.configure do
# This block will be called to check whether the resource owner is authenticated or not.
resource_owner_authenticator do
# Put your resource owner authentication logic here.
- # Ensure user is redirected to redirect_uri after login
- session[:user_return_to] = request.fullpath
if current_user
current_user
else
+ # Ensure user is redirected to redirect_uri after login
+ session[:user_return_to] = request.fullpath
redirect_to(new_user_session_url)
nil
end