The Unified and Autonomous Development Platform
refactor(user): replace email git/open flags with privacy setting
Robin Shen62e549ad4176
diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.javaindex c0b7a03c0b..16f9e38a8d 100644--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java@@ -625,7 +625,6 @@ public class DefaultDataService implements DataService, Serializable {if (primaryEmailAddress == null) {primaryEmailAddress = new EmailAddress();primaryEmailAddress.setPrimary(true);- primaryEmailAddress.setGit(true);primaryEmailAddress.setVerificationCode(null);primaryEmailAddress.setOwner(user);}diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex db40fc0fa9..6855c1bd57 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -9225,8 +9225,30 @@ public class DataMigrator {}private void migrate237(File dataDir, Stack<Integer> versions) {+ var keepEmailAddressesPrivateMap = new HashMap<String, Boolean>();for (File file : dataDir.listFiles()) {- if (file.getName().startsWith("Settings.xml")) {+ if (file.getName().startsWith("EmailAddresss.xml")) {+ var dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ if (Boolean.parseBoolean(element.elementTextTrim("primary"))) {+ var open = Boolean.parseBoolean(element.elementTextTrim("open"));+ keepEmailAddressesPrivateMap.put(element.elementTextTrim("owner"), !open);+ }+ element.element("git").detach();+ element.element("open").detach();+ }+ dom.writeToFile(file, false);+ }+ }+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Users.xml")) {+ var dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ var isPrivate = keepEmailAddressesPrivateMap.getOrDefault(element.elementTextTrim("id"), false);+ element.addElement("keepEmailAddressesPrivate").setText(String.valueOf(isPrivate));+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Settings.xml")) {var dom = VersionedXmlDoc.fromFile(file);for (Element element : dom.getRootElement().elements()) {if (element.elementTextTrim("key").equals("SYSTEM")) {diff --git a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java b/server-core/src/main/java/io/onedev/server/model/EmailAddress.javaindex b163676e6d..265f141efc 100644--- a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java+++ b/server-core/src/main/java/io/onedev/server/model/EmailAddress.java@@ -42,12 +42,6 @@ public class EmailAddress extends AbstractEntity {@JsonProperty(access = JsonProperty.Access.READ_ONLY)private boolean primary;- @JsonProperty(access = JsonProperty.Access.READ_ONLY)- private boolean git;-- @JsonProperty(access = JsonProperty.Access.READ_ONLY)- private boolean open;-@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)@Immutable@@ -82,23 +76,6 @@ public class EmailAddress extends AbstractEntity {this.primary = primary;}- @Editable- public boolean isGit() {- return git;- }-- public void setGit(boolean git) {- this.git = git;- }-- public boolean isOpen() {- return open;- }-- public void setOpen(boolean open) {- this.open = open;- }-public User getOwner() {return owner;}@@ -113,7 +90,7 @@ public class EmailAddress extends AbstractEntity {public EmailAddressFacade getFacade() {return new EmailAddressFacade(getId(), getOwner().getId(), getValue(),- isPrimary(), isGit(), isOpen(), getVerificationCode());+ isPrimary(), getVerificationCode());}}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 cf8b4200eb..33fa95f3c7 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@@ -66,6 +66,7 @@ import io.onedev.server.service.UserService;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.watch.QuerySubscriptionSupport;import io.onedev.server.util.watch.QueryWatchSupport;+import io.onedev.server.exception.NotAcceptableException;@Entity@Table(indexes={@Index(columnList=PROP_NAME), @Index(columnList=PROP_FULL_NAME)})@@ -119,6 +120,9 @@ public class User extends AbstractEntity implements AuthenticationInfo {private boolean notifyOwnEvents;+ @Column(name="PRIVATE_EMAILS")+ private boolean keepEmailAddressesPrivate;+@Lob@Column(length=65535)private AiSetting aiSetting = new AiSetting();@@ -330,14 +334,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {private transient Collection<Group> groups;- private transient List<EmailAddress> sortedEmailAddresses;-private transient Optional<EmailAddress> primaryEmailAddress;- private transient Optional<EmailAddress> gitEmailAddress;-- private transient Optional<EmailAddress> publicEmailAddress;-private transient List<User> entitledAis;public QueryPersonalization<NamedProjectQuery> getProjectQueryPersonalization() {@@ -717,6 +715,14 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.notifyOwnEvents = sendOwnEvents;}+ public boolean isKeepEmailAddressesPrivate() {+ return keepEmailAddressesPrivate;+ }++ public void setKeepEmailAddressesPrivate(boolean keepEmailAddressesPrivate) {+ this.keepEmailAddressesPrivate = keepEmailAddressesPrivate;+ }+public AiSetting getAiSetting() {return aiSetting;}@@ -766,21 +772,12 @@ public class User extends AbstractEntity implements AuthenticationInfo {}public PersonIdent asPerson() {- var serviceOrAiAccountEmailAddress = getServiceOrAiAccountEmailAddress();- if (serviceOrAiAccountEmailAddress != null)- return new PersonIdent(getName(), serviceOrAiAccountEmailAddress.getValue());-- if (isUnknown()) {+ if (isUnknown())throw new ExplicitException("Unknown user does not have git identity");- } else if (isSystem()) {- return new PersonIdent(User.SYSTEM_NAME, getSystemEmailAddress());- } else {- EmailAddress emailAddress = getGitEmailAddress();- if (emailAddress != null && emailAddress.isVerified())- return new PersonIdent(getDisplayName(), emailAddress.getValue());- else- throw new ExplicitException("No verified email for git operations");- }+ else if (isSystem())+ return new PersonIdent(User.SYSTEM_NAME, getSystemNoreplyEmailAddress());+ else+ return new PersonIdent(getDisplayName(), getGitEmailAddress().getValue());}public String getDisplayName() {@@ -907,17 +904,14 @@ public class User extends AbstractEntity implements AuthenticationInfo {}/**- * Returns verified email address values of this user, including the synthetic- * address used by service and AI accounts for git operations.+ * Returns verified email address values of this user, including the noreply addresses*/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());+ emails.add(newNoreplyEmailAddress().getValue());return emails;}@@ -1253,78 +1247,57 @@ public class User extends AbstractEntity implements AuthenticationInfo {}public List<EmailAddress> getSortedEmailAddresses() {- if (sortedEmailAddresses == null) {- sortedEmailAddresses = new ArrayList<>(getEmailAddresses());- Collections.sort(sortedEmailAddresses);- }+ var sortedEmailAddresses = new ArrayList<>(getEmailAddresses());+ Collections.sort(sortedEmailAddresses);return sortedEmailAddresses;}private EmailAddressService getEmailAddressService() {return OneDev.getInstance(EmailAddressService.class);}-+@Nullablepublic EmailAddress getPrimaryEmailAddress() {- var serviceOrAiAccountEmailAddress = getServiceOrAiAccountEmailAddress();- if (serviceOrAiAccountEmailAddress != null)- return serviceOrAiAccountEmailAddress;-if (primaryEmailAddress == null)primaryEmailAddress = Optional.ofNullable(getEmailAddressService().findPrimary(this));return primaryEmailAddress.orElse(null);}- @Nullable- public EmailAddress getGitEmailAddress() {- var serviceOrAiAccountEmailAddress = getServiceOrAiAccountEmailAddress();- if (serviceOrAiAccountEmailAddress != null)- return serviceOrAiAccountEmailAddress;-- if (gitEmailAddress == null)- gitEmailAddress = Optional.ofNullable(getEmailAddressService().findGit(this));- return gitEmailAddress.orElse(null);- }-- @Nullable- public EmailAddress getPublicEmailAddress() {- var serviceOrAiAccountEmailAddress = getServiceOrAiAccountEmailAddress();- if (serviceOrAiAccountEmailAddress != null)- return serviceOrAiAccountEmailAddress;-- if (publicEmailAddress == null)- publicEmailAddress = Optional.ofNullable(getEmailAddressService().findPublic(this));- return publicEmailAddress.orElse(null);+ public void cachePrimaryEmailAddress(EmailAddress primaryEmailAddress) {+ this.primaryEmailAddress = Optional.ofNullable(primaryEmailAddress);}- @Nullable- public EmailAddress getServiceOrAiAccountEmailAddress() {- if (getType() == Type.SERVICE || getType() == Type.AI) {- var emailAddress = new EmailAddress();- emailAddress.setValue(getName() + "@" + getNoreplyEmailDomain());- emailAddress.setOwner(this);- emailAddress.setPrimary(true);- emailAddress.setGit(true);- emailAddress.setOpen(true);- emailAddress.setVerificationCode(null);- return emailAddress;+ public EmailAddress getGitEmailAddress() {+ if (isKeepEmailAddressesPrivate() || getType() == Type.SERVICE || getType() == Type.AI) {+ return newNoreplyEmailAddress();} else {- return null;+ var primaryEmailAddress = getPrimaryEmailAddress();+ if (primaryEmailAddress != null && primaryEmailAddress.isVerified())+ return primaryEmailAddress;+ else+ throw new NotAcceptableException("Primary email address not set or not verified for user: " + getName());}}+ public EmailAddress newNoreplyEmailAddress() {+ var emailAddress = new EmailAddress();+ emailAddress.setValue(getName() + "@" + getNoreplyEmailDomain());+ emailAddress.setOwner(this);+ emailAddress.setVerificationCode(null);+ return emailAddress;+ }+public static String getNoreplyEmailDomain() {return OneDev.getInstance(SettingService.class).getSystemSetting().getNoreplyEmailDomain();}- public static String getSystemEmailAddress() {- return "system@" + getNoreplyEmailDomain();+ public static String getSystemNoreplyEmailAddress() {+ return User.SYSTEM_NAME.toLowerCase() + "@" + getNoreplyEmailDomain();}public void addEmailAddress(EmailAddress emailAddress) {emailAddress.setOwner(this);emailAddress.setPrimary(getEmailAddresses().stream().noneMatch(it->it.isPrimary()));- emailAddress.setGit(getEmailAddresses().stream().noneMatch(it->it.isGit()));getEmailAddresses().add(emailAddress);}@@ -1365,10 +1338,10 @@ public class User extends AbstractEntity implements AuthenticationInfo {}@Nullable- public static String getServiceOrAiAccountName(String value) {+ public static String getLoginName(String noReplyEmailAddress) {var noreplyEmailSuffix = "@" + getNoreplyEmailDomain();- if (value.endsWith(noreplyEmailSuffix))- return value.substring(0, value.length() - noreplyEmailSuffix.length());+ if (noReplyEmailAddress.endsWith(noreplyEmailSuffix))+ return noReplyEmailAddress.substring(0, noReplyEmailAddress.length() - noreplyEmailSuffix.length());elsereturn null;}@@ -1401,7 +1374,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {}public UserFacade getFacade() {- return new UserFacade(getId(), getName(), getFullName(), getType(), isDisabled(), getAiSetting().isEntitleToAll());+ return new UserFacade(getId(), getName(), getFullName(), getType(), isDisabled(),+ getAiSetting().isEntitleToAll(), isKeepEmailAddressesPrivate());}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.javaindex 624f1377d6..31e53f415f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java@@ -18,7 +18,7 @@ public enum MergeStrategy {@Overridepublic ObjectId merge(PullRequest request, String commitMessage) {- PersonIdent user = new PersonIdent(User.SYSTEM_NAME, User.getSystemEmailAddress());+ PersonIdent user = new PersonIdent(User.SYSTEM_NAME, User.getSystemNoreplyEmailAddress());ObjectId requestHead = request.getLatestUpdate().getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();return getGitService().merge(request.getTargetProject(), targetHead, requestHead,@@ -36,7 +36,7 @@ public enum MergeStrategy {if (getGitService().isMergedInto(project, null, targetHead, requestHead)) {return requestHead;} else {- PersonIdent user = new PersonIdent(User.SYSTEM_NAME, User.getSystemEmailAddress());+ PersonIdent user = new PersonIdent(User.SYSTEM_NAME, User.getSystemNoreplyEmailAddress());return getGitService().merge(project, targetHead, requestHead, false, user, user,commitMessage, false);}@@ -49,7 +49,7 @@ public enum MergeStrategy {public ObjectId merge(PullRequest request, String commitMessage) {ObjectId requestHead = request.getLatestUpdate().getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();- PersonIdent committer = new PersonIdent(User.SYSTEM_NAME, User.getSystemEmailAddress());+ PersonIdent committer = new PersonIdent(User.SYSTEM_NAME, User.getSystemNoreplyEmailAddress());return getGitService().merge(request.getTargetProject(), targetHead, requestHead, true,committer, request.getSubmitter().asPerson(), commitMessage, false);}@@ -61,7 +61,7 @@ public enum MergeStrategy {public ObjectId merge(PullRequest request, String commitMessage) {ObjectId requestHead = request.getLatestUpdate().getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();- PersonIdent user = new PersonIdent(User.SYSTEM_NAME, User.getSystemEmailAddress());+ PersonIdent user = new PersonIdent(User.SYSTEM_NAME, User.getSystemNoreplyEmailAddress());return getGitService().rebase(request.getTargetProject(), requestHead, targetHead, user);}diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.javaindex 82c59fd4ff..0150e3fc21 100644--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java@@ -72,7 +72,7 @@ public class BuildNotificationManager implements Serializable {@Sessionalpublic void notify(BuildEvent event, Collection<String> emails) {- emails = emails.stream().filter(it -> !it.equals(User.getSystemEmailAddress())).collect(toList());+ emails = emails.stream().filter(it -> !it.equals(User.getSystemNoreplyEmailAddress())).collect(toList());if (!emails.isEmpty()) {Build build = event.getBuild();diff --git a/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.javaindex e97ef21c5e..f754c79f93 100644--- a/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/PackNotificationManager.java@@ -60,7 +60,7 @@ public class PackNotificationManager {@Sessionalpublic void notify(PackEvent event, Collection<String> emails) {- emails = emails.stream().filter(it -> !it.equals(User.getSystemEmailAddress())).collect(toList());+ emails = emails.stream().filter(it -> !it.equals(User.getSystemNoreplyEmailAddress())).collect(toList());if (!emails.isEmpty()) {Pack pack = event.getPack();diff --git a/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.javaindex 49ef4ce9cc..18dee45830 100644--- a/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/WorkspaceNotificationManager.java@@ -66,7 +66,7 @@ public class WorkspaceNotificationManager {@Sessionalpublic void notify(WorkspaceEvent event, Collection<String> emails) {- emails = emails.stream().filter(it -> !it.equals(User.getSystemEmailAddress())).collect(toList());+ emails = emails.stream().filter(it -> !it.equals(User.getSystemNoreplyEmailAddress())).collect(toList());if (!emails.isEmpty()) {Workspace workspace = event.getWorkspace();diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.javaindex 83b2e97b79..0751d12bfd 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java@@ -89,40 +89,6 @@ public class EmailAddressResource {return emailAddress.getId();}- @Api(order=220, description="Set as public email address")- @Path("/public")- @POST- public Long setAsPublic(@NotNull Long emailAddressId) {- var emailAddress = emailAddressService.load(emailAddressId);- var owner = emailAddress.getOwner();- if (!SecurityUtils.isAdministrator() && !owner.equals(getAuthUser()))- throw new UnauthorizedException();-- emailAddressService.setAsPublic(emailAddress);-- if (!getAuthUser().equals(owner))- auditService.audit(null, "set email address \"" + emailAddress.getValue() + "\" as public in account \"" + owner.getName() + "\" via RESTful API", null, null);-- return emailAddressId;- }-- @Api(order=230, description="Set as private email address")- @Path("/private")- @POST- public Long setAsPrivate(@NotNull Long emailAddressId) {- var emailAddress = emailAddressService.load(emailAddressId);- var owner = emailAddress.getOwner();- if (!SecurityUtils.isAdministrator() && !owner.equals(getAuthUser()))- throw new UnauthorizedException();-- emailAddressService.setAsPrivate(emailAddress);-- if (!getAuthUser().equals(owner))- auditService.audit(null, "set email address \"" + emailAddress.getValue() + "\" as private in account \"" + owner.getName() + "\" via RESTful API", null, null);-- return emailAddressId;- }-@Api(order=250, description="Set as primary email address")@Path("/primary")@POST@@ -143,22 +109,6 @@ public class EmailAddressResource {return emailAddressId;}- @Api(order=260, description="Use for git operations")- @Path("/git")- @POST- public Long useForGitOperations(@NotNull Long emailAddressId) {- var emailAddress = emailAddressService.load(emailAddressId);- if (!SecurityUtils.isAdministrator() && !emailAddress.getOwner().equals(getAuthUser()))- throw new UnauthorizedException();-- emailAddressService.useForGitOperations(emailAddress);-- if (!getAuthUser().equals(emailAddress.getOwner()))- auditService.audit(null, "specified email address \"" + emailAddress.getValue() + "\" for git operations in account \"" + emailAddress.getOwner().getName() + "\" via RESTful API", null, null);-- return emailAddressId;- }-@Api(order=260, description="Resend verification email")@Path("/resend-verification-email")@POSTdiff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.javaindex 26a2da3840..e849458e32 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java@@ -375,7 +375,6 @@ public class UserResource {user.setPassword(passwordService.encryptPassword(data.getPassword()));userService.create(user);EmailAddress emailAddress = new EmailAddress();- emailAddress.setGit(true);emailAddress.setPrimary(true);emailAddress.setOwner(user);emailAddress.setValue(data.getEmailAddress());@@ -405,6 +404,7 @@ public class UserResource {oldData.setName(user.getName());oldData.setFullName(user.getFullName());oldData.setNotifyOwnEvents(user.isNotifyOwnEvents());+ oldData.setKeepEmailAddressesPrivate(user.isKeepEmailAddressesPrivate());var oldAuditContent = VersionedXmlDoc.fromBean(oldData).toXML();@@ -413,6 +413,8 @@ public class UserResource {user.setFullName(data.getFullName());if (user.getType() != SERVICE)user.setNotifyOwnEvents(data.isNotifyOwnEvents());+ if (data.isKeepEmailAddressesPrivate() != null)+ user.setKeepEmailAddressesPrivate(data.isKeepEmailAddressesPrivate());userService.update(user, oldName);if (!getAuthUser().equals(user)) {@@ -830,6 +832,9 @@ public class UserResource {@Api(order=300, description = "Whether or not to notify user on own events. Required for ordinary user")private boolean notifyOwnEvents;++ @Api(order=400, description = "Whether or not to keep email addresses private")+ private Boolean keepEmailAddressesPrivate;@UserName@NotEmpty@@ -856,6 +861,14 @@ public class UserResource {public void setNotifyOwnEvents(boolean notifyOwnEvents) {this.notifyOwnEvents = notifyOwnEvents;}++ public Boolean isKeepEmailAddressesPrivate() {+ return keepEmailAddressesPrivate;+ }++ public void setKeepEmailAddressesPrivate(Boolean keepEmailAddressesPrivate) {+ this.keepEmailAddressesPrivate = keepEmailAddressesPrivate;+ }}public static class QueriesAndWatches implements Serializable {diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultAuthenticatingService.java b/server-core/src/main/java/io/onedev/server/security/DefaultAuthenticatingService.javaindex 0fa3295e20..632737bffd 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultAuthenticatingService.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultAuthenticatingService.java@@ -85,7 +85,6 @@ public class DefaultAuthenticatingService extends AuthenticatingRealm implementsemailAddress.setVerificationCode(null);emailAddress.setOwner(user);emailAddress.setPrimary(true);- emailAddress.setGit(true);emailAddressService.create(emailAddress);user.getEmailAddresses().add(emailAddress);diff --git a/server-core/src/main/java/io/onedev/server/service/EmailAddressService.java b/server-core/src/main/java/io/onedev/server/service/EmailAddressService.javaindex 01959bcb2c..e510ee641b 100644--- a/server-core/src/main/java/io/onedev/server/service/EmailAddressService.java+++ b/server-core/src/main/java/io/onedev/server/service/EmailAddressService.java@@ -23,23 +23,11 @@ public interface EmailAddressService extends EntityService<EmailAddress> {@NullableEmailAddress findPrimary(User user);- @Nullable- EmailAddress findGit(User user);-- @Nullable- EmailAddress findPublic(User user);-@NullableEmailAddress findByPersonIdent(PersonIdent personIdent);void setAsPrimary(EmailAddress emailAddress);- void setAsPublic(EmailAddress emailAddress);-- void setAsPrivate(EmailAddress emailAddress);-- void useForGitOperations(EmailAddress emailAddress);-void sendVerificationEmail(EmailAddress emailAddress);EmailAddressCache cloneCache();@@ -48,4 +36,4 @@ public interface EmailAddressService extends EntityService<EmailAddress> {void update(EmailAddress address);-}\ No newline at end of file+}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultEmailAddressService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultEmailAddressService.javaindex f2d23b7043..7b7401617a 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultEmailAddressService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultEmailAddressService.java@@ -19,6 +19,7 @@ import io.onedev.server.event.Listen;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarting;+import io.onedev.server.exception.NotAcceptableException;import io.onedev.server.mail.MailService;import io.onedev.server.model.EmailAddress;import io.onedev.server.model.User;@@ -76,7 +77,7 @@ public class DefaultEmailAddressService extends BaseEntityService<EmailAddress>if (facade.getId() != null) {return load(facade.getId());} else {- return userService.load(facade.getOwnerId()).getServiceOrAiAccountEmailAddress();+ return userService.load(facade.getOwnerId()).newNoreplyEmailAddress();}} else {return null;@@ -106,55 +107,19 @@ public class DefaultEmailAddressService extends BaseEntityService<EmailAddress>dao.persist(each);}emailAddress.setPrimary(true);- dao.persist(emailAddress);- }-- @Transactional- @Override- public void setAsPublic(EmailAddress emailAddress) {- for (EmailAddress each: emailAddress.getOwner().getEmailAddresses()) {- each.setOpen(false);- dao.persist(each);- }- emailAddress.setOpen(true);- dao.persist(emailAddress);- }-- @Transactional- @Override- public void setAsPrivate(EmailAddress emailAddress) {- emailAddress.setOpen(false);- dao.persist(emailAddress);- }-- @Transactional- @Override- public void useForGitOperations(EmailAddress emailAddress) {- for (EmailAddress each: emailAddress.getOwner().getEmailAddresses()) {- each.setGit(false);- dao.persist(each);- }- emailAddress.setGit(true);+ emailAddress.getOwner().cachePrimaryEmailAddress(emailAddress);dao.persist(emailAddress);}@Transactional@Overridepublic void delete(EmailAddress emailAddress) {- super.delete(emailAddress);+ if (emailAddress.isPrimary())+ throw new NotAcceptableException("Cannot delete primary email address");- if (emailAddress.isPrimary() || emailAddress.isGit()) {- User user = emailAddress.getOwner();- user.getEmailAddresses().remove(emailAddress);- if (!user.getSortedEmailAddresses().isEmpty()) {- EmailAddress firstEmailAddress = user.getSortedEmailAddresses().iterator().next();- if (emailAddress.isPrimary())- firstEmailAddress.setPrimary(true);- if (emailAddress.isGit())- firstEmailAddress.setGit(true);- dao.persist(firstEmailAddress);- }- }+ super.delete(emailAddress);+ User user = emailAddress.getOwner();+ user.getEmailAddresses().remove(emailAddress);}@Transactional@@ -166,7 +131,6 @@ public class DefaultEmailAddressService extends BaseEntityService<EmailAddress>User user = emailAddress.getOwner();if (user.getEmailAddresses().isEmpty()) {emailAddress.setPrimary(true);- emailAddress.setGit(true);}dao.persist(emailAddress);@@ -255,24 +219,6 @@ public class DefaultEmailAddressService extends BaseEntityService<EmailAddress>return cache.findPrimary(userId);}- @Override- public EmailAddress findGit(User user) {- EmailAddressFacade facade = cache.findGit(user);- if (facade != null)- return load(facade.getId());- else- return null;- }-- @Override- public EmailAddress findPublic(User user) {- EmailAddressFacade facade = cache.findPublic(user);- if (facade != null)- return load(facade.getId());- else- return null;- }-@Overridepublic EmailAddressCache cloneCache() {return cache.clone();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.javaindex e15a233254..a9ddff7cb9 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java@@ -1272,7 +1272,7 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>comparisonBase = mergeBase1;break;} else {- PersonIdent person = new PersonIdent(User.SYSTEM_NAME, User.getSystemEmailAddress());+ PersonIdent person = new PersonIdent(User.SYSTEM_NAME, User.getSystemNoreplyEmailAddress());comparisonBase = getGitService().merge(targetProject, oldCommitId, mergeBase1,false, person, person, "helper commit", true);break;diff --git a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.javaindex 9a320911bd..bfd95d11a5 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java@@ -26,11 +26,11 @@ public class EmailAddressCache extends MapProxy<Long, EmailAddressFacade> {@Nullablepublic EmailAddressFacade findByValue(String value) {value = value.toLowerCase();- var serviceOrAiAccountName = User.getServiceOrAiAccountName(value);- if (serviceOrAiAccountName != null) {- var serviceOrAiAccount = OneDev.getInstance(UserService.class).findFacadeByName(serviceOrAiAccountName);- if (serviceOrAiAccount != null)- return new EmailAddressFacade(null, serviceOrAiAccount.getId(), value, true, true, true, null);+ var loginName = User.getLoginName(value);+ if (loginName != null) {+ var user = OneDev.getInstance(UserService.class).findFacadeByName(loginName);+ if (user != null)+ return new EmailAddressFacade(null, user.getId(), value, false, null);elsereturn null;}@@ -51,21 +51,4 @@ public class EmailAddressCache extends MapProxy<Long, EmailAddressFacade> {return null;}- @Nullable- public EmailAddressFacade findGit(User user) {- for (EmailAddressFacade facade: values()) {- if (facade.isGit() && facade.getOwnerId().equals(user.getId()))- return facade;- }- return null;- }-- @Nullable- public EmailAddressFacade findPublic(User user) {- for (EmailAddressFacade facade: values()) {- if (facade.isOpen() && facade.getOwnerId().equals(user.getId()))- return facade;- }- return null;- }}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacade.javaindex c071a3868a..f2a5a1936b 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacade.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacade.java@@ -12,20 +12,14 @@ public class EmailAddressFacade extends EntityFacade {private final boolean primary;- private final boolean git;-- private final boolean open;-private final String verificationCode;- public EmailAddressFacade(Long id, Long ownerId, String value, boolean primary,- boolean git, boolean open, @Nullable String verificationCode) {+ public EmailAddressFacade(Long id, Long ownerId, String value, boolean primary,+ @Nullable String verificationCode) {super(id);this.ownerId = ownerId;this.value = value;this.primary = primary;- this.git = git;- this.open = open;this.verificationCode = verificationCode;}@@ -41,14 +35,6 @@ public class EmailAddressFacade extends EntityFacade {return primary;}- public boolean isGit() {- return git;- }-- public boolean isOpen() {- return open;- }-@Nullablepublic String getVerificationCode() {return verificationCode;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 777f3c6930..d296dce9f8 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,15 +17,18 @@ public class UserFacade extends EntityFacade {private final boolean disabled;private final boolean entitleToAll;++ private final boolean keepEmailAddressesPrivate;public UserFacade(Long id, String name, @Nullable String fullName, User.Type type,- boolean disabled, boolean entitleToAll) {+ boolean disabled, boolean entitleToAll, boolean keepEmailAddressesPrivate) {super(id);this.name = name;this.fullName = fullName;this.type = type;this.disabled = disabled;this.entitleToAll = entitleToAll;+ this.keepEmailAddressesPrivate = keepEmailAddressesPrivate;}public String getName() {@@ -73,5 +76,9 @@ public class UserFacade extends EntityFacade {public boolean isEntitleToAll() {return entitleToAll;}++ public boolean isKeepEmailAddressesPrivate() {+ return keepEmailAddressesPrivate;+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AttachAjaxIndicatorListener.java b/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AttachAjaxIndicatorListener.javaindex 565f29de28..d337a78a69 100644--- a/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AttachAjaxIndicatorListener.java+++ b/server-core/src/main/java/io/onedev/server/web/ajaxlistener/AttachAjaxIndicatorListener.java@@ -64,9 +64,11 @@ public class AttachAjaxIndicatorListener implements IAjaxCallListener {CharSequence url = RequestCycle.get().urlFor(handler);String insertAt = attachMode==AttachMode.APPEND?"after":"before";return String.format(""- + "$('#%s').siblings('.working-indicator').remove(); "- + "$('#%s').addClass('with-working-indicator').%s('<img src=\"%s\" width=\"16\" height=\"16\" class=\"working-indicator\"></img>');",- attachTo.getMarkupId(), attachTo.getMarkupId(), insertAt, url);+ + "var $attachTo = $('#%s');"+ + "clearTimeout($attachTo[0].successIndicatorTimeout);"+ + "$attachTo.siblings('.working-indicator').remove(); "+ + "$attachTo.addClass('with-working-indicator').%s('<img src=\"%s\" width=\"16\" height=\"16\" class=\"working-indicator\"></img>');",+ attachTo.getMarkupId(), insertAt, url);}@Override@@ -82,9 +84,14 @@ public class AttachAjaxIndicatorListener implements IAjaxCallListener {if (indicateSuccessful) {String insertAt = attachMode==AttachMode.APPEND?"after":"before";return String.format(""- + "$('#%s').removeClass('with-working-indicator').siblings('.working-indicator').remove();"- + "$('#%s').%s('<svg class=\"icon working-indicator text-success\"><use xlink:href=\"%s\"/></svg>');",- attachTo.getMarkupId(), attachTo.getMarkupId(), insertAt,+ + "var $attachTo = $('#%s');"+ + "clearTimeout($attachTo[0].successIndicatorTimeout);"+ + "$attachTo.removeClass('with-working-indicator').siblings('.working-indicator').remove();"+ + "$attachTo.%s('<svg class=\"icon working-indicator text-success\"><use xlink:href=\"%s\"/></svg>');"+ + "$attachTo[0].successIndicatorTimeout = setTimeout(function() {"+ + "$attachTo.siblings('.working-indicator').remove();"+ + "}, 1000);",+ attachTo.getMarkupId(), insertAt,SpriteImage.getVersionedHref(IconScope.class, "tick"));} else {return String.format("$('#%s').removeClass('with-working-indicator').siblings('.working-indicator').remove();",diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesCssResourceReference.javanew file mode 100644index 0000000000..a4d673d38f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesCssResourceReference.java@@ -0,0 +1,11 @@+package io.onedev.server.web.component.user.emailaddresses;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class EmailAddressesCssResourceReference extends BaseDependentCssResourceReference {++ public EmailAddressesCssResourceReference() {+ super(EmailAddressesCssResourceReference.class, "email-addresses.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.htmlindex 1939f7e28d..6dc5c7eaa4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html@@ -1,36 +1,64 @@<wicket:panel><div class="email-addresses">- <ul class="alert alert-light px-5 mb-5">- <li><wicket:t>Primary email address will be used to receive notifications, show gravatar (if enabled) etc.</wicket:t></li>- <li><wicket:t>Git email address will be used as git author/committer for commits created on web UI</wicket:t></li>- <li><wicket:t>When determine if the user is author/committer of a git commit, all emails listed here will be checked</wicket:t></li>- <li><wicket:t>Unverified email address is <b>NOT</b> applicable for above functionalities</wicket:t></li>- </ul>- <table class="table">- <tr wicket:id="emailAddresses">- <td>- <span wicket:id="value" class="font-size-lg"></span>- <span wicket:id="primary" class="badge badge-info badge-sm ml-3"><wicket:t>Primary</wicket:t></span>- <span wicket:id="git" class="badge badge-info badge-sm ml-1"><wicket:t>Git</wicket:t></span>- <span wicket:id="public" class="badge badge-info badge-sm ml-1"><wicket:t>Public</wicket:t></span>- <span wicket:id="verificationStatus" class="ml-1"></span>- </td>- <td>- <a wicket:id="operations" t:data-tippy-content="Operations" class="btn btn-xs btn-icon btn-light btn-hover-primary"><wicket:svg href="arrow" class="icon rotate-90"/></a>- </td>- </tr>- <tr>- <td colspan="2">- <div class="mb-2 mt-4 font-weight-bolder"><wicket:t>Add New Email Address</wicket:t></div>- <div class="form-group">- <form wicket:id="form" class="form-inline">- <input wicket:id="emailAddress" class="form-control form-control-sm flex-flow-0 mr-3" t:placeholder="Email address">- <button type="submit" class="btn btn-icon btn-sm btn-primary"><wicket:svg href="plus" class="icon"/></button>- </form>- <div wicket:id="feedback"></div>- </div>- </td>- </tr>- </table>+ <section class="mb-5 border-bottom pb-5">+ <h6 class="mb-3"><wicket:t>Primary Email Address</wicket:t></h6>+ <p class="text-muted font-size-sm"><wicket:t>The primary email address is used to receive notifications and show your gravatar (if enabled). It is also used for web-based Git operations unless email addresses are kept private.</wicket:t></p>+ <form wicket:id="primaryForm">+ <div class="form-inline">+ <select wicket:id="select" class="form-control mr-3"></select>+ <input wicket:id="input" class="form-control mr-3" t:placeholder="Email address">+ <button wicket:id="submit" type="submit" class="btn btn-icon btn-sm btn-primary"><wicket:svg href="plus" class="icon"/></button>+ </div>+ <div wicket:id="feedback" class="mt-2"></div>+ <div wicket:id="unverifiedNote" class="mt-3 text-warning font-size-sm">+ <wicket:t>This email address is not verified</wicket:t>+ <a wicket:id="resendVerificationEmail" t:data-tippy-content="Resend verification email" class="ml-2"><wicket:svg href="mail" class="icon icon-sm"/></a>+ </div>+ </form>+ </section>++ <section wicket:id="backupEmailAddresses" class="mb-5 border-bottom pb-5">+ <h6 class="mb-3"><wicket:t>Backup Email Addresses</wicket:t></h6>+ <p class="text-muted font-size-sm"><wicket:t>Verified backup email addresses can be used for password recovery and to identify your commits.</wicket:t></p>+ <wicket:enclosure child="list">+ <table class="table table-borderless w-auto mb-3">+ <tr wicket:id="list">+ <td class="pl-0 pt-0">+ <span wicket:id="value" class="font-size-lg"></span>+ <span wicket:id="verificationStatus" class="ml-1"></span>+ </td>+ <td class="text-right text-nowrap pt-0">+ <a wicket:id="resendVerificationEmail" t:data-tippy-content="Resend verification email" class="mr-1"><wicket:svg href="mail" class="icon icon-sm"/></a>+ <a wicket:id="delete" t:data-tippy-content="Delete"><wicket:svg href="trash" class="icon icon-sm"/></a>+ </td>+ </tr>+ </table>+ </wicket:enclosure>+ <form wicket:id="form">+ <div class="form-inline">+ <input wicket:id="input" class="form-control form-control-sm mr-3" t:placeholder="Email address">+ <button wicket:id="submit" type="submit" class="btn btn-icon btn-sm btn-primary"><wicket:svg href="plus" class="icon"/></button>+ </div>+ <div wicket:id="feedback" class="font-size-sm mt-2"></div>+ </form>+ </section>++ <section>+ <h6 class="mb-3"><wicket:t>Email Address Privacy</wicket:t></h6>+ <form wicket:id="privacyForm">+ <div class="checkbox-inline mb-3">+ <label wicket:id="label" class="checkbox">+ <input wicket:id="check" type="checkbox" class="form-check-input">+ <wicket:t>Keep my email addresses private</wicket:t>+ </label>+ </div>+ <div wicket:id="privateNote">+ <wicket:svg href="bulb" class="icon"/>+ <wicket:t>If private, use the auto-generated email address</wicket:t>+ <strong wicket:id="generatedEmailAddress"></strong>+ <wicket:t>for Git operations. All Git operations performed from the web UI will also use this address.</wicket:t>+ </div>+ </form>+ </section></div>-</wicket:panel>\ No newline at end of file+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.javaindex 8b78d8df16..be67dd3d42 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java@@ -3,327 +3,397 @@ package io.onedev.server.web.component.user.emailaddresses;import static io.onedev.server.web.translation.Translation._T;import java.io.Serializable;-import java.util.ArrayList;import java.util.List;+import java.util.stream.Collectors;+import javax.inject.Inject;++import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.head.CssHeaderItem;+import java.util.concurrent.atomic.AtomicLong;+import org.apache.wicket.validation.IValidator;+import org.apache.wicket.validation.IValidatable;+import org.apache.wicket.markup.html.form.ChoiceRenderer;+import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;+import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.CheckBox;+import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.validation.IErrorMessageSource;import org.apache.wicket.validation.IValidationError;import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;+import org.jspecify.annotations.Nullable;-import io.onedev.server.OneDev;-import io.onedev.server.service.AuditService;-import io.onedev.server.service.EmailAddressService;-import io.onedev.server.service.SettingService;import io.onedev.server.model.EmailAddress;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.AuditService;+import io.onedev.server.service.EmailAddressService;+import io.onedev.server.service.SettingService;+import io.onedev.server.service.UserService;import io.onedev.server.web.component.EmailAddressVerificationStatusBadge;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.menu.MenuItem;-import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.page.user.UserPage;import io.onedev.server.web.util.ConfirmClickModifier;public class EmailAddressesPanel extends GenericPanel<User> {- private String emailAddressValue;-+ @Inject+ private AuditService auditService;++ @Inject+ private SettingService settingService;++ @Inject+ private UserService userService;++ @Inject+ private EmailAddressService emailAddressService;+public EmailAddressesPanel(String id, IModel<User> model) {super(id, model);}- private AuditService getAuditService() {- return OneDev.getInstance(AuditService.class);- }-@Overrideprotected void onInitialize() {super.onInitialize();-- add(new ListView<EmailAddress>("emailAddresses", new AbstractReadOnlyModel<List<EmailAddress>>() {++ var backupEmailAddressesSection = new WebMarkupContainer("backupEmailAddresses") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getUser().getPrimaryEmailAddress() != null);+ }++ };+ backupEmailAddressesSection.setOutputMarkupPlaceholderTag(true);++ Form<Void> primaryForm = new Form<>("primaryForm");++ AtomicLong primaryEmailAddressId = new AtomicLong(0);+ if (getUser().getPrimaryEmailAddress() != null)+ primaryEmailAddressId.set(getUser().getPrimaryEmailAddress().getId());+ var primaryChoice = new DropDownChoice<>(+ "select",+ new IModel<EmailAddress>() {++ @Override+ public EmailAddress getObject() {+ if (primaryEmailAddressId.get() != 0)+ return emailAddressService.load(primaryEmailAddressId.get());+ else+ return null;+ }++ @Override+ public void setObject(EmailAddress object) {+ primaryEmailAddressId.set(object.getId());+ }++ @Override+ public void detach() {+ }++ }, new LoadableDetachableModel<List<EmailAddress>>() {++ @Override+ public List<EmailAddress> load() {+ return getUser().getSortedEmailAddresses();+ }++ }, new ChoiceRenderer<>("value")) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getUser().getEmailAddresses().isEmpty());+ }++ };++ primaryChoice.setRequired(true);+ primaryChoice.add(new AjaxFormSubmitBehavior(primaryForm, "change") {++ @Override+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);+ emailAddressService.setAsPrimary(emailAddressService.load(primaryEmailAddressId.get()));+ Session.get().success(_T("Primary email address changed"));+ auditIfNecessary("specified email address \"" + getUser().getPrimaryEmailAddress().getValue() + "\" as primary");+ setResponsePage(getPage().getClass(), getPage().getPageParameters());+ }++ @Override+ protected void onError(AjaxRequestTarget target) {+ super.onError(target);+ target.add(primaryForm);+ }++ });+ primaryForm.add(primaryChoice);++ var primaryInput = new TextField<String>("input", Model.of("")) {+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getUser().getEmailAddresses().isEmpty());+ }+ };+ primaryInput.setLabel(Model.of(_T("Email address")));+ primaryInput.setRequired(true);+ primaryInput.add(newEmailAddressValidator());+ primaryForm.add(primaryInput);++ var primarySubmit = new AjaxButton("submit") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ var emailAddress = newEmailAddress(primaryForm, primaryInput.getModelObject());+ if (emailAddress != null) {+ emailAddressService.create(emailAddress);+ Session.get().success(_T("Primary email address added"));+ auditIfNecessary("added primary email address \"" + getUser().getPrimaryEmailAddress().getValue() + "\"");+ setResponsePage(getPage().getClass(), getPage().getPageParameters());+ } else {+ target.add(primaryForm);+ }+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(primaryForm);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getUser().getEmailAddresses().isEmpty());+ }+ };++ primaryForm.add(primarySubmit);+ primaryForm.add(new FencedFeedbackPanel("feedback", primaryForm));++ var unverifiedNoteContainer = new WebMarkupContainer("unverifiedNote") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getUser().getPrimaryEmailAddress() != null && !getUser().getPrimaryEmailAddress().isVerified());+ }++ };+ unverifiedNoteContainer.setOutputMarkupPlaceholderTag(true);+ unverifiedNoteContainer.add(new AjaxLink<Void>("resendVerificationEmail") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ if (settingService.getMailConnector() != null) {+ emailAddressService.sendVerificationEmail(getUser().getPrimaryEmailAddress());+ Session.get().success(_T("Verification email sent, please check it"));+ } else {+ target.appendJavaScript(String.format("alert('%s');",+ _T("Unable to send verification email as mail service is not configured yet")));+ }+ }++ });+ primaryForm.add(unverifiedNoteContainer);++ primaryForm.setOutputMarkupId(true);+ add(primaryForm);++ backupEmailAddressesSection.add(new ListView<EmailAddress>("list", new AbstractReadOnlyModel<>() {@Overridepublic List<EmailAddress> getObject() {- return getUser().getSortedEmailAddresses();+ return getUser().getSortedEmailAddresses().stream()+ .filter(it -> !it.equals(getUser().getPrimaryEmailAddress()))+ .collect(Collectors.toList());}-+}) {@Overrideprotected void populateItem(ListItem<EmailAddress> item) {- EmailAddress emailAddress = item.getModelObject();+ var emailAddress = item.getModelObject();+ Long emailAddressId = emailAddress.getId();item.add(new Label("value", emailAddress.getValue()));-- item.add(new WebMarkupContainer("primary")- .setVisible(emailAddress.equals(getUser().getPrimaryEmailAddress())));- item.add(new WebMarkupContainer("git")- .setVisible(emailAddress.equals(getUser().getGitEmailAddress())));- item.add(new WebMarkupContainer("public")- .setVisible(emailAddress.isOpen()));-item.add(new EmailAddressVerificationStatusBadge("verificationStatus", item.getModel()));-- Long emailAddressId = emailAddress.getId();- item.add(new MenuLink("operations") {-+ item.add(new AjaxLink<Void>("resendVerificationEmail") {@Override- protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {- List<MenuItem> menuItems = new ArrayList<>();- var emailAddress = getEmailAddressService().load(emailAddressId);- if (!emailAddress.equals(getUser().getPrimaryEmailAddress())) {- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return _T("Set As Primary");- }-- @Override- public WebMarkupContainer newLink(String id) {- return new Link<Void>(id) {-- @Override- public void onClick() {- var emailAddress = getEmailAddressService().load(emailAddressId);- getEmailAddressService().setAsPrimary(emailAddress);- if (getPage() instanceof UserPage)- getAuditService().audit(null, "specified email address \"" + emailAddress.getValue() + "\" as primary in account \"" + getUser().getName() + "\"", null, null);- }-- };- }-- });- }- if (!emailAddress.equals(getUser().getGitEmailAddress())) {- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return _T("Use For Git Operations");- }-- @Override- public WebMarkupContainer newLink(String id) {- return new Link<Void>(id) {-- @Override- public void onClick() {- var emailAddress = getEmailAddressService().load(emailAddressId);- getEmailAddressService().useForGitOperations(emailAddress);- if (getPage() instanceof UserPage)- getAuditService().audit(null, "specified email address \"" + emailAddress.getValue() + "\" for git operations in account \"" + getUser().getName() + "\"", null, null);- }-- };- }-- });- }- if (!emailAddress.equals(getUser().getPublicEmailAddress())) {- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return _T("Set as Public");- }-- @Override- public WebMarkupContainer newLink(String id) {- return new Link<Void>(id) {-- @Override- public void onClick() {- var emailAddress = getEmailAddressService().load(emailAddressId);- getEmailAddressService().setAsPublic(emailAddress);- if (getPage() instanceof UserPage)- getAuditService().audit(null, "specified email address \"" + emailAddress.getValue() + "\" as public in account \"" + getUser().getName() + "\"", null, null);- }-- };- }-- });+ public void onClick(AjaxRequestTarget target) {+ if (settingService.getMailConnector() != null) {+ emailAddressService.sendVerificationEmail(emailAddressService.load(emailAddressId));+ Session.get().success(_T("Verification email sent, please check it"));} else {- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return _T("Set as Private");- }-- @Override- public WebMarkupContainer newLink(String id) {- return new Link<Void>(id) {-- @Override- public void onClick() {- var emailAddress = getEmailAddressService().load(emailAddressId);- getEmailAddressService().setAsPrivate(emailAddress);- if (getPage() instanceof UserPage)- getAuditService().audit(null, "specified email address \"" + emailAddress.getValue() + "\" as private in account \"" + getUser().getName() + "\"", null, null);- }-- };- }-- });+ target.appendJavaScript(String.format("alert('%s');",+ _T("Unable to send verification email as mail service is not configured yet")));}-- if (!emailAddress.isVerified()) {- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return _T("Resend Verification Email");- }-- @Override- public WebMarkupContainer newLink(String id) {- return new AjaxLink<Void>(id) {-- @Override- public void onClick(AjaxRequestTarget target) {- if (OneDev.getInstance(SettingService.class).getMailConnector() != null) {- getEmailAddressService().sendVerificationEmail(item.getModelObject());- Session.get().success(_T("Verification email sent, please check it"));- } else {- target.appendJavaScript(String.format("alert('%s');",- _T("Unable to send verification email as mail service is not configured yet")));- }- dropdown.close();- }-- };- }-- });- }- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return _T("Delete");- }-- @Override- public WebMarkupContainer newLink(String id) {- var hasMultipleEmailAddresses = getUser().getEmailAddresses().size() > 1;- var link = new Link<Void>(id) {-- @Override- public void onClick() {- if (hasMultipleEmailAddresses) {- var emailAddress = getEmailAddressService().load(emailAddressId);- getEmailAddressService().delete(emailAddress);- if (getPage() instanceof UserPage)- getAuditService().audit(null, "deleted email address \"" + emailAddress.getValue() + "\" from account \"" + getUser().getName() + "\"", null, null);- } else {- Session.get().warn(_T("At least one email address should be configured, please add a new one first"));- }- }-- };- if (getUser().getEmailAddresses().size() > 1)- link.add(new ConfirmClickModifier(_T("Do you really want to delete this email address?")));- return link;- }-- });- return menuItems;}@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!getMenuItems(null).isEmpty());+ setVisible(!emailAddress.isVerified());}-+});++ var deleteLink = new Link<Void>("delete") {++ @Override+ public void onClick() {+ var emailAddress = emailAddressService.load(emailAddressId);+ emailAddressService.delete(emailAddress);+ auditIfNecessary("deleted backup email address \"" + emailAddress.getValue() + "\"");+ setResponsePage(getPage().getClass(), getPage().getPageParameters());+ }+ };+ deleteLink.add(new ConfirmClickModifier(_T("Do you really want to delete this email address?")));+ item.add(deleteLink);}-++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getUser().getEmailAddresses().size() > 1);+ }+});-- Form<?> form = new Form<Void>("form") {+ add(backupEmailAddressesSection);++ Form<Void> backupForm = new Form<>("form");++ var backupInput = new TextField<String>("input", Model.of(""));+ backupInput.setRequired(true);+ backupInput.add(newEmailAddressValidator());+ backupForm.add(backupInput);++ var backupSubmit = new AjaxButton("submit") {@Override- protected void onSubmit() {- super.onSubmit();-- if (getEmailAddressService().findByValue(emailAddressValue) != null) {- error(_T("This email address is being used"));+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ var emailAddress = newEmailAddress(backupForm, backupInput.getModelObject());+ if (emailAddress != null) {+ emailAddressService.create(emailAddress);+ auditIfNecessary("added backup email address \"" + emailAddress.getValue() + "\"");+ setResponsePage(getPage().getClass(), getPage().getPageParameters());} else {- EmailAddress address = new EmailAddress();- address.setValue(emailAddressValue);- address.setOwner(getUser());- if (SecurityUtils.isAdministrator())- address.setVerificationCode(null);- getEmailAddressService().create(address);- if (getPage() instanceof UserPage)- getAuditService().audit(null, "added email address \"" + address.getValue() + "\" in account \"" + getUser().getName() + "\"", null, null);- emailAddressValue = null;+ target.add(backupForm);}}-- };- TextField<String> input = new TextField<String>("emailAddress", new IModel<>() {@Override- public void detach() {+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(backupForm);}+ };+ backupForm.add(backupSubmit);+ backupForm.add(new FencedFeedbackPanel("feedback", backupForm));+ backupEmailAddressesSection.add(backupForm);++ Form<Void> privacyForm = new Form<>("privacyForm");+ var keepEmailAddressesPrivateCheck = new CheckBox("check", Model.of(getUser().isKeepEmailAddressesPrivate()));++ var privacyToggleLabel = new WebMarkupContainer("label");+ privacyToggleLabel.setOutputMarkupId(true);+ privacyToggleLabel.add(keepEmailAddressesPrivateCheck);+ privacyForm.add(privacyToggleLabel);+ keepEmailAddressesPrivateCheck.add(new AjaxFormSubmitBehavior(privacyForm, "change") {@Override- public String getObject() {- return emailAddressValue;+ protected void onSubmit(AjaxRequestTarget target) {+ super.onSubmit(target);+ getUser().setKeepEmailAddressesPrivate(keepEmailAddressesPrivateCheck.getModelObject());+ userService.update(getUser(), null);+ Session.get().success(_T("Email addresses privacy updated"));+ auditIfNecessary(getUser().isKeepEmailAddressesPrivate() ? "made email addresses private" : "made email addresses public");+ setResponsePage(getPage().getClass(), getPage().getPageParameters());}+ });++ var privateNote = new WebMarkupContainer("privateNote") {+@Override- public void setObject(String object) {- emailAddressValue = object;+ protected void onConfigure() {+ setVisible(getUser().isKeepEmailAddressesPrivate());}- });- input.setLabel(Model.of(_T("Email address")));- input.setRequired(true);- input.add(validatable -> {- String emailAddress = validatable.getValue();- if (!new EmailValidator().isValid(emailAddress, null)) {- validatable.error(new IValidationError() {+ };+ privateNote.setOutputMarkupPlaceholderTag(true);+ privateNote.add(new Label("generatedEmailAddress",+ Model.of(getUser().getName() + "@" + User.getNoreplyEmailDomain())));+ privacyForm.add(privateNote);- @Override- public Serializable getErrorMessage(IErrorMessageSource messageSource) {- return _T("Malformed email address");- }+ add(privacyForm);+ }- });+ private IValidator<String> newEmailAddressValidator() {+ return new IValidator<String>() {+ @Override+ public void validate(IValidatable<String> validatable) {+ if (!new EmailValidator().isValid(validatable.getValue(), null)) {+ validatable.error(new IValidationError() {+ @Override+ public Serializable getErrorMessage(IErrorMessageSource messageSource) {+ return _T("Malformed email address");+ }+ });+ }}- });- form.add(input);- add(new FencedFeedbackPanel("feedback", form));- add(form);+ };+ }++ @Nullable+ private EmailAddress newEmailAddress(Form<?> form, String emailAddressValue) {+ if (emailAddressService.findByValue(emailAddressValue) != null) {+ form.error(_T("This email address is being used"));+ return null;+ }+ var address = new EmailAddress();+ address.setValue(emailAddressValue);+ address.setOwner(getUser());+ if (SecurityUtils.isAdministrator())+ address.setVerificationCode(null);+ return address;}-- private EmailAddressService getEmailAddressService() {- return OneDev.getInstance(EmailAddressService.class);++ private void auditIfNecessary(String action) {+ if (getPage() instanceof UserPage) {+ auditService.audit(null,+ action + " in account \"" + getUser().getName() + "\"", null, null);+ }}private User getUser() {return getModelObject();}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new EmailAddressesCssResourceReference()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/email-addresses.css b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/email-addresses.cssnew file mode 100644index 0000000000..ed4bbc3260--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/email-addresses.css@@ -0,0 +1,8 @@+.email-addresses ul.feedbackPanel {+ margin-bottom: 0 !important;+}+.email-addresses ul.feedbackPanel li {+ background-color: transparent !important;+ border: none !important;+ padding: 0 !important;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.javaindex 5853969979..ac4f8558cf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profile/UserProfilePanel.java@@ -188,8 +188,8 @@ public abstract class UserProfilePanel extends GenericPanel<User> {add(new Label("name", "@" + user.getName()));add(new Label("fullName", user.getFullName()).setVisible(user.getFullName() != null));- var emailAddress = user.getPublicEmailAddress();- if (emailAddress != null) {+ var emailAddress = user.getPrimaryEmailAddress();+ if (emailAddress != null && emailAddress.isVerified() && !user.isKeepEmailAddressesPrivate()) {add(new WebMarkupContainer("emailAddress") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgsigningkey/GpgSigningKeyPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgsigningkey/GpgSigningKeyPage.javaindex fd3d44ba49..0b54fc6caa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/gpgsigningkey/GpgSigningKeyPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/gpgsigningkey/GpgSigningKeyPage.java@@ -96,7 +96,7 @@ public class GpgSigningKeyPage extends AdministrationPage {ByteArrayOutputStream baos;try {PGPKeyRingGenerator generator = GpgUtils.generateKeyRingGenerator(- User.SYSTEM_NAME + "<" + User.getSystemEmailAddress() + ">");+ User.SYSTEM_NAME + "<" + User.getSystemNoreplyEmailAddress() + ">");PGPSecretKeyRing secretKeyRing = generator.generateSecretKeyRing();baos = new ByteArrayOutputStream();diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.javaindex d36d0ebe99..f749bb0a96 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java@@ -310,7 +310,6 @@ public class SsoProcessPage extends SimplePage {emailAddress.setValue(bean.getEmailAddress());}emailAddress.setPrimary(true);- emailAddress.setGit(true);emailAddress.setOwner(user);var ssoAccount = new SsoAccount();diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.javaindex c35c04a4fd..e2d40900d5 100644--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java@@ -791,8 +791,6 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>var provisioner = getProvisioner(workspace, spec, workspaceLogger);var gitEmail = workspace.getUser().getGitEmailAddress();- if (gitEmail == null)- throw new ExplicitException("No email address for git operations configured");String cloneUrl;if (workspace.getRequest() != null && workspace.getBranch() != null) {diff --git a/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java b/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.javaindex 3d682a7174..c4a06346c5 100644--- a/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java+++ b/server-core/src/test/java/io/onedev/server/search/commit/CommitQueryTest.java@@ -95,7 +95,6 @@ public class CommitQueryTest extends AbstractGitTest {User user = new User();EmailAddress emailAddress = new EmailAddress();- emailAddress.setGit(true);emailAddress.setPrimary(true);emailAddress.setOwner(user);emailAddress.setVerificationCode(null);diff --git a/server-ee b/server-eeindex 3e65c3e1ec..03e3e3496e 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 3e65c3e1ec6f808ed1137f30c6b034e571fdca80+Subproject commit 03e3e3496e627e8150a3ae5fc0efdf2c2c174c17