diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /config/routes.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 11 |
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 |