diff options
| author | Markus Koller <markus-koller@gmx.ch> | 2016-12-09 18:36:50 +0100 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-03-07 14:54:35 +0100 |
| commit | c4982890489d254da2fe998aab30bf257767ed5e (patch) | |
| tree | 0828e0cab70cabaceffcc0d588db32ac38ddf310 /config/initializers/doorkeeper.rb | |
| parent | fb4a486605e10692b5577f0700fbce38bebcc311 (diff) | |
| download | gitlab-ce-c4982890489d254da2fe998aab30bf257767ed5e.tar.gz | |
Implement OpenID Connect identity provider
Diffstat (limited to 'config/initializers/doorkeeper.rb')
| -rw-r--r-- | config/initializers/doorkeeper.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 88cd0f5f652..52551a5d5eb 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -8,7 +8,12 @@ Doorkeeper.configure do # Put your resource owner authentication logic here. # Ensure user is redirected to redirect_uri after login session[:user_return_to] = request.fullpath - current_user || redirect_to(new_user_session_url) + if current_user + current_user + else + redirect_to(new_user_session_url) + nil + end end resource_owner_from_credentials do |routes| |