Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 61 additions & 47 deletions app/controllers/redmine_oauth_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,75 +48,89 @@ def oauth
case oauth_provider.oauth_name
when 'Azure AD'
redirect_to RedmineOauth::OauthClient.client(oauth_provider).auth_code.authorize_url(
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: case oauth_provider.oauth_version
when 'v2.0'
'openid profile email'
else
'user:email'
end,
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
{
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: case oauth_provider.oauth_version
when 'v2.0'
'openid profile email'
else
'user:email'
end,
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
}.compact
)
when 'GitHub'
redirect_to RedmineOauth::OauthClient.client(oauth_provider).auth_code.authorize_url(
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: 'user:email',
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
{
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: 'user:email',
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
}.compact
)
when 'GitLab'
url = RedmineOauth::OauthClient.client(oauth_provider).auth_code.authorize_url(
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: 'read_user',
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
{
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: 'read_user',
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
}.compact
)
url << "&#{oauth_provider.url_parameters}" if oauth_provider.url_parameters.present?
redirect_to url
when 'Google'
url = RedmineOauth::OauthClient.client(oauth_provider).auth_code.authorize_url(
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: 'profile email',
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
{
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: 'profile email',
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
}.compact
)
url << "&#{oauth_provider.url_parameters}" if oauth_provider.url_parameters.present?
redirect_to url
when 'Keycloak'
redirect_to RedmineOauth::OauthClient.client(oauth_provider).auth_code.authorize_url(
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: 'openid email',
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
{
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: 'openid email',
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
}.compact
)
when 'Okta'
redirect_to RedmineOauth::OauthClient.client(oauth_provider).auth_code.authorize_url(
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: 'openid profile email',
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
{
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: 'openid profile email',
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
}.compact
)
when 'Custom'
redirect_to RedmineOauth::OauthClient.client(oauth_provider).auth_code.authorize_url(
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: oauth_provider.custom_scope,
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
{
redirect_uri: oauth_callback_url,
state: oauth_csrf_token,
scope: oauth_provider.custom_scope,
code_challenge: code_challenge,
code_challenge_method: 'S256',
max_age: params[:reauth] ? 0 : nil
}.compact
)
else
flash['error'] = l(:oauth_invalid_provider)
Expand Down
Loading