The Unified and Autonomous Development Platform
Fix issue #333 - Alternative user's email address for web commits
Robin Shen3bcb45d2fbda
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.javaindex 8e7fa2ba84..50f6175931 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java@@ -76,20 +76,23 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM@Sessional@Listenpublic void on(SystemStarted event) {- String queryString = String.format("select id, %s, %s, %s, %s from User",- User.PROP_NAME, User.PROP_FULL_NAME, User.PROP_EMAIL, User.PROP_ALTERNATE_EMAILS);+ String queryString = String.format("select id, %s, %s, %s, %s, %s from User",+ User.PROP_NAME, User.PROP_FULL_NAME, User.PROP_EMAIL, User.PROP_GIT_EMAIL, User.PROP_ALTERNATE_EMAILS);Query<?> query = dao.getSession().createQuery(queryString);for (Object[] fields: (List<Object[]>)query.list()) {Long userId = (Long) fields[0];String name = (String) fields[1];String fullName = (String) fields[2];String email = (String) fields[3];- List<String> alternateEmails = (List<String>) fields[4];+ String gitEmail = (String) fields[4];+ List<String> alternateEmails = (List<String>) fields[5];userIdByEmail.put(email, userId);+ if (gitEmail != null)+ userIdByEmail.put(gitEmail, userId);for (String alternateEmail: alternateEmails)userIdByEmail.put(alternateEmail, userId);- cache.put(userId, new UserFacade(userId, name, fullName, email, alternateEmails));+ cache.put(userId, new UserFacade(userId, name, fullName, email, gitEmail, alternateEmails));}}@@ -126,6 +129,8 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM@Overridepublic void run() {userIdByEmail.put(user.getEmail(), user.getId());+ if (user.getGitEmail() != null)+ userIdByEmail.put(user.getGitEmail(), user.getId());for (String alternateEmail: user.getAlternateEmails())userIdByEmail.put(alternateEmail, user.getId());cache.put(user.getId(), new UserFacade(user));@@ -262,6 +267,8 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserMpublic void run() {cache.remove(user.getId());userIdByEmail.remove(user.getEmail());+ if (user.getGitEmail() != null)+ userIdByEmail.remove(user.getGitEmail());for (String email: user.getAlternateEmails())userIdByEmail.remove(email);}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.javaindex c76651b27b..0940712d3b 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java@@ -1021,6 +1021,8 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Overridepublic Integer compute(Transaction txn) {Collection<String> emails = Sets.newHashSet(user.getEmail());+ if (user.getGitEmail() != null)+ emails.add(user.getGitEmail());emails.addAll(user.getAlternateEmails());int count = 0;for (String email: emails) {diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 028d7d111d..416e2d790c 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -123,7 +123,7 @@ public class DefaultDataManager implements DataManager, Serializable {if (administrator == null) {administrator = new User();administrator.setId(User.ROOT_ID);- Set<String> excludedProperties = Sets.newHashSet(User.PROP_ALTERNATE_EMAILS);+ Set<String> excludedProperties = Sets.newHashSet(User.PROP_GIT_EMAIL, User.PROP_ALTERNATE_EMAILS);manualConfigs.add(new ManualConfig("Create Administrator Account", null, administrator, excludedProperties) {@Overridediff --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 bff9903bee..e127dd7a57 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@@ -81,6 +81,8 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwarpublic static final String PROP_EMAIL = "email";+ public static final String PROP_GIT_EMAIL = "gitEmail";+public static final String PROP_ALTERNATE_EMAILS = "alternateEmails";public static final String PROP_PASSWORD = "password";@@ -122,6 +124,9 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar@Column(unique=true, nullable=false)private String email;+ @Column(unique=true)+ private String gitEmail;+@Lob@Column(nullable=false, length=1024)private ArrayList<String> alternateEmails = new ArrayList<>();@@ -486,6 +491,16 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwarthis.email = email;}+ @Editable(order=350, description="Specify an email to use for web based git operations if you want to "+ + "keep your primary email secret")+ public String getGitEmail() {+ return gitEmail;+ }++ public void setGitEmail(String gitEmail) {+ this.gitEmail = gitEmail;+ }+@Editable(order=400, description="Optionally specify one or more alternate emails with one email per line. "+ "With alternate emails, git commits authored/committed via your old emails can be associated with "+ "your current account")@@ -516,6 +531,8 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwarpublic PersonIdent asPerson() {if (isSystem())return new PersonIdent(getDisplayName(), "");+ else if (getGitEmail() != null)+ return new PersonIdent(getDisplayName(), getGitEmail());elsereturn new PersonIdent(getDisplayName(), getEmail());}@@ -788,7 +805,7 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwarpublic LinkedHashSet<String> getUserBuildQuerySubscriptions() {return userBuildQuerySubscriptions;}-+public void setUserBuildQuerySubscriptions(LinkedHashSet<String> userBuildQuerySubscriptions) {this.userBuildQuerySubscriptions = userBuildQuerySubscriptions;}diff --git a/server-core/src/main/java/io/onedev/server/rest/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/UserResource.javaindex 9ca710e446..5e3e4472b3 100644--- a/server-core/src/main/java/io/onedev/server/rest/UserResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/UserResource.java@@ -307,6 +307,8 @@ public class UserResource {private void checkEmails(User user) {Set<String> emails = Sets.newHashSet(user.getEmail());+ if (user.getGitEmail() != null)+ emails.add(user.getGitEmail());emails.addAll(user.getAlternateEmails());for (String email: emails) {User userWithSameEmail = userManager.findByEmail(email);diff --git a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.javaindex af23280296..f350870a05 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java@@ -30,9 +30,12 @@ public class AuthorCriteria extends CommitCriteria {public void fill(Project project, RevListCommand command) {for (String value: values) {if (value == null) { // authored by me- if (SecurityUtils.getUser() != null) {- command.authors().add("<" + SecurityUtils.getUser().getEmail() + ">");- for (String email: SecurityUtils.getUser().getAlternateEmails())+ User user = SecurityUtils.getUser();+ if (user != null) {+ command.authors().add("<" + user.getEmail() + ">");+ if (user.getGitEmail() != null)+ command.authors().add("<" + user.getGitEmail() + ">");+ for (String email: user.getAlternateEmails())command.authors().add("<" + email + ">");} else {throw new ExplicitException("Please login to perform this query");@@ -49,10 +52,12 @@ public class AuthorCriteria extends CommitCriteria {String authorEmail = commit.getAuthorIdent().getEmailAddress();for (String value: values) {if (value == null) { // authored by me- if (User.get() == null) {+ User user = User.get();+ if (user == null) {throw new ExplicitException("Please login to perform this query");- } else if (User.get().getEmail().equals(authorEmail)- || User.get().getAlternateEmails().contains(authorEmail)) {+ } else if (user.getEmail().equals(authorEmail)+ || user.getGitEmail()!=null && user.getGitEmail().equals(authorEmail)+ || user.getAlternateEmails().contains(authorEmail)) {return true;}} else {diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.javaindex 46a4c08b1d..0a3e5f6571 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java@@ -30,9 +30,12 @@ public class CommitterCriteria extends CommitCriteria {public void fill(Project project, RevListCommand command) {for (String value: values) {if (value == null) { // committed by me- if (SecurityUtils.getUser() != null) {- command.committers().add("<" + SecurityUtils.getUser().getEmail() + ">");- for (String email: SecurityUtils.getUser().getAlternateEmails())+ User user = SecurityUtils.getUser();+ if (user != null) {+ command.committers().add("<" + user.getEmail() + ">");+ if (user.getGitEmail() != null)+ command.committers().add("<" + user.getGitEmail() + ">");+ for (String email: user.getAlternateEmails())command.committers().add("<" + email + ">");} else {throw new ExplicitException("Please login to perform this query");@@ -49,10 +52,12 @@ public class CommitterCriteria extends CommitCriteria {String committerEmail = commit.getCommitterIdent().getEmailAddress();for (String value: values) {if (value == null) { // committed by me- if (User.get() == null) {+ User user = User.get();+ if (user == null) {throw new ExplicitException("Please login to perform this query");- } else if (User.get().getEmail().equals(committerEmail)- || User.get().getAlternateEmails().contains(committerEmail)) {+ } else if (user.getEmail().equals(committerEmail)+ || user.getGitEmail() != null && user.getGitEmail().equals(committerEmail)+ || user.getAlternateEmails().contains(committerEmail)) {return true;}} else {diff --git a/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.javaindex 94558e4724..78e1798d37 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/UserFacade.java@@ -17,18 +17,23 @@ public class UserFacade extends EntityFacade {private final String email;+ private final String gitEmail;+private final List<String> alternateEmails;- public UserFacade(Long userId, String name, String fullName, String email, List<String> alternateEmails) {+ public UserFacade(Long userId, String name, @Nullable String fullName, String email,+ @Nullable String gitEmail, List<String> alternateEmails) {super(userId);this.name = name;this.fullName = fullName;this.email = email;+ this.gitEmail = gitEmail;this.alternateEmails = alternateEmails;}public UserFacade(User user) {- this(user.getId(), user.getName(), user.getFullName(), user.getEmail(), user.getAlternateEmails());+ this(user.getId(), user.getName(), user.getFullName(), user.getEmail(),+ user.getGitEmail(), user.getAlternateEmails());}public String getName() {@@ -51,12 +56,16 @@ public class UserFacade extends EntityFacade {return email;}+ public String getGitEmail() {+ return gitEmail;+ }+public List<String> getAlternateEmails() {return alternateEmails;}public boolean isUsingEmail(String email) {- return this.email.equals(email) || alternateEmails.contains(email);+ return email.equals(this.email) || email.equals(gitEmail) || alternateEmails.contains(email);}public NameAndEmail getNameAndEmail() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.javaindex bb24ce2eaa..2abfa02182 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java@@ -66,6 +66,8 @@ public class ProfileEditPanel extends GenericPanel<User> {User user = getUser();user.getAlternateEmails().remove(user.getEmail());+ if (user.getGitEmail() != null)+ user.getAlternateEmails().remove(user.getGitEmail());UserManager userManager = OneDev.getInstance(UserManager.class);User userWithSameName = userManager.findByName(user.getName());@@ -78,6 +80,13 @@ public class ProfileEditPanel extends GenericPanel<User> {editor.error(new Path(new PathNode.Named(User.PROP_EMAIL)),"Email already used by another account");}+ if (user.getGitEmail() != null) {+ userWithSameEmail = userManager.findByEmail(user.getGitEmail());+ if (userWithSameEmail != null && !userWithSameEmail.equals(user)) {+ editor.error(new Path(new PathNode.Named(User.PROP_GIT_EMAIL)),+ "Email already used by another account");+ }+ }for (String email: user.getAlternateEmails()) {userWithSameEmail = userManager.findByEmail(email);if (userWithSameEmail != null && !userWithSameEmail.equals(user)) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.javaindex 7663115e72..3089632676 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/create/NewUserPage.java@@ -41,7 +41,7 @@ public class NewUserPage extends AdministrationPage {super.onInitialize();BeanEditor editor = BeanContext.edit("editor", user,- Sets.newHashSet(User.PROP_ALTERNATE_EMAILS), true);+ Sets.newHashSet(User.PROP_GIT_EMAIL, User.PROP_ALTERNATE_EMAILS), true);Form<?> form = new Form<Void>("form") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.javaindex e5c1bf2530..a1afb17c48 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java@@ -42,7 +42,7 @@ public class SignUpPage extends SimplePage {User user = new User();BeanEditor editor = BeanContext.edit("editor", user,- Sets.newHashSet(User.PROP_ALTERNATE_EMAILS), true);+ Sets.newHashSet(User.PROP_GIT_EMAIL, User.PROP_ALTERNATE_EMAILS), true);Form<?> form = new Form<Void>("form") {