From 21fed8c5f1b943419a75ce59c546e6f2b1fef85f Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Wed, 27 Nov 2019 11:08:08 +0200 Subject: [PATCH] OAuth: Add missing setting from defaults.ini (#20691) --- conf/defaults.ini | 3 +++ conf/sample.ini | 21 ++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 744713ca961..5b834e8e89c 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -318,6 +318,7 @@ scopes = user:email,read:org auth_url = https://github.com/login/oauth/authorize token_url = https://github.com/login/oauth/access_token api_url = https://api.github.com/user +allowed_domains = team_ids = allowed_organizations = @@ -331,6 +332,7 @@ scopes = api auth_url = https://gitlab.com/oauth/authorize token_url = https://gitlab.com/oauth/token api_url = https://gitlab.com/api/v4 +allowed_domains = allowed_groups = #################################### Google Auth ######################### @@ -378,6 +380,7 @@ role_attribute_path = auth_url = token_url = api_url = +allowed_domains = team_ids = allowed_organizations = tls_skip_verify_insecure = false diff --git a/conf/sample.ini b/conf/sample.ini index 1542a4ecd0c..a641b2b6f69 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -317,20 +317,22 @@ ;auth_url = https://github.com/login/oauth/authorize ;token_url = https://github.com/login/oauth/access_token ;api_url = https://api.github.com/user +;allowed_domains = ;team_ids = ;allowed_organizations = #################################### GitLab Auth ######################### [auth.gitlab] -; enabled = false -; allow_sign_up = true -; client_id = some_id -; client_secret = some_secret -; scopes = api -; auth_url = https://gitlab.com/oauth/authorize -; token_url = https://gitlab.com/oauth/token -; api_url = https://gitlab.com/api/v4 -; allowed_groups = +;enabled = false +;allow_sign_up = true +;client_id = some_id +;client_secret = some_secret +;scopes = api +;auth_url = https://gitlab.com/oauth/authorize +;token_url = https://gitlab.com/oauth/token +;api_url = https://gitlab.com/api/v4 +;allowed_domains = +;allowed_groups = #################################### Google Auth ########################## [auth.google] @@ -367,6 +369,7 @@ ;auth_url = https://foo.bar/login/oauth/authorize ;token_url = https://foo.bar/login/oauth/access_token ;api_url = https://foo.bar/user +;allowed_domains = ;team_ids = ;allowed_organizations = ;role_attribute_path =