Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-02-20 21:38:46 +0300
committerDouwe Maan <douwe@gitlab.com>2017-02-20 21:38:46 +0300
commitc63016a379f34807212f8bdf559bf842cf913231 (patch)
tree452136bba68c2c59d26cae2e5a868fcc1471dc72 /app
parent6d6592d5c3e8c946c4c7f90d4df48800d71398b6 (diff)
parentbeb887748e8aa3bc42376656f28b689aad91dab7 (diff)
Merge branch 'authentiq-backchannel-logout' into 'master'
Remote logout functionality on Authentiq OAuth provider See merge request !9381
Diffstat (limited to 'app')
-rw-r--r--app/controllers/omniauth_callbacks_controller.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index f54c79c2e37..3ab7e6e0658 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -78,6 +78,13 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
handle_omniauth
end
+ def authentiq
+ if params['sid']
+ handle_service_ticket oauth['provider'], params['sid']
+ end
+ handle_omniauth
+ end
+
private
def handle_omniauth