The Unified and Autonomous Development Platform
feat: Enhance user email handling with verified email retrieval
Robin Shen168da0a98977
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex 3b1323c526..48716ae2a7 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -14,10 +14,12 @@ import java.nio.charset.StandardCharsets;import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;+import java.util.HashSet;import java.util.LinkedHashMap;import java.util.LinkedHashSet;import java.util.List;import java.util.Optional;+import java.util.Set;import java.util.Stack;import java.util.stream.Collectors;@@ -912,6 +914,21 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.emailAddresses = emailAddresses;}+ /**+ * Returns verified email address values of this user, including the synthetic+ * address used by service and AI accounts for git operations.+ */+ public Set<String> getVerifiedEmailAddresses() {+ var emails = getEmailAddresses().stream()+ .filter(EmailAddress::isVerified)+ .map(EmailAddress::getValue)+ .collect(Collectors.toCollection(HashSet::new));+ var serviceOrAiAccountEmailAddress = getServiceOrAiAccountEmailAddress();+ if (serviceOrAiAccountEmailAddress != null)+ emails.add(serviceOrAiAccountEmailAddress.getValue());+ return emails;+ }+public Collection<GpgKey> getGpgKeys() {return gpgKeys;}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.javaindex 1a54fffc32..e6d4ea5976 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java@@ -14,7 +14,6 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.match.WildcardUtils;import io.onedev.server.OneDev;-import io.onedev.server.model.EmailAddress;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;@@ -49,8 +48,8 @@ public abstract class PersonCriteria extends CommitCriteria {if (value == null) { // authored by meUser user = SecurityUtils.getUser();if (user != null) {- user.getEmailAddresses().stream().filter(it->it.isVerified()).forEach(it-> {- persons.add("<" + it.getValue() + ">");+ user.getVerifiedEmailAddresses().forEach(it-> {+ persons.add("<" + it + ">");});} else {throw new ExplicitException(_T("Please login to perform this query"));@@ -59,9 +58,8 @@ public abstract class PersonCriteria extends CommitCriteria {String userName = value.substring(1);User user = getUserService().findByName(userName);if (user != null) {- for (EmailAddress emailAddress: user.getEmailAddresses()) {- if (emailAddress.isVerified())- persons.add("<" + emailAddress.getValue() + ">");+ for (String emailAddress: user.getVerifiedEmailAddresses()) {+ persons.add("<" + emailAddress + ">");}} else {persons.add(Strings.CS.replace(value, "*", ".*"));@@ -79,16 +77,16 @@ public abstract class PersonCriteria extends CommitCriteria {User user = User.get();if (user == null) {throw new ExplicitException(_T("Please login to perform this query"));- } else if (user.getEmailAddresses().stream()- .anyMatch(it-> it.isVerified() && it.getValue().equalsIgnoreCase(personEmail))) {+ } else if (user.getVerifiedEmailAddresses().stream()+ .anyMatch(it-> it.equalsIgnoreCase(personEmail))) {return true;}} else if (value.startsWith("@")) {String userName = value.substring(1);User user = getUserService().findByName(userName);if (user != null) {- if (user.getEmailAddresses().stream()- .anyMatch(it-> it.isVerified() && it.getValue().equalsIgnoreCase(personEmail))) {+ if (user.getVerifiedEmailAddresses().stream()+ .anyMatch(it-> it.equalsIgnoreCase(personEmail))) {return true;}} else if (matches("*" + value + "*", person)) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 9d8e2da435..f4723da447 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -19,7 +19,6 @@ import java.util.List;import java.util.Map;import java.util.Set;import java.util.concurrent.atomic.AtomicReference;-import java.util.stream.Collectors;import javax.inject.Inject;@@ -223,10 +222,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio@Nullableprivate String suggestSourceBranch() {User user = getLoginUser();- Collection<String> verifiedEmailAddresses = user.getEmailAddresses().stream()- .filter(it->it.isVerified())- .map(it->it.getValue())- .collect(Collectors.toSet());+ Collection<String> verifiedEmailAddresses = user.getVerifiedEmailAddresses();List<Pair<String, Integer>> branchUpdates = new ArrayList<>();for (RefFacade ref: getProject().getBranchRefs()) {RevCommit commit = (RevCommit) ref.getPeeledObj();diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.javaindex 35de251cd4..238ef2ff1e 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoService.java@@ -1,7 +1,6 @@package io.onedev.server.xodus;import static io.onedev.server.util.DateUtils.toLocalDate;-import static java.util.stream.Collectors.toSet;import java.io.File;import java.io.IOException;@@ -1311,10 +1310,7 @@ public class DefaultCommitInfoService extends AbstractEnvironmentService@Sessional@Overridepublic Map<Long, Map<ObjectId, Long>> getUserCommits(User user, Date fromDate, Date toDate) {- var emailAddresses = user.getEmailAddresses().stream()- .filter(it -> it.isVerified())- .map(it -> it.getValue())- .collect(toSet());+ var emailAddresses = user.getVerifiedEmailAddresses();var userCommits = new HashMap<Long, Map<ObjectId, Long>>();Map<String, Map<Long, Map<ObjectId, Long>>> result = clusterService.runOnAllServers(new ClusterTask<>() {