summaryrefslogtreecommitdiff
path: root/doc/administration/auth
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-02 03:07:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-02 03:07:58 +0000
commit47946d47f3d8906b622cb27605195ea0ffcb095c (patch)
tree303828ea6907e388a52e9ebdebd7e4cbf7a63bcd /doc/administration/auth
parent42263d6451c0af3c0e7a61747ffb046a806e4477 (diff)
downloadgitlab-ce-47946d47f3d8906b622cb27605195ea0ffcb095c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/auth')
-rw-r--r--doc/administration/auth/oidc.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/administration/auth/oidc.md b/doc/administration/auth/oidc.md
index 6f59cffc3cc..0160db1b388 100644
--- a/doc/administration/auth/oidc.md
+++ b/doc/administration/auth/oidc.md
@@ -42,6 +42,7 @@ The OpenID Connect will provide you with a client details and secret for you to
'discovery' => true,
'client_auth_method' => 'query',
'uid_field' => '<uid_field>',
+ 'send_scope_to_token_endpoint' => 'false',
'client_options' => {
'identifier' => '<your_oidc_client_id>',
'secret' => '<your_oidc_client_secret>',
@@ -65,6 +66,7 @@ The OpenID Connect will provide you with a client details and secret for you to
discovery: true,
client_auth_method: 'query',
uid_field: '<uid_field>',
+ send_scope_to_token_endpoint: false,
client_options: {
identifier: '<your_oidc_client_id>',
secret: '<your_oidc_client_secret>',
@@ -92,6 +94,8 @@ The OpenID Connect will provide you with a client details and secret for you to
- If not specified, defaults to `basic`.
- `<uid_field>` (optional) is the field name from the `user_info` details that will be used as `uid` value. For example, `preferred_username`.
If this value is not provided or the field with the configured value is missing from the `user_info` details, the `uid` will use the `sub` field.
+ - `send_scope_to_token_endpoint` is `true` by default. In other words, the `scope` parameter is normally included in requests to the token endpoint.
+ However, if your OpenID Connect provider does not accept the `scope` parameter in such requests, set this to `false`.
- `client_options` are the OpenID Connect client-specific options. Specifically:
- `identifier` is the client identifier as configured in the OpenID Connect service provider.
- `secret` is the client secret as configured in the OpenID Connect service provider.