0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

return username from login assist.

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-10-01 12:48:50 +09:00
parent bad0dfdf53
commit cfeffa5406
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file

@ -121,11 +121,9 @@ public class SystemHelper implements Serializable {
}
public String getUsername() {
String username = LaRequestUtil.getRequest().getRemoteUser();
if (StringUtil.isBlank(username)) {
username = "guest";
}
return username;
return ComponentUtil.getLoginAssist().getSessionUserBean().map(user -> {
return user.getUserId();
}).orElse(Constants.GUEST_USER);
}
public LocalDateTime getCurrentTime() {

5
src/main/java/org/codelibs/fess/util/ComponentUtil.java
View file

@ -19,6 +19,7 @@ package org.codelibs.fess.util;
import org.codelibs.core.crypto.CachedCipher;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.api.WebApiManagerFactory;
import org.codelibs.fess.app.web.base.login.FessLoginAssist;
import org.codelibs.fess.client.FessEsClient;
import org.codelibs.fess.ds.DataStoreFactory;
import org.codelibs.fess.helper.AdRoleHelper;
@ -250,6 +251,10 @@ public final class ComponentUtil {
return SingletonLaContainer.getComponent(DATA_SERVICE);
}
public static FessLoginAssist getLoginAssist() {
return getComponent(FessLoginAssist.class);
}
public static <T> T getComponent(final Class<T> clazz) {
return SingletonLaContainer.getComponent(clazz);
}