diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-04 13:44:28 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-04 13:44:28 +0000 |
| commit | 5f964567650a164c11fe250d69ab0eeaa4e35e13 (patch) | |
| tree | 5d4f36538cd2fc63338b342d0910f59476622102 | |
| parent | 2b0f4df0217b4a4aee53f964610d66ceedb68dca (diff) | |
| parent | 1f1882368710a0c093ec9c2f036e87d28d8c5b3b (diff) | |
| download | gitlab-ce-5f964567650a164c11fe250d69ab0eeaa4e35e13.tar.gz | |
Merge branch 'sh-fix-oauth2-callback-caps' into 'master'
Downcase aliased OAuth2 callback providers
Closes #57156
See merge request gitlab-org/gitlab-ce!24877
| -rw-r--r-- | changelogs/unreleased/sh-fix-oauth2-callback-caps.yml | 5 | ||||
| -rw-r--r-- | config/routes/import.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-fix-oauth2-callback-caps.yml b/changelogs/unreleased/sh-fix-oauth2-callback-caps.yml new file mode 100644 index 00000000000..8d17900cb79 --- /dev/null +++ b/changelogs/unreleased/sh-fix-oauth2-callback-caps.yml @@ -0,0 +1,5 @@ +--- +title: Downcase aliased OAuth2 callback providers +merge_request: 24877 +author: +type: fixed diff --git a/config/routes/import.rb b/config/routes/import.rb index 69df82611f2..da5c31d0062 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -1,7 +1,7 @@ # Alias import callbacks under the /users/auth endpoint so that # the OAuth2 callback URL can be restricted under http://example.com/users/auth # instead of http://example.com. -Devise.omniauth_providers.each do |provider| +Devise.omniauth_providers.map(&:downcase).each do |provider| next if provider == 'ldapmain' get "/users/auth/-/import/#{provider}/callback", to: "import/#{provider}#callback", as: "users_import_#{provider}_callback" |