Skip to content
Snippets Groups Projects
Verified Commit 30e1df99 authored by Hugo Renard's avatar Hugo Renard
Browse files

fix: handle emty username & email during sync

parent bd39b294
No related branches found
No related tags found
No related merge requests found
Pipeline #1284 passed with stage
in 55 seconds
...@@ -182,9 +182,16 @@ public class UserAdapter extends Adapter<UserModel, UserResource> { ...@@ -182,9 +182,16 @@ public class UserAdapter extends Adapter<UserModel, UserResource> {
@Override @Override
public Boolean tryToMap() { public Boolean tryToMap() {
var sameUsernameUser = session.users().getUserByUsername(realm, username); UserModel sameUsernameUser = null;
var sameEmailUser = session.users().getUserByEmail(realm, email); UserModel sameEmailUser = null;
if ((sameUsernameUser != null && sameEmailUser != null) && sameUsernameUser.getId() != sameEmailUser.getId()) { if (username != null) {
sameUsernameUser = session.users().getUserByUsername(realm, username);
}
if (email != null) {
sameEmailUser = session.users().getUserByEmail(realm, email);
}
if ((sameUsernameUser != null && sameEmailUser != null)
&& (sameUsernameUser.getId() != sameEmailUser.getId())) {
LOGGER.warnf("found 2 possible users for remote user %s %s", username, email); LOGGER.warnf("found 2 possible users for remote user %s %s", username, email);
return false; return false;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment