|
|
@ -4,10 +4,12 @@ import info.bukova.isspst.Constants;
|
|
|
|
import info.bukova.isspst.data.Role;
|
|
|
|
import info.bukova.isspst.data.Role;
|
|
|
|
import info.bukova.isspst.data.User;
|
|
|
|
import info.bukova.isspst.data.User;
|
|
|
|
import info.bukova.isspst.data.UserSettingsData;
|
|
|
|
import info.bukova.isspst.data.UserSettingsData;
|
|
|
|
|
|
|
|
import info.bukova.isspst.security.AuthMethod;
|
|
|
|
import info.bukova.isspst.services.AbstractService;
|
|
|
|
import info.bukova.isspst.services.AbstractService;
|
|
|
|
import info.bukova.isspst.services.StringXmlMarshaller;
|
|
|
|
import info.bukova.isspst.services.StringXmlMarshaller;
|
|
|
|
//import info.bukova.isspst.services.LazyLoader;
|
|
|
|
//import info.bukova.isspst.services.LazyLoader;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.HashSet;
|
|
|
|
import java.util.HashSet;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
@ -34,9 +36,11 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private RoleService roleService;
|
|
|
|
private RoleService roleService;
|
|
|
|
private StringXmlMarshaller<UserSettingsData> marshaller;
|
|
|
|
private StringXmlMarshaller<UserSettingsData> marshaller;
|
|
|
|
|
|
|
|
private AuthMethod authMethod;
|
|
|
|
|
|
|
|
|
|
|
|
public UserServiceImpl(Marshaller marshaller, Unmarshaller unmarshaller) {
|
|
|
|
public UserServiceImpl(Marshaller marshaller, Unmarshaller unmarshaller) {
|
|
|
|
this.marshaller = new StringXmlMarshaller<UserSettingsData>(marshaller, unmarshaller, UserSettingsData.class);
|
|
|
|
this.marshaller = new StringXmlMarshaller<UserSettingsData>(marshaller, unmarshaller, UserSettingsData.class);
|
|
|
|
|
|
|
|
authMethod = AuthMethod.DATABASE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public void setEncoder(PasswordEncoder encoder) {
|
|
|
|
public void setEncoder(PasswordEncoder encoder) {
|
|
|
@ -202,4 +206,14 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
|
|
|
|
return Constants.PERM_EDIT_OWN;
|
|
|
|
return Constants.PERM_EDIT_OWN;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public void setAuthMethod(AuthMethod method) {
|
|
|
|
|
|
|
|
this.authMethod = method;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public AuthMethod getAuthMethod() {
|
|
|
|
|
|
|
|
return authMethod;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|