Merge branch 'sh-update-openid-omniauth-gem' into 'master'

Bump omniauth_openid_connect to 0.3.1

See merge request gitlab-org/gitlab-ce!29387

4 files changed, 3 insertions, 17 deletions

diff --git a/Gemfile b/Gemfile
index 0569e0649dc..375fcaf76ce 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 1f6c8d05992..c403f45109c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -588,7 +588,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)
@@ -1160,7 +1160,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