Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #21897: OIDC doc contains a merge diff resolution comment #504

Merged
merged 1 commit into from Oct 3, 2022
Merged

Fixes #21897: OIDC doc contains a merge diff resolution comment #504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions auth-backends/README.adoc
View file
Open in desktop
Expand Up @@ -389,15 +389,8 @@ rudder.auth.oauth2.provider.okta.client.redirect=https://my-external-rudder-host
#
# The protocol scheme used for authentication - Rudder only supports with authorisation code.
rudder.auth.oauth2.provider.okta.grantType=authorization_code
<<<<<<< HEAD
# Rudder URL towards which the identity provider redirects
rudder.auth.oauth2.provider.okta.client.redirect=https://my-external-rudder-hostname/rudder/login/oauth2/code/{registrationId}
# Authentication type - Rudder only supports basic.
rudder.auth.oauth2.provider.okta.authMethod=basic
=======
# Authentication type - Rudder only supports client_secret_basic and client_secret_post.
rudder.auth.oauth2.provider.okta.authMethod=client_secret_basic
>>>>>>> branches/rudder/6.2
```


Expand Down