projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix various issues:
[lgpl/argeo-commons.git]
/
security
/
runtime
/
org.argeo.security.core
/
src
/
main
/
java
/
org
/
argeo
/
security
/
ldap
/
ArgeoSecurityDaoLdap.java
diff --git
a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java
b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java
index 763539ce25afb8d0b39d98bb94fb40a59756ec03..c5cda2ed4a15b81c38f52575fd277b232565e4ca 100644
(file)
--- a/
security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java
+++ b/
security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java
@@
-1,6
+1,6
@@
package org.argeo.security.ldap;
package org.argeo.security.ldap;
-import static org.argeo.security.core.ArgeoUserDetails.create
Basic
ArgeoUser;
+import static org.argeo.security.core.ArgeoUserDetails.create
Simple
ArgeoUser;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
@@
-11,6
+11,7
@@
import javax.naming.directory.DirContext;
import org.argeo.security.ArgeoSecurityDao;
import org.argeo.security.ArgeoUser;
import org.argeo.security.ArgeoSecurityDao;
import org.argeo.security.ArgeoUser;
+import org.argeo.security.SimpleArgeoUser;
import org.argeo.security.core.ArgeoUserDetails;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.ldap.core.ContextExecutor;
import org.argeo.security.core.ArgeoUserDetails;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.ldap.core.ContextExecutor;
@@
-91,7
+92,13
@@
public class ArgeoSecurityDaoLdap implements ArgeoSecurityDao, InitializingBean
}
public ArgeoUser getUser(String uname) {
}
public ArgeoUser getUser(String uname) {
- return createBasicArgeoUser(getDetails(uname));
+ SimpleArgeoUser user = createSimpleArgeoUser(getDetails(uname));
+ user.setPassword(null);
+ return user;
+ }
+
+ public ArgeoUser getUserWithPassword(String uname) {
+ return createSimpleArgeoUser(getDetails(uname));
}
public ArgeoUser getCurrentUser() {
}
public ArgeoUser getCurrentUser() {
@@
-115,7
+122,7
@@
public class ArgeoSecurityDaoLdap implements ArgeoSecurityDao, InitializingBean
List<ArgeoUser> lst = new ArrayList<ArgeoUser>();
for (String username : usernames) {
List<ArgeoUser> lst = new ArrayList<ArgeoUser>();
for (String username : usernames) {
- lst.add(create
Basic
ArgeoUser(getDetails(username)));
+ lst.add(create
Simple
ArgeoUser(getDetails(username)));
}
return lst;
}
}
return lst;
}