bugfix: detecting system users while dispatching emails was broken
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
@@ -147,6 +147,13 @@ public class UserModule extends BaseHandler implements UserService {
|
||||
return users.load(session);
|
||||
}
|
||||
|
||||
public Optional<UmbrellaUser> load(EmailAddress email){
|
||||
try {
|
||||
return Optional.of(users.load(email));
|
||||
} catch (UmbrellaException ignored){
|
||||
return empty();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public UmbrellaUser loadUser(long userId) throws UmbrellaException {
|
||||
|
||||
@@ -10,6 +10,7 @@ import de.srsoftware.umbrella.user.model.DbUser;
|
||||
import de.srsoftware.umbrella.user.model.Password;
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface UserDb {
|
||||
|
||||
|
||||
@@ -397,7 +397,6 @@ CREATE TABLE IF NOT EXISTS {0} (
|
||||
}
|
||||
if (user == null) throw unauthorized(FAILED_TO_LOAD_OBJECT_BY_ID, OBJECT,t(Text.USER), ID,key);
|
||||
return user;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user