From ed05e9de72ad0ddf8808c1818dfde80468424165 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Wed, 12 Dec 2018 10:42:37 +0100 Subject: [PATCH] add oauth_auto_login setting to defaults file Making the setting configurable thru environment variable (cherry picked from commit b9e91cab0e2205cd80396a00921d0fec534af163) --- conf/defaults.ini | 4 ++++ conf/sample.ini | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/conf/defaults.ini b/conf/defaults.ini index 306c625d980..9f2f186a4eb 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -246,6 +246,10 @@ disable_signout_menu = false # URL to redirect the user to after sign out signout_redirect_url = +# Set to true to attempt login with OAuth automatically, skipping the login screen. +# This setting is ignored if multiple OAuth providers are configured. +oauth_auto_login = false + #################################### Anonymous Auth ###################### [auth.anonymous] # enable anonymous access diff --git a/conf/sample.ini b/conf/sample.ini index c6b716a731d..455d32c06dc 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -223,6 +223,10 @@ log_queries = # URL to redirect the user to after sign out ;signout_redirect_url = +# Set to true to attempt login with OAuth automatically, skipping the login screen. +# This setting is ignored if multiple OAuth providers are configured. +;oauth_auto_login = false + #################################### Anonymous Auth ########################## [auth.anonymous] # enable anonymous access