From 845c784c0fc24eb6dc7629e188c78db493c7d21f Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Thu, 7 Aug 2014 21:25:52 +0200
Subject: [PATCH] Disable external auth services by default

---
 .../de/thm/arsnova/controller/LoginController.java   | 12 ++++++------
 src/main/webapp/arsnova.properties.example           | 10 +++++-----
 src/test/resources/arsnova.properties.example        | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
index 6ab3234e0..52e973c90 100644
--- a/src/main/java/de/thm/arsnova/controller/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -136,22 +136,22 @@ public class LoginController extends AbstractController {
 	@Value("${security.twitter.enabled}")
 	private String twitterEnabled;
 
-	@Autowired
+	@Autowired(required = false)
 	private DaoAuthenticationProvider daoProvider;
 
-	@Autowired
+	@Autowired(required = false)
 	private TwitterProvider twitterProvider;
 
-	@Autowired
+	@Autowired(required = false)
 	private Google2Provider googleProvider;
 
-	@Autowired
+	@Autowired(required = false)
 	private FacebookProvider facebookProvider;
 	
-	@Autowired
+	@Autowired(required = false)
 	private LdapAuthenticationProvider ldapAuthenticationProvider;
 
-	@Autowired
+	@Autowired(required = false)
 	private CasAuthenticationEntryPoint casEntryPoint;
 
 	@Autowired
diff --git a/src/main/webapp/arsnova.properties.example b/src/main/webapp/arsnova.properties.example
index 0fa0a198e..7dbef658c 100644
--- a/src/main/webapp/arsnova.properties.example
+++ b/src/main/webapp/arsnova.properties.example
@@ -100,7 +100,7 @@ security.user-db.reset-password-mail.body=You requested to reset your \
 # user-dn-pattern: Pattern used to check user credentials against the LDAP
 #     server. {0} will be replaced with the user ID by ARSnova.
 #
-security.ldap.enabled=true
+security.ldap.enabled=false
 security.ldap.title=LDAP
 security.ldap.login-dialog-path=login-ldap.html
 security.ldap.image=
@@ -113,7 +113,7 @@ security.ldap.user-dn-pattern=uid={0},ou=arsnova
 
 # CAS authentication
 #
-security.cas.enabled=true
+security.cas.enabled=false
 security.cas.title=CAS
 security.cas.image=
 security.cas.order=0
@@ -126,21 +126,21 @@ security.cas-server-url=https://example.com/cas
 
 # Facebook
 #
-security.facebook.enabled=true
+security.facebook.enabled=false
 security.facebook.order=0
 security.facebook.key=
 security.facebook.secret=
 
 # Twitter
 #
-security.twitter.enabled=true
+security.twitter.enabled=false
 security.twitter.order=0
 security.twitter.key=
 security.twitter.secret=
 
 # Google
 #
-security.google.enabled=true
+security.google.enabled=false
 security.google.order=0
 security.google.key=
 security.google.secret=
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 0fa0a198e..7dbef658c 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -100,7 +100,7 @@ security.user-db.reset-password-mail.body=You requested to reset your \
 # user-dn-pattern: Pattern used to check user credentials against the LDAP
 #     server. {0} will be replaced with the user ID by ARSnova.
 #
-security.ldap.enabled=true
+security.ldap.enabled=false
 security.ldap.title=LDAP
 security.ldap.login-dialog-path=login-ldap.html
 security.ldap.image=
@@ -113,7 +113,7 @@ security.ldap.user-dn-pattern=uid={0},ou=arsnova
 
 # CAS authentication
 #
-security.cas.enabled=true
+security.cas.enabled=false
 security.cas.title=CAS
 security.cas.image=
 security.cas.order=0
@@ -126,21 +126,21 @@ security.cas-server-url=https://example.com/cas
 
 # Facebook
 #
-security.facebook.enabled=true
+security.facebook.enabled=false
 security.facebook.order=0
 security.facebook.key=
 security.facebook.secret=
 
 # Twitter
 #
-security.twitter.enabled=true
+security.twitter.enabled=false
 security.twitter.order=0
 security.twitter.key=
 security.twitter.secret=
 
 # Google
 #
-security.google.enabled=true
+security.google.enabled=false
 security.google.order=0
 security.google.key=
 security.google.secret=
-- 
GitLab