Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-06 23:28:51 +02:00
Code Issues Packages Projects Releases Activity

Use ValidatioUtil to check if the user id is a mail

Browse Source
This commit is contained in:
Sebastian Sdorra
2020-10-15 14:28:57 +02:00
parent 2ea019231a
commit 27236cdbbd
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-core/src/main/java/sonia/scm/user/EMail.java
View File

@@ -26,6 +26,7 @@ package sonia.scm.user;
import com.google.common.base.Strings;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.util.ValidationUtil;
import javax.inject.Inject;
@@ -50,7 +51,7 @@ public class EMail {
*/
public String getMailOrFallback(User user) {
if (Strings.isNullOrEmpty(user.getMail())) {
if (user.getId().contains("@")) {
if (isMailUsedAsId(user)) {
return user.getId();
} else {
return createFallbackMail(user);
@@ -60,6 +61,10 @@ public class EMail {
}
}
private boolean isMailUsedAsId(User user) {
return ValidationUtil.isMailAddressValid(user.getId());
}
private String createFallbackMail(User user) {
return user.getId() + "@" + scmConfiguration.getMailDomainName();
}