From 350f19f59fd1e44c18699cc46cfff71a92d7e0a4 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 8 Jun 2019 07:12:47 -0700
Subject: [PATCH] Bump omniauth_openid_connect to 0.3.1
In https://gitlab.com/gitlab-org/gitlab-ce/issues/62208, users were
seeing 404 errors when they configured their OpenID provider without a
name parameter since OmniAuth would use the name `openidconnect` instead
`openid_connect`.
https://github.com/m0n9oose/omniauth_openid_connect/pull/23 makes the
default parameter `openid_connect` so this additional initializer in
GitLab is not necessary. Plus, this change enables users to use multiple
OpenID Connect providers if they desire.
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
lib/gitlab/omniauth_initializer.rb | 6 ------
spec/lib/gitlab/omniauth_initializer_spec.rb | 8 --------
4 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/Gemfile b/Gemfile
index c22a3191c3c3..7f292eadfa5b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'omniauth_openid_connect', '~> 0.3.0'
+gem 'omniauth_openid_connect', '~> 0.3.1'
gem "omniauth-ultraauth", '~> 0.0.2'
gem 'omniauth-salesforce', '~> 1.0.5'
gem 'rack-oauth2', '~> 1.9.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 785a77bc2020..92ffbcc6ab73 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -587,7 +587,7 @@ GEM
activesupport
nokogiri (>= 1.4.4)
omniauth (~> 1.0)
- omniauth_openid_connect (0.3.0)
+ omniauth_openid_connect (0.3.1)
addressable (~> 2.5)
omniauth (~> 1.3)
openid_connect (~> 1.1)
@@ -1159,7 +1159,7 @@ DEPENDENCIES
omniauth-twitter (~> 1.4)
omniauth-ultraauth (~> 0.0.2)
omniauth_crowd (~> 2.2.0)
- omniauth_openid_connect (~> 0.3.0)
+ omniauth_openid_connect (~> 0.3.1)
org-ruby (~> 0.9.12)
peek (~> 1.0.1)
peek-gc (~> 0.0.2)
diff --git a/lib/gitlab/omniauth_initializer.rb b/lib/gitlab/omniauth_initializer.rb
index 83204fa5d186..2a2083ebae0f 100644
--- a/lib/gitlab/omniauth_initializer.rb
+++ b/lib/gitlab/omniauth_initializer.rb
@@ -63,12 +63,6 @@ def provider_defaults(provider)
{ remote_sign_out_handler: authentiq_signout_handler }
when 'shibboleth'
{ fail_with_empty_uid: true }
- when 'openid_connect'
- # If a name argument is omitted, OmniAuth will expect that the
- # matching route is /auth/users/openidconnect instead of
- # /auth/users/openid_connect because of
- # https://gitlab.com/gitlab-org/gitlab-ce/issues/62208#note_178780341.
- { name: 'openid_connect' }
else
{}
end
diff --git a/spec/lib/gitlab/omniauth_initializer_spec.rb b/spec/lib/gitlab/omniauth_initializer_spec.rb
index 32296caf8197..f9c0daf1ef16 100644
--- a/spec/lib/gitlab/omniauth_initializer_spec.rb
+++ b/spec/lib/gitlab/omniauth_initializer_spec.rb
@@ -83,13 +83,5 @@
subject.execute([cas3_config])
end
-
- it 'configures name for openid_connect' do
- openid_connect_config = { 'name' => 'openid_connect', 'args' => {} }
-
- expect(devise_config).to receive(:omniauth).with(:openid_connect, name: 'openid_connect')
-
- subject.execute([openid_connect_config])
- end
end
end
--
GitLab