summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-06-08 07:12:47 -0700
committerStan Hu <stanhu@gmail.com>2019-06-08 08:04:44 -0700
commit350f19f59fd1e44c18699cc46cfff71a92d7e0a4 (patch)
treeb4aa7849dc1e297493589ee2739f490ba9fd751a
parent2a01cb79560a861a7e32e9ee11e823f22e181aa1 (diff)
downloadgitlab-ce-350f19f59fd1e44c18699cc46cfff71a92d7e0a4.tar.gz
Bump omniauth_openid_connect to 0.3.1sh-update-openid-omniauth-gem
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.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--lib/gitlab/omniauth_initializer.rb6
-rw-r--r--spec/lib/gitlab/omniauth_initializer_spec.rb8
4 files changed, 3 insertions, 17 deletions
diff --git a/Gemfile b/Gemfile
index c22a3191c3c..7f292eadfa5 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 785a77bc202..92ffbcc6ab7 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 83204fa5d18..2a2083ebae0 100644
--- a/lib/gitlab/omniauth_initializer.rb
+++ b/lib/gitlab/omniauth_initializer.rb
@@ -63,12 +63,6 @@ module Gitlab
{ 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 32296caf819..f9c0daf1ef1 100644
--- a/spec/lib/gitlab/omniauth_initializer_spec.rb
+++ b/spec/lib/gitlab/omniauth_initializer_spec.rb
@@ -83,13 +83,5 @@ describe Gitlab::OmniauthInitializer do
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