public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: add setting to skip org assignment for external users (#34834) (#45692)

Browse Source 
* Chore: add setting to skip org assignment for external users

Introduce 'skip_org_role_update_sync' setting to skip any kind of org assignment during the login of external users.
As a consequence manual organization assignments won't be overridden during the upsert of an external user.

Part of #22605

* Chore: Rename skip_org_role_update_sync to oauth_skip_org_role_update_sync and relocate it to auth section

* Chore: replace global setting access where possible

(cherry picked from commit 6beba5a049)

Co-authored-by: baez90 <peter.kurfer@googlemail.com>
This commit is contained in:
Emil Tullstedt
2022-02-22 11:27:32 +01:00
committed by GitHub
co-authored by baez90
parent 4f036ad4db
commit eae91b6f50
5 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/sample.ini
+3
View File
@@ -394,6 +394,9 @@
# OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
;oauth_state_cookie_max_age = 600
# Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins
;oauth_skip_org_role_update_sync = false
# limit of api_key seconds to live before expiration
;api_key_max_seconds_to_live = -1