summaryrefslogtreecommitdiff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-15 21:14:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-15 21:14:31 +0000
commitc568cb4dbc0421212a28f3cd5b77223aad8888ba (patch)
treebe3ab3b5d6cf5c23a71b557ed82758c905a437bd /config/routes.rb
parent4481a56a94c579f52e1cdef1cc1f4995f0ee1412 (diff)
downloadgitlab-ce-c568cb4dbc0421212a28f3cd5b77223aad8888ba.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb11
1 files changed, 7 insertions, 4 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 01e57a01359..94d36961b32 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -43,12 +43,15 @@ Rails.application.routes.draw do
draw :oauth
- use_doorkeeper_openid_connect
+ use_doorkeeper_openid_connect do
+ controllers discovery: 'jwks'
+ end
+
# Add OPTIONS method for CORS preflight requests
match '/oauth/userinfo' => 'doorkeeper/openid_connect/userinfo#show', via: :options
- match '/oauth/discovery/keys' => 'doorkeeper/openid_connect/discovery#keys', via: :options
- match '/.well-known/openid-configuration' => 'doorkeeper/openid_connect/discovery#provider', via: :options
- match '/.well-known/webfinger' => 'doorkeeper/openid_connect/discovery#webfinger', via: :options
+ match '/oauth/discovery/keys' => 'jwks#keys', via: :options
+ match '/.well-known/openid-configuration' => 'jwks#provider', via: :options
+ match '/.well-known/webfinger' => 'jwks#webfinger', via: :options
match '/oauth/token' => 'oauth/tokens#create', via: :options
match '/oauth/revoke' => 'oauth/tokens#revoke', via: :options