Skip to content

The Unified and Autonomous Development Platform

fix: Email addresses not refreshed after deleting

Robin Shen5b3e4d9481b6
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.java
index 7a2a91296e..e6c81e4156 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
@@ -64,24 +64,24 @@ public class EmailAddressesPanel extends GenericPanel<User> {
@Override
protected void populateItem(ListItem<EmailAddress> item) {
- EmailAddress address = item.getModelObject();
- item.add(new Label("value", address.getValue()));
+ EmailAddress emailAddress = item.getModelObject();
+ item.add(new Label("value", emailAddress.getValue()));
item.add(new WebMarkupContainer("primary")
- .setVisible(address.equals(getUser().getPrimaryEmailAddress())));
+ .setVisible(emailAddress.equals(getUser().getPrimaryEmailAddress())));
item.add(new WebMarkupContainer("git")
- .setVisible(address.equals(getUser().getGitEmailAddress())));
+ .setVisible(emailAddress.equals(getUser().getGitEmailAddress())));
- item.add(new EmailAddressVerificationStatusBadge("verificationStatus", item.getModel()));
+ item.add(new EmailAddressVerificationStatusBadge("verificationStatus", item.getModel()));
+ Long emailAddressId = emailAddress.getId();
item.add(new MenuLink("operations") {
@Override
protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> menuItems = new ArrayList<>();
- EmailAddress address = item.getModelObject();
- Long addressId = address.getId();
- if (!address.equals(getUser().getPrimaryEmailAddress())) {
+ var emailAddress = getEmailAddressManager().load(emailAddressId);
+ if (!emailAddress.equals(getUser().getPrimaryEmailAddress())) {
menuItems.add(new MenuItem() {
@Override
@@ -95,7 +95,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {
@Override
public void onClick() {
- getEmailAddressManager().setAsPrimary(getEmailAddressManager().load(addressId));
+ getEmailAddressManager().setAsPrimary(getEmailAddressManager().load(emailAddressId));
}
};
@@ -103,7 +103,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {
});
}
- if (!address.equals(getUser().getGitEmailAddress())) {
+ if (!emailAddress.equals(getUser().getGitEmailAddress())) {
menuItems.add(new MenuItem() {
@Override
@@ -117,7 +117,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {
@Override
public void onClick() {
- getEmailAddressManager().useForGitOperations(getEmailAddressManager().load(addressId));
+ getEmailAddressManager().useForGitOperations(getEmailAddressManager().load(emailAddressId));
}
};
@@ -125,7 +125,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {
});
}
- if (!address.isVerified()) {
+ if (!emailAddress.isVerified()) {
menuItems.add(new MenuItem() {
@Override
@@ -163,14 +163,15 @@ public class EmailAddressesPanel extends GenericPanel<User> {
@Override
public WebMarkupContainer newLink(String id) {
+ var hasMultipleEmailAddresses = getUser().getEmailAddresses().size() > 1;
var link = new Link<Void>(id) {
@Override
public void onClick() {
- if (getUser().getEmailAddresses().size() > 1)
- getEmailAddressManager().delete(getEmailAddressManager().load(addressId));
+ if (hasMultipleEmailAddresses)
+ getEmailAddressManager().delete(getEmailAddressManager().load(emailAddressId));
else
- Session.get().warn("Can not delete as at least one email address should be provided");
+ Session.get().warn("At least one email address should be configured, please add a new one first");
}
};
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.java
index 8bb5c0ba9d..d9de9201a6 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
@@ -1,38 +1,35 @@
package io.onedev.server.web.page.simple.security;
import com.google.common.collect.Sets;
-import io.onedev.commons.utils.match.StringMatcher;
-import io.onedev.commons.utils.match.WildcardUtils;
-import io.onedev.server.model.support.administration.SecuritySetting;
-import io.onedev.server.util.patternset.PatternSet;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authc.credential.PasswordService;
-import org.apache.shiro.authz.UnauthenticatedException;
-import org.apache.wicket.Session;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.SubmitLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import io.onedev.commons.loader.AppLoader;
+import io.onedev.commons.utils.match.StringMatcher;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.EmailAddressManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.administration.SecuritySetting;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
+import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.page.HomePage;
import io.onedev.server.web.page.simple.SimplePage;
-import io.onedev.server.web.util.editbean.NewUserBean;
-import org.eclipse.jgit.ignore.internal.WildCardMatcher;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authc.credential.PasswordService;
+import org.apache.shiro.authz.UnauthenticatedException;
+import org.apache.wicket.Session;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.SubmitLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import static io.onedev.server.model.User.*;
+import static io.onedev.server.web.page.simple.security.SignUpBean.PROP_EMAIL_ADDRESS;
@SuppressWarnings("serial")
public class SignUpPage extends SimplePage {
@@ -74,13 +71,13 @@ public class SignUpPage extends SimplePage {
var emailDomain = StringUtils.substringAfter(bean.getEmailAddress(), "@").toLowerCase();
var patternSet = PatternSet.parse(getSecuritySetting().getAllowedSelfRegisterEmailDomain().toLowerCase());
if (!patternSet.matches(new StringMatcher(), emailDomain)) {
- editor.error(new Path(new PathNode.Named(NewUserBean.PROP_EMAIL_ADDRESS)),
+ editor.error(new Path(new PathNode.Named(PROP_EMAIL_ADDRESS)),
"This email domain is not accepted for self sign-up");
invalidEmailAddress = true;
}
}
if (!invalidEmailAddress && getEmailAddressManager().findByValue(bean.getEmailAddress()) != null) {
- editor.error(new Path(new PathNode.Named(NewUserBean.PROP_EMAIL_ADDRESS)),
+ editor.error(new Path(new PathNode.Named(PROP_EMAIL_ADDRESS)),
"Email address already used by another user");
}
if (editor.isValid()) {