From f2e12808ae4c1f7e5f9397e067243ed1ebcd918a Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Wed, 7 May 2014 15:42:41 +0200
Subject: [PATCH] Add DB and LDAP to auth services returned by API
---
.../arsnova/controller/LoginController.java | 22 +++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
index 823e3833..453d8daf 100644
--- a/src/main/java/de/thm/arsnova/controller/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -24,7 +24,6 @@ import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -39,7 +38,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
import org.springframework.security.cas.authentication.CasAuthenticationToken;
@@ -78,10 +76,12 @@ public class LoginController extends AbstractController {
private String guestEnabled;
@Value("${security.guest.lecturer.enabled}")
private String guestLecturerEnabled;
- @Value("${security.cas.enabled}")
- private String casEnabled;
+ @Value("${security.user-db.enabled}")
+ private String dbAuthEnabled;
@Value("${security.ldap.enabled}")
private String ldapEnabled;
+ @Value("${security.cas.enabled}")
+ private String casEnabled;
@Value("${security.facebook.enabled}")
private String facebookEnabled;
@Value("${security.google.enabled}")
@@ -269,6 +269,20 @@ public class LoginController extends AbstractController {
services.add(sdesc);
}
+ if ("true".equals(dbAuthEnabled)) {
+ services.add(new ServiceDescription(
+ "ARSnova",
+ null
+ ));
+ }
+
+ if ("true".equals(ldapEnabled)) {
+ services.add(new ServiceDescription(
+ "LDAP",
+ null
+ ));
+ }
+
if ("true".equals(casEnabled)) {
try {
services.add(new ServiceDescription(
--
GitLab