From a16b75c366de6cd123830d4c6863d458165f0ebb Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Tue, 5 Jul 2016 22:28:08 +0200
Subject: [PATCH] OO-2089 remove configurability of username configuration,
always user identity name
---
.../UserNameReadOnlyPropertyHandler.java | 12 +-----------
.../_spring/userPropertriesHandlersContext.xml | 1 -
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/main/java/org/olat/user/propertyhandlers/UserNameReadOnlyPropertyHandler.java b/src/main/java/org/olat/user/propertyhandlers/UserNameReadOnlyPropertyHandler.java
index b97149f37fb..df749e2edff 100644
--- a/src/main/java/org/olat/user/propertyhandlers/UserNameReadOnlyPropertyHandler.java
+++ b/src/main/java/org/olat/user/propertyhandlers/UserNameReadOnlyPropertyHandler.java
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.Locale;
import java.util.Map;
-import org.olat.basesecurity.BaseSecurityManager;
import org.olat.core.gui.components.form.ValidationError;
import org.olat.core.gui.components.form.flexible.FormItem;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
@@ -47,16 +46,7 @@ import org.olat.user.UserImpl;
* @author gnaegi, http://www.frentix.com
*/
public class UserNameReadOnlyPropertyHandler extends AbstractUserPropertyHandler {
- private String authProvider;
- /**
- * Spring setter for the authentication provider
- * @param authProvider
- */
- public void setAuthProvider(String authProvider) {
- this.authProvider = authProvider;
- }
-
@Override
public FormItem addFormItem(Locale locale, User user,
String usageIdentifyer, boolean isAdministrativeUser,
@@ -86,7 +76,7 @@ public class UserNameReadOnlyPropertyHandler extends AbstractUserPropertyHandler
protected String getInternalValue(User user) {
if (user instanceof UserImpl) {
Identity identity = ((UserImpl)user).getIdentity();
- return BaseSecurityManager.getInstance().findAuthenticationName(identity, authProvider);
+ return identity.getName();
}
return "";
}
diff --git a/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertriesHandlersContext.xml b/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertriesHandlersContext.xml
index 7e34d48fc76..2c9f20debdd 100644
--- a/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertriesHandlersContext.xml
+++ b/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertriesHandlersContext.xml
@@ -13,7 +13,6 @@
<property name="name" value="userName" />
<property name="group" value="account" />
<property name="deletable" value="false" />
- <property name="authProvider" value="OLAT" /> <!-- could also be ldap, shibboleth, webdav, cal etc -->
</bean>
<bean id="userPropertyFirstName" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
--
GitLab