From 4ccacdaced6f8c6e637d1d4287c7929fc7628e0e Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 30 Jan 2019 10:31:58 +0100
Subject: [PATCH] OO-3847: make OAuth as default provider configurable
---
src/main/java/org/olat/login/_spring/loginContext.xml | 2 +-
src/main/resources/serviceconfig/olat.properties | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/login/_spring/loginContext.xml b/src/main/java/org/olat/login/_spring/loginContext.xml
index a42df098e25..1db16d14b09 100644
--- a/src/main/java/org/olat/login/_spring/loginContext.xml
+++ b/src/main/java/org/olat/login/_spring/loginContext.xml
@@ -45,7 +45,7 @@
<bean id="OAuthAuthenticationProvider" class="org.olat.login.oauth.OAuthAuthenticationProvider" >
<constructor-arg index="0" value="OAuth"/>
<constructor-arg index="1" value="org.olat.login.oauth.ui.OAuthAuthenticationController"/>
- <constructor-arg index="2" value="false"/>
+ <constructor-arg index="2" value="${oauth.default}"/>
<constructor-arg index="3" value="o_icon_provider_oauth"/>
</bean>
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 136268cb71e..34131c39723 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -822,6 +822,9 @@ olatprovider.default=true
# if you change this all current users will no longer be able to login!
default.auth.provider.identifier=OLAT
+# Oauth / social providers as default
+oauth.default=false
+
shibboleth.enable=false
#enable and or set the generic shib login provider on the loginpage active and or default
shibbolethGeneric.enable=false
--
GitLab