nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1723: Review Findings

This commit is contained in:
Joerg Heffner 2021-10-07 08:45:37 +02:00 committed by gitgoodjhe
parent e033f35cdc
commit 69ee0235e4
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java
View File

@ -62,9 +62,9 @@ public class TaskanaEngineConfiguration {
private static final String TASKANA_JOB_PRIORITY_BATCHSIZE = "taskana.jobs.priority.batchSize"; private static final String TASKANA_JOB_PRIORITY_BATCHSIZE = "taskana.jobs.priority.batchSize";
private static final String TASKANA_JOB_PRIORITY_RUN_EVERY = "taskana.jobs.priority.runEvery"; private static final String TASKANA_JOB_PRIORITY_RUN_EVERY = "taskana.jobs.priority.runEvery";
private static final String TASKANA_JOB_PRIORITY_FIRST_RUN = "taskana.jobs.priority.firstRunAt"; private static final String TASKANA_JOB_PRIORITY_FIRST_RUN = "taskana.jobs.priority.firstRunAt";
private static final String TASKANA_JOB_PRIORITY_ACTIVE = "taskana.jobs.priority.active";
private static final String TASKANA_JOB_USER_REFRESH_FIRST_RUN = private static final String TASKANA_JOB_USER_REFRESH_FIRST_RUN =
"taskana.jobs.user.refresh.firstRunAt"; "taskana.jobs.user.refresh.firstRunAt";
private static final String TASKANA_JOB_PRIORITY_ACTIVE = "taskana.jobs.priority.active";
private static final String TASKANA_JOB_USER_REFRESH_RUN_EVERY = private static final String TASKANA_JOB_USER_REFRESH_RUN_EVERY =
"taskana.jobs.user.refresh.runEvery"; "taskana.jobs.user.refresh.runEvery";
private static final String TASKANA_DOMAINS_PROPERTY = "taskana.domains"; private static final String TASKANA_DOMAINS_PROPERTY = "taskana.domains";

5
rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java
View File

@ -141,13 +141,10 @@ public class LdapClient {
userOrGroupFilter.or(new EqualsFilter(getUserIdAttribute(), userOrGroup)); userOrGroupFilter.or(new EqualsFilter(getUserIdAttribute(), userOrGroup));
}); });
final AndFilter andFilter = new AndFilter();
andFilter.and(userOrGroupFilter);
final List<User> users = final List<User> users =
ldapTemplate.search( ldapTemplate.search(
getUserSearchBase(), getUserSearchBase(),
andFilter.encode(), userOrGroupFilter.encode(),
SearchControls.SUBTREE_SCOPE, SearchControls.SUBTREE_SCOPE,
getLookUpUserInfoAttributesToReturn(), getLookUpUserInfoAttributesToReturn(),
new UserInfoContextMapper()); new UserInfoContextMapper());

18
rest/taskana-rest-spring/src/main/java/pro/taskana/user/jobs/UserInfoRefreshJob.java
View File

@ -98,7 +98,13 @@ public class UserInfoRefreshJob extends AbstractTaskanaJob {
users.forEach( users.forEach(
user -> { user -> {
try { try {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Trying to insert user {}", user);
}
taskanaEngineImpl.getUserService().createUser(user); taskanaEngineImpl.getUserService().createUser(user);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Successfully inserted user {}", user);
}
} catch (InvalidArgumentException } catch (InvalidArgumentException
| NotAuthorizedException | NotAuthorizedException
| UserAlreadyExistException e) { | UserAlreadyExistException e) {
@ -112,7 +118,17 @@ public class UserInfoRefreshJob extends AbstractTaskanaJob {
users.forEach( users.forEach(
user -> { user -> {
try { try {
user.setData(taskanaEngineImpl.getUserService().getUser(user.getId()).getData());
String userData = taskanaEngineImpl.getUserService().getUser(user.getId()).getData();
if (userData != null) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Trying to set userData {} for user {}", userData, user);
}
user.setData(taskanaEngineImpl.getUserService().getUser(user.getId()).getData());
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Successfully set userData {} for user {}", userData, user);
}
}
} catch (UserNotFoundException e) { } catch (UserNotFoundException e) {
if (LOGGER.isDebugEnabled()) { if (LOGGER.isDebugEnabled()) {
LOGGER.debug( LOGGER.debug(