The Unified and Autonomous Development Platform
Refactor usermanager, groupmanager and rolemanager
Robin Shen11faa8fd3630
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java b/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.javaindex 852d52cac5..59eb52a69f 100644--- a/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java+++ b/server-core/src/main/java/io/onedev/server/commandhandler/ResetAdminPassword.java@@ -79,7 +79,7 @@ public class ResetAdminPassword extends AbstractPlugin {root.setSsoConnector(null);root.setTwoFactorAuthentication(null);root.setPassword(passwordService.encryptPassword(password));- userManager.save(root);+ userManager.update(root, null);// wait for a short period to have embedded db flushing datatry {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.javaindex 8ae005b16a..f2381ebe71 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GroupManager.java@@ -8,6 +8,9 @@ import io.onedev.server.model.Group;import io.onedev.server.persistence.dao.EntityManager;public interface GroupManager extends EntityManager<Group> {++ void create(Group group);+/*** Save specified group*@@ -19,7 +22,7 @@ public interface GroupManager extends EntityManager<Group> {* integrity. Use <tt>null</tt> if original name does not exist,* or the name is not changed*/- void save(Group group, @Nullable String oldName);+ void update(Group group, @Nullable String oldName);@NullableGroup find(String name);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.javaindex 4fae10b159..176f443761 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java@@ -15,7 +15,9 @@ public interface RoleManager extends EntityManager<Role> {void replicate(Role role);- void save(Role role, Collection<LinkSpec> authorizedLinks, @Nullable String oldName);+ void create(Role role, Collection<LinkSpec> authorizedLinks);++ void update(Role role, Collection<LinkSpec> authorizedLinks, @Nullable String oldName);@NullableRole find(String name);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.javaindex 965a2d9cc3..6fab995121 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java@@ -15,8 +15,10 @@ import io.onedev.server.util.facade.UserFacade;public interface UserManager extends EntityManager<User> {+ void create(User user);+/**- * Save specified user+ * Update specified user** @param user* user to save@@ -26,7 +28,7 @@ public interface UserManager extends EntityManager<User> {* integrity. Use <tt>null</tt> if original name does not exist,* or the name is not changed*/- void save(User user, @Nullable String oldName);+ void update(User user, @Nullable String oldName);void replicate(User user);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.javaindex 784596cba4..ba42b1ca21 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java@@ -101,10 +101,16 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements Gro});}}-++ @Transactional+ @Override+ public void create(Group group) {+ dao.persist(group);+ }+@Transactional@Override- public void save(Group group, String oldName) {+ public void update(Group group, String oldName) {if (oldName != null && !oldName.equals(group.getName())) {for (Project project: projectManager.query()) {try {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.javaindex 02023b543e..dc22228feb 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java@@ -120,7 +120,14 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM@Transactional@Override- public void save(Role role, Collection<LinkSpec> authorizedLinks, String oldName) {+ public void create(Role role, Collection<LinkSpec> authorizedLinks) {+ dao.persist(role);+ linkAuthorizationManager.syncAuthorizations(role, authorizedLinks);+ }++ @Transactional+ @Override+ public void update(Role role, Collection<LinkSpec> authorizedLinks, String oldName) {if (oldName != null && !oldName.equals(role.getName()))settingManager.onRenameRole(oldName, role.getName());dao.persist(role);@@ -181,7 +188,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMjobPrivilege.setRunJob(true);codeWriter.getJobPrivileges().add(jobPrivilege);- save(codeWriter, new ArrayList<>(), null);+ update(codeWriter, new ArrayList<>(), null);Role codeReader = new Role();codeReader.setName("Code Reader");@@ -197,7 +204,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMjobPrivilege.setJobNames("*");codeReader.getJobPrivileges().add(jobPrivilege);- save(codeReader, new ArrayList<>(), null);+ update(codeReader, new ArrayList<>(), null);Role issueReporter = new Role();issueReporter.setName("Issue Reporter");@@ -213,7 +220,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleMjobPrivilege.setJobNames("*");issueReporter.getJobPrivileges().add(jobPrivilege);- save(issueReporter, new ArrayList<>(), null);+ update(issueReporter, new ArrayList<>(), null);}@Sessionaldiff --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 da01596878..9959ba096b 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@@ -94,7 +94,7 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM@Transactional@Override- public void save(User user, String oldName) {+ public void update(User user, String oldName) {user.setName(user.getName().toLowerCase());dao.persist(user);@@ -119,9 +119,11 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM}}+ @Transactional@Override- public void save(User user) {- save(user, null);+ public void create(User user) {+ user.setName(user.getName().toLowerCase());+ dao.persist(user);}@Sessionaldiff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.javaindex 4b90498768..b13679f966 100644--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java@@ -782,7 +782,7 @@ public class DefaultMailManager implements MailManager, Serializable {user.setName(UserNameValidator.suggestUserName(ParsedEmailAddress.parse(address.getAddress()).getName()));user.setFullName(address.getPersonal());user.setPassword("impossible password");- userManager.save(user);+ userManager.create(user);EmailAddress emailAddress = new EmailAddress();emailAddress.setValue(address.getAddress());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 290dfa683b..f0e97e1af1 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@@ -263,7 +263,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Overridepublic void onUpdated() {- OneDev.getInstance(UserManager.class).save(User.this);+ OneDev.getInstance(UserManager.class).update(User.this, null);}};@@ -311,7 +311,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Overridepublic void onUpdated() {- OneDev.getInstance(UserManager.class).save(User.this);+ OneDev.getInstance(UserManager.class).update(User.this, null);}};@@ -359,7 +359,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Overridepublic void onUpdated() {- OneDev.getInstance(UserManager.class).save(User.this);+ OneDev.getInstance(UserManager.class).update(User.this, null);}};@@ -407,7 +407,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Overridepublic void onUpdated() {- OneDev.getInstance(UserManager.class).save(User.this);+ OneDev.getInstance(UserManager.class).update(User.this, null);}};diff --git a/server-core/src/main/java/io/onedev/server/rest/GroupResource.java b/server-core/src/main/java/io/onedev/server/rest/GroupResource.javaindex 3bd7555e2b..87f369f340 100644--- a/server-core/src/main/java/io/onedev/server/rest/GroupResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/GroupResource.java@@ -97,9 +97,11 @@ public class GroupResource {if (!SecurityUtils.isAdministrator())throw new UnauthorizedException();if (group.getOldVersion() != null)- groupManager.save(group, ((GroupFacade) group.getOldVersion()).getName());- else- groupManager.save(group, null);+ groupManager.update(group, ((GroupFacade) group.getOldVersion()).getName());+ else if (group.isNew())+ groupManager.create(group);+ else+ groupManager.update(group, null);return group.getId();}diff --git a/server-core/src/main/java/io/onedev/server/rest/RoleResource.java b/server-core/src/main/java/io/onedev/server/rest/RoleResource.javaindex ebdd6d2c37..c98620c516 100644--- a/server-core/src/main/java/io/onedev/server/rest/RoleResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/RoleResource.java@@ -1,6 +1,7 @@package io.onedev.server.rest;import java.util.ArrayList;+import java.util.Collection;import java.util.List;import javax.inject.Inject;@@ -17,6 +18,8 @@ import javax.ws.rs.QueryParam;import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;+import io.onedev.server.entitymanager.LinkSpecManager;+import io.onedev.server.model.LinkSpec;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Restrictions;@@ -39,9 +42,12 @@ public class RoleResource {private final RoleManager roleManager;+ private final LinkSpecManager linkSpecManager;+@Inject- public RoleResource(RoleManager roleManager) {+ public RoleResource(RoleManager roleManager, LinkSpecManager linkSpecManager) {this.roleManager = roleManager;+ this.linkSpecManager = linkSpecManager;}@Api(order=100)@@ -76,10 +82,17 @@ public class RoleResource {public Long createOrUpdate(@NotNull Role role) {if (!SecurityUtils.isAdministrator())throw new UnauthorizedException();++ Collection<LinkSpec> authorizedLinks = new ArrayList<>();+ for (String linkName: role.getEditableIssueLinks())+ authorizedLinks.add(linkSpecManager.find(linkName));+if (role.getOldVersion() != null)- roleManager.save(role, new ArrayList<>(), ((RoleFacade) role.getOldVersion()).getName());+ roleManager.update(role, authorizedLinks, ((RoleFacade) role.getOldVersion()).getName());+ else if (role.isNew())+ roleManager.create(role, authorizedLinks);else- roleManager.save(role, new ArrayList<>(), null);+ roleManager.update(role, authorizedLinks, null);return role.getId();}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 6545c1e134..e4ea456f6e 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@@ -298,7 +298,7 @@ public class UserResource {user.setName(data.getName());user.setFullName(data.getFullName());user.setPassword(passwordService.encryptPassword(data.getPassword()));- userManager.save(user);+ userManager.create(user);EmailAddress emailAddress = new EmailAddress();emailAddress.setGit(true);@@ -327,7 +327,7 @@ public class UserResource {String oldName = user.getName();user.setName(data.getName());user.setFullName(data.getFullName());- userManager.save(user, oldName);+ userManager.update(user, oldName);return user.getId();} else {throw new UnauthenticatedException();@@ -351,7 +351,7 @@ public class UserResource {}} else {user.setPassword(passwordService.encryptPassword(password));- userManager.save(user);+ userManager.update(user, null);return Response.ok().build();}}@@ -371,7 +371,7 @@ public class UserResource {user.setIssueQueryWatches(queriesAndWatches.issueQueryWatches);user.setProjectQueries(queriesAndWatches.projectQueries);user.setPullRequestQueries(queriesAndWatches.pullRequestQueries);- userManager.save(user);+ userManager.update(user, null);return Response.ok().build();}diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.javaindex 0a6327bf85..3099ddc27f 100644--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthorizingRealm.java@@ -1,194 +1,194 @@-package io.onedev.server.security.realm;--import java.util.Collection;-import java.util.concurrent.Callable;--import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;--import org.apache.shiro.authc.AuthenticationException;-import org.apache.shiro.authc.AuthenticationInfo;-import org.apache.shiro.authc.AuthenticationToken;-import org.apache.shiro.authc.UnknownAccountException;-import org.apache.shiro.authc.UsernamePasswordToken;-import org.apache.shiro.authc.credential.PasswordMatcher;-import org.apache.shiro.authc.credential.PasswordService;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.google.common.collect.Sets;--import io.onedev.commons.utils.ExceptionUtils;-import io.onedev.server.entitymanager.EmailAddressManager;-import io.onedev.server.entitymanager.GroupManager;-import io.onedev.server.entitymanager.MembershipManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.SshKeyManager;-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.authenticator.Authenticated;-import io.onedev.server.model.support.administration.authenticator.Authenticator;-import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.TransactionManager;--@Singleton-public class PasswordAuthorizingRealm extends AbstractAuthorizingRealm {-- private static final Logger logger = LoggerFactory.getLogger(PasswordAuthorizingRealm.class);-- private final TransactionManager transactionManager;-- private final MembershipManager membershipManager;-- private final SshKeyManager sshKeyManager;-- private final EmailAddressManager emailAddressManager;-- @Inject- public PasswordAuthorizingRealm(UserManager userManager, SettingManager settingManager,- MembershipManager membershipManager, GroupManager groupManager,- ProjectManager projectManager, SessionManager sessionManager,- TransactionManager transactionManager, SshKeyManager sshKeyManager,- PasswordService passwordService, EmailAddressManager emailAddressManager) {- super(userManager, groupManager, projectManager, sessionManager, settingManager);-- PasswordMatcher passwordMatcher = new PasswordMatcher();- passwordMatcher.setPasswordService(passwordService);- setCredentialsMatcher(passwordMatcher);-- this.transactionManager = transactionManager;- this.membershipManager = membershipManager;- this.sshKeyManager = sshKeyManager;- this.emailAddressManager = emailAddressManager;- }-- @Override- public boolean supports(AuthenticationToken token) {- return token instanceof UsernamePasswordToken;- }-- private User newUser(String userName, Authenticated authenticated, @Nullable String defaultGroup) {- User user = new User();- user.setName(userName);- user.setPassword(User.EXTERNAL_MANAGED);- if (authenticated.getFullName() != null)- user.setFullName(authenticated.getFullName());- userManager.save(user);-- EmailAddress emailAddress = new EmailAddress();- emailAddress.setValue(authenticated.getEmail());- emailAddress.setVerificationCode(null);- emailAddress.setOwner(user);- emailAddress.setPrimary(true);- emailAddress.setGit(true);- emailAddressManager.save(emailAddress);-- user.getEmailAddresses().add(emailAddress);-- Collection<String> groupNames = authenticated.getGroupNames();- if (groupNames == null && defaultGroup != null)- groupNames = Sets.newHashSet(defaultGroup);- if (groupNames != null)- membershipManager.syncMemberships(user, groupNames);-- if (authenticated.getSshKeys() != null)- sshKeyManager.syncSshKeys(user, authenticated.getSshKeys());- return user;- }-- private void updateUser(User user, Authenticated authenticated, @Nullable EmailAddress emailAddress) {- if (emailAddress != null) {- emailAddress.setVerificationCode(null);- emailAddressManager.setAsPrimary(emailAddress);- } else {- emailAddress = new EmailAddress();- emailAddress.setValue(authenticated.getEmail());- emailAddress.setVerificationCode(null);- emailAddress.setOwner(user);- emailAddress.setPrimary(true);- emailAddress.setGit(true);- emailAddressManager.save(emailAddress);- }- user.setSsoConnector(null);- if (authenticated.getFullName() != null)- user.setFullName(authenticated.getFullName());- userManager.save(user);-- if (authenticated.getGroupNames() != null)- membershipManager.syncMemberships(user, authenticated.getGroupNames());- if (authenticated.getSshKeys() != null)- sshKeyManager.syncSshKeys(user, authenticated.getSshKeys());- }-- @Override- protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)- throws AuthenticationException {- return transactionManager.call(new Callable<AuthenticationInfo>() {-- @Override- public AuthenticationInfo call() {- try {- String userNameOrEmailAddressValue = (String) token.getPrincipal();- User user;- EmailAddress emailAddress = emailAddressManager.findByValue(userNameOrEmailAddressValue);- if (emailAddress != null)- user = emailAddress.getOwner();- else- user = userManager.findByName(userNameOrEmailAddressValue);- if (user != null) {- if (user.isExternalManaged()) {- Authenticator authenticator = settingManager.getAuthenticator();- if (authenticator != null) {- UsernamePasswordToken authToken = (UsernamePasswordToken) token;- authToken = new UsernamePasswordToken(user.getName(), authToken.getPassword(),- authToken.isRememberMe(), authToken.getHost());- Authenticated authenticated = authenticator.authenticate(authToken);- String emailAddressValue = authenticated.getEmail();- emailAddress = emailAddressManager.findByValue(emailAddressValue);- if (emailAddress != null && !emailAddress.getOwner().equals(user)) {- throw new AuthenticationException("Email address '" + emailAddressValue- + "' has already been used by another user");- } else {- updateUser(user, authenticated, emailAddress);- return user;- }- } else {- throw new AuthenticationException("No external authenticator to authenticate user '"- + userNameOrEmailAddressValue + "'");- }- } else {- return user;- }- } else if (emailAddress == null) {- Authenticator authenticator = settingManager.getAuthenticator();- if (authenticator != null) {- Authenticated authenticated = authenticator.authenticate((UsernamePasswordToken) token);- String emailAddressValue = authenticated.getEmail();- if (emailAddressManager.findByValue(emailAddressValue) != null) {- throw new AuthenticationException("Email address '" + emailAddressValue- + "' has already been used by another user");- } else {- return newUser(userNameOrEmailAddressValue, authenticated, authenticator.getDefaultGroup());- }- } else {- throw new UnknownAccountException("Invalid credentials");- }- } else {- throw new UnknownAccountException("Invalid credentials");- }- } catch (Exception e) {- if (e instanceof AuthenticationException) {- logger.debug("Authentication not passed", e);- throw ExceptionUtils.unchecked(e);- } else {- logger.error("Error authenticating user", e);- throw new AuthenticationException("Error authenticating user", e);- }- }- }- });- }-}+package io.onedev.server.security.realm;++import java.util.Collection;+import java.util.concurrent.Callable;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;++import org.apache.shiro.authc.AuthenticationException;+import org.apache.shiro.authc.AuthenticationInfo;+import org.apache.shiro.authc.AuthenticationToken;+import org.apache.shiro.authc.UnknownAccountException;+import org.apache.shiro.authc.UsernamePasswordToken;+import org.apache.shiro.authc.credential.PasswordMatcher;+import org.apache.shiro.authc.credential.PasswordService;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.collect.Sets;++import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.server.entitymanager.EmailAddressManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.MembershipManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.SshKeyManager;+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.authenticator.Authenticated;+import io.onedev.server.model.support.administration.authenticator.Authenticator;+import io.onedev.server.persistence.SessionManager;+import io.onedev.server.persistence.TransactionManager;++@Singleton+public class PasswordAuthorizingRealm extends AbstractAuthorizingRealm {++ private static final Logger logger = LoggerFactory.getLogger(PasswordAuthorizingRealm.class);++ private final TransactionManager transactionManager;++ private final MembershipManager membershipManager;++ private final SshKeyManager sshKeyManager;++ private final EmailAddressManager emailAddressManager;++ @Inject+ public PasswordAuthorizingRealm(UserManager userManager, SettingManager settingManager,+ MembershipManager membershipManager, GroupManager groupManager,+ ProjectManager projectManager, SessionManager sessionManager,+ TransactionManager transactionManager, SshKeyManager sshKeyManager,+ PasswordService passwordService, EmailAddressManager emailAddressManager) {+ super(userManager, groupManager, projectManager, sessionManager, settingManager);++ PasswordMatcher passwordMatcher = new PasswordMatcher();+ passwordMatcher.setPasswordService(passwordService);+ setCredentialsMatcher(passwordMatcher);++ this.transactionManager = transactionManager;+ this.membershipManager = membershipManager;+ this.sshKeyManager = sshKeyManager;+ this.emailAddressManager = emailAddressManager;+ }++ @Override+ public boolean supports(AuthenticationToken token) {+ return token instanceof UsernamePasswordToken;+ }++ private User newUser(String userName, Authenticated authenticated, @Nullable String defaultGroup) {+ User user = new User();+ user.setName(userName);+ user.setPassword(User.EXTERNAL_MANAGED);+ if (authenticated.getFullName() != null)+ user.setFullName(authenticated.getFullName());+ userManager.create(user);++ EmailAddress emailAddress = new EmailAddress();+ emailAddress.setValue(authenticated.getEmail());+ emailAddress.setVerificationCode(null);+ emailAddress.setOwner(user);+ emailAddress.setPrimary(true);+ emailAddress.setGit(true);+ emailAddressManager.save(emailAddress);++ user.getEmailAddresses().add(emailAddress);++ Collection<String> groupNames = authenticated.getGroupNames();+ if (groupNames == null && defaultGroup != null)+ groupNames = Sets.newHashSet(defaultGroup);+ if (groupNames != null)+ membershipManager.syncMemberships(user, groupNames);++ if (authenticated.getSshKeys() != null)+ sshKeyManager.syncSshKeys(user, authenticated.getSshKeys());+ return user;+ }++ private void updateUser(User user, Authenticated authenticated, @Nullable EmailAddress emailAddress) {+ if (emailAddress != null) {+ emailAddress.setVerificationCode(null);+ emailAddressManager.setAsPrimary(emailAddress);+ } else {+ emailAddress = new EmailAddress();+ emailAddress.setValue(authenticated.getEmail());+ emailAddress.setVerificationCode(null);+ emailAddress.setOwner(user);+ emailAddress.setPrimary(true);+ emailAddress.setGit(true);+ emailAddressManager.save(emailAddress);+ }+ user.setSsoConnector(null);+ if (authenticated.getFullName() != null)+ user.setFullName(authenticated.getFullName());+ userManager.update(user, null);++ if (authenticated.getGroupNames() != null)+ membershipManager.syncMemberships(user, authenticated.getGroupNames());+ if (authenticated.getSshKeys() != null)+ sshKeyManager.syncSshKeys(user, authenticated.getSshKeys());+ }++ @Override+ protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)+ throws AuthenticationException {+ return transactionManager.call(new Callable<AuthenticationInfo>() {++ @Override+ public AuthenticationInfo call() {+ try {+ String userNameOrEmailAddressValue = (String) token.getPrincipal();+ User user;+ EmailAddress emailAddress = emailAddressManager.findByValue(userNameOrEmailAddressValue);+ if (emailAddress != null)+ user = emailAddress.getOwner();+ else+ user = userManager.findByName(userNameOrEmailAddressValue);+ if (user != null) {+ if (user.isExternalManaged()) {+ Authenticator authenticator = settingManager.getAuthenticator();+ if (authenticator != null) {+ UsernamePasswordToken authToken = (UsernamePasswordToken) token;+ authToken = new UsernamePasswordToken(user.getName(), authToken.getPassword(),+ authToken.isRememberMe(), authToken.getHost());+ Authenticated authenticated = authenticator.authenticate(authToken);+ String emailAddressValue = authenticated.getEmail();+ emailAddress = emailAddressManager.findByValue(emailAddressValue);+ if (emailAddress != null && !emailAddress.getOwner().equals(user)) {+ throw new AuthenticationException("Email address '" + emailAddressValue+ + "' has already been used by another user");+ } else {+ updateUser(user, authenticated, emailAddress);+ return user;+ }+ } else {+ throw new AuthenticationException("No external authenticator to authenticate user '"+ + userNameOrEmailAddressValue + "'");+ }+ } else {+ return user;+ }+ } else if (emailAddress == null) {+ Authenticator authenticator = settingManager.getAuthenticator();+ if (authenticator != null) {+ Authenticated authenticated = authenticator.authenticate((UsernamePasswordToken) token);+ String emailAddressValue = authenticated.getEmail();+ if (emailAddressManager.findByValue(emailAddressValue) != null) {+ throw new AuthenticationException("Email address '" + emailAddressValue+ + "' has already been used by another user");+ } else {+ return newUser(userNameOrEmailAddressValue, authenticated, authenticator.getDefaultGroup());+ }+ } else {+ throw new UnknownAccountException("Invalid credentials");+ }+ } else {+ throw new UnknownAccountException("Invalid credentials");+ }+ } catch (Exception e) {+ if (e instanceof AuthenticationException) {+ logger.debug("Authentication not passed", e);+ throw ExceptionUtils.unchecked(e);+ } else {+ logger.error("Error authenticating user", e);+ throw new AuthenticationException("Error authenticating user", e);+ }+ }+ }+ });+ }+}diff --git a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.javaindex 0ae5556191..ed07af0d81 100644--- a/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/realm/SsoAuthorizingRealm.java@@ -1,136 +1,136 @@-package io.onedev.server.security.realm;--import java.util.Collection;-import java.util.concurrent.Callable;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.apache.shiro.authc.AuthenticationException;-import org.apache.shiro.authc.AuthenticationInfo;-import org.apache.shiro.authc.AuthenticationToken;-import org.apache.shiro.authc.credential.AllowAllCredentialsMatcher;--import com.google.common.collect.Sets;--import io.onedev.server.entitymanager.EmailAddressManager;-import io.onedev.server.entitymanager.GroupManager;-import io.onedev.server.entitymanager.MembershipManager;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.SshKeyManager;-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.sso.SsoAuthenticated;-import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.TransactionManager;--@Singleton-public class SsoAuthorizingRealm extends AbstractAuthorizingRealm {-- private final MembershipManager membershipManager;-- private final TransactionManager transactionManager;-- private final SshKeyManager sshKeyManager;-- private final EmailAddressManager emailAddressManager;-- @Inject- public SsoAuthorizingRealm(UserManager userManager, MembershipManager membershipManager,- GroupManager groupManager, ProjectManager projectManager, SessionManager sessionManager,- TransactionManager transactionManager, SshKeyManager sshKeyManager,- SettingManager settingManager, EmailAddressManager emailAddressManager) {- super(userManager, groupManager, projectManager, sessionManager, settingManager);- setCredentialsMatcher(new AllowAllCredentialsMatcher());-- this.membershipManager = membershipManager;- this.transactionManager = transactionManager;- this.sshKeyManager = sshKeyManager;- this.emailAddressManager = emailAddressManager;- }-- private User newUser(SsoAuthenticated authenticated) {- User user = new User();- user.setName(authenticated.getUserName());- user.setSsoConnector(authenticated.getConnector().getName());- user.setPassword(User.EXTERNAL_MANAGED);- if (authenticated.getFullName() != null)- user.setFullName(authenticated.getFullName());- userManager.save(user);-- EmailAddress emailAddress = new EmailAddress();- emailAddress.setOwner(user);- emailAddress.setVerificationCode(null);- emailAddress.setValue(authenticated.getEmail());- emailAddress.setPrimary(true);- emailAddress.setGit(true);- emailAddressManager.save(emailAddress);-- user.getEmailAddresses().add(emailAddress);-- Collection<String> groupNames = authenticated.getGroupNames();- if (groupNames == null && authenticated.getConnector().getDefaultGroup() != null)- groupNames = Sets.newHashSet(authenticated.getConnector().getDefaultGroup());- if (groupNames != null)- membershipManager.syncMemberships(user, groupNames);-- if (authenticated.getSshKeys() != null)- sshKeyManager.syncSshKeys(user, authenticated.getSshKeys());- return user;- }-- private void updateUser(EmailAddress emailAddress, SsoAuthenticated authenticated) {- User user = emailAddress.getOwner();- user.setName(authenticated.getUserName());- user.setSsoConnector(authenticated.getConnector().getName());- user.setPassword(User.EXTERNAL_MANAGED);- if (authenticated.getFullName() != null)- user.setFullName(authenticated.getFullName());- userManager.save(user);-- emailAddress.setVerificationCode(null);- emailAddressManager.setAsPrimary(emailAddress);-- if (authenticated.getGroupNames() != null)- membershipManager.syncMemberships(user, authenticated.getGroupNames());-- if (authenticated.getSshKeys() != null)- sshKeyManager.syncSshKeys(user, authenticated.getSshKeys());- }-- @Override- public boolean supports(AuthenticationToken token) {- return token instanceof SsoAuthenticated;- }-- @Override- protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)- throws AuthenticationException {- return transactionManager.call(new Callable<AuthenticationInfo>() {-- @Override- public AuthenticationInfo call() {- EmailAddress emailAddress;- SsoAuthenticated authenticated = (SsoAuthenticated) token;- String userName = authenticated.getUserName();- String emailAddressValue = authenticated.getEmail();- emailAddress = emailAddressManager.findByValue(emailAddressValue);- if (emailAddress == null) {- if (userManager.findByName(userName) != null)- throw new AuthenticationException("Login name '" + userName + "' already used by another user");- else- return newUser(authenticated);- } else if (!userName.equalsIgnoreCase(emailAddress.getOwner().getName())- && userManager.findByName(userName) != null) {- throw new AuthenticationException("Login name '" + userName + "' already used by another user");- } else {- updateUser(emailAddress, authenticated);- return emailAddress.getOwner();- }- }-- });- }-}+package io.onedev.server.security.realm;++import java.util.Collection;+import java.util.concurrent.Callable;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.apache.shiro.authc.AuthenticationException;+import org.apache.shiro.authc.AuthenticationInfo;+import org.apache.shiro.authc.AuthenticationToken;+import org.apache.shiro.authc.credential.AllowAllCredentialsMatcher;++import com.google.common.collect.Sets;++import io.onedev.server.entitymanager.EmailAddressManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.MembershipManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.SshKeyManager;+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.sso.SsoAuthenticated;+import io.onedev.server.persistence.SessionManager;+import io.onedev.server.persistence.TransactionManager;++@Singleton+public class SsoAuthorizingRealm extends AbstractAuthorizingRealm {++ private final MembershipManager membershipManager;++ private final TransactionManager transactionManager;++ private final SshKeyManager sshKeyManager;++ private final EmailAddressManager emailAddressManager;++ @Inject+ public SsoAuthorizingRealm(UserManager userManager, MembershipManager membershipManager,+ GroupManager groupManager, ProjectManager projectManager, SessionManager sessionManager,+ TransactionManager transactionManager, SshKeyManager sshKeyManager,+ SettingManager settingManager, EmailAddressManager emailAddressManager) {+ super(userManager, groupManager, projectManager, sessionManager, settingManager);+ setCredentialsMatcher(new AllowAllCredentialsMatcher());++ this.membershipManager = membershipManager;+ this.transactionManager = transactionManager;+ this.sshKeyManager = sshKeyManager;+ this.emailAddressManager = emailAddressManager;+ }++ private User newUser(SsoAuthenticated authenticated) {+ User user = new User();+ user.setName(authenticated.getUserName());+ user.setSsoConnector(authenticated.getConnector().getName());+ user.setPassword(User.EXTERNAL_MANAGED);+ if (authenticated.getFullName() != null)+ user.setFullName(authenticated.getFullName());+ userManager.create(user);++ EmailAddress emailAddress = new EmailAddress();+ emailAddress.setOwner(user);+ emailAddress.setVerificationCode(null);+ emailAddress.setValue(authenticated.getEmail());+ emailAddress.setPrimary(true);+ emailAddress.setGit(true);+ emailAddressManager.save(emailAddress);++ user.getEmailAddresses().add(emailAddress);++ Collection<String> groupNames = authenticated.getGroupNames();+ if (groupNames == null && authenticated.getConnector().getDefaultGroup() != null)+ groupNames = Sets.newHashSet(authenticated.getConnector().getDefaultGroup());+ if (groupNames != null)+ membershipManager.syncMemberships(user, groupNames);++ if (authenticated.getSshKeys() != null)+ sshKeyManager.syncSshKeys(user, authenticated.getSshKeys());+ return user;+ }++ private void updateUser(EmailAddress emailAddress, SsoAuthenticated authenticated) {+ User user = emailAddress.getOwner();+ user.setName(authenticated.getUserName());+ user.setSsoConnector(authenticated.getConnector().getName());+ user.setPassword(User.EXTERNAL_MANAGED);+ if (authenticated.getFullName() != null)+ user.setFullName(authenticated.getFullName());+ userManager.update(user, null);++ emailAddress.setVerificationCode(null);+ emailAddressManager.setAsPrimary(emailAddress);++ if (authenticated.getGroupNames() != null)+ membershipManager.syncMemberships(user, authenticated.getGroupNames());++ if (authenticated.getSshKeys() != null)+ sshKeyManager.syncSshKeys(user, authenticated.getSshKeys());+ }++ @Override+ public boolean supports(AuthenticationToken token) {+ return token instanceof SsoAuthenticated;+ }++ @Override+ protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)+ throws AuthenticationException {+ return transactionManager.call(new Callable<AuthenticationInfo>() {++ @Override+ public AuthenticationInfo call() {+ EmailAddress emailAddress;+ SsoAuthenticated authenticated = (SsoAuthenticated) token;+ String userName = authenticated.getUserName();+ String emailAddressValue = authenticated.getEmail();+ emailAddress = emailAddressManager.findByValue(emailAddressValue);+ if (emailAddress == null) {+ if (userManager.findByName(userName) != null)+ throw new AuthenticationException("Login name '" + userName + "' already used by another user");+ else+ return newUser(authenticated);+ } else if (!userName.equalsIgnoreCase(emailAddress.getOwner().getName())+ && userManager.findByName(userName) != null) {+ throw new AuthenticationException("Login name '" + userName + "' already used by another user");+ } else {+ updateUser(emailAddress, authenticated);+ return emailAddress.getOwner();+ }+ }++ });+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.javaindex 5d053b4b88..7fc734cdca 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/accesstoken/AccessTokenPanel.java@@ -50,7 +50,7 @@ public abstract class AccessTokenPanel extends Panel {@Overridepublic void onClick() {getUser().setAccessToken(CryptoUtils.generateSecret());- OneDev.getInstance(UserManager.class).save(getUser());+ OneDev.getInstance(UserManager.class).update(getUser(), null);Session.get().success("Access token regenerated");setResponsePage(getPage());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.javaindex f8e3288bee..d62cfa9ea0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java@@ -45,7 +45,7 @@ public class PasswordEditPanel extends GenericPanel<User> {protected void onSubmit() {super.onSubmit();getUser().setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(bean.getNewPassword()));- OneDev.getInstance(UserManager.class).save(getUser(), null);+ OneDev.getInstance(UserManager.class).update(getUser(), null);Session.get().success("Password has been changed");bean.setOldPassword(null);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 e789179acc..ccd191a830 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@@ -74,7 +74,7 @@ public class ProfileEditPanel extends GenericPanel<User> {}if (editor.isValid()) {- userManager.save(user, oldName);+ userManager.update(user, oldName);Session.get().success("Profile updated");setResponsePage(getPage().getClass(), getPage().getPageParameters());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationSetupPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationSetupPanel.javaindex 150abff027..4aab6bc67e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationSetupPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/twofactorauthentication/TwoFactorAuthenticationSetupPanel.java@@ -114,7 +114,7 @@ public abstract class TwoFactorAuthenticationSetupPanel extends GenericPanel<Usetarget.add(form);} else {getUser().setTwoFactorAuthentication(authentication);- OneDev.getInstance(UserManager.class).save(getUser());+ OneDev.getInstance(UserManager.class).update(getUser(), null);Fragment fragment = new Fragment("content", "verifiedFrag", TwoFactorAuthenticationSetupPanel.this);RepeatingView recoveryCodesView = new RepeatingView("recoveryCodes");diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.javaindex 797f29ecd7..058d77e6de 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/create/NewGroupPage.java@@ -50,7 +50,7 @@ public class NewGroupPage extends AdministrationPage {"This name has already been used by another group");}if (editor.isValid()) {- groupManager.save(group, null);+ groupManager.create(group);Session.get().success("Group created");setResponsePage(GroupMembershipsPage.class, GroupMembershipsPage.paramsOf(group));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/profile/GroupProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/profile/GroupProfilePage.javaindex d40f06e34c..588d8be0be 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/profile/GroupProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groupmanagement/profile/GroupProfilePage.java@@ -71,7 +71,7 @@ public class GroupProfilePage extends GroupPage {"This name has already been used by another group.");}if (editor.isValid()) {- groupManager.save(group, oldName);+ groupManager.update(group, oldName);setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(group));Session.get().success("Profile updated");}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.javaindex 960a8dd84c..6e8fdb9702 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/NewRolePage.java@@ -53,7 +53,7 @@ public class NewRolePage extends AdministrationPage {Collection<LinkSpec> authorizedLinks = new ArrayList<>();for (String linkName: role.getEditableIssueLinks())authorizedLinks.add(OneDev.getInstance(LinkSpecManager.class).find(linkName));- roleManager.save(role, authorizedLinks, null);+ roleManager.create(role, authorizedLinks);Session.get().success("Role created");setResponsePage(RoleListPage.class);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.javaindex 60105ca7b9..b624d450fc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/rolemanagement/RoleDetailPage.java@@ -113,7 +113,7 @@ public class RoleDetailPage extends AdministrationPage {Collection<LinkSpec> authorizedLinks = new ArrayList<>();for (String linkName: role.getEditableIssueLinks())authorizedLinks.add(OneDev.getInstance(LinkSpecManager.class).find(linkName));- roleManager.save(role, authorizedLinks, oldName);+ roleManager.update(role, authorizedLinks, oldName);setResponsePage(RoleDetailPage.class, RoleDetailPage.paramsOf(role));Session.get().success("Role updated");}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.javaindex 42db158bbb..496fe71026 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java@@ -74,7 +74,7 @@ public class NewUserPage extends AdministrationPage {@Overridepublic void run() {- getUserManager().save(user);+ getUserManager().create(user);getEmailAddressManager().save(emailAddress);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/twofactorauthentication/UserTwoFactorAuthenticationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/twofactorauthentication/UserTwoFactorAuthenticationPage.javaindex edc7d9f481..6b396f2b7d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/twofactorauthentication/UserTwoFactorAuthenticationPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/twofactorauthentication/UserTwoFactorAuthenticationPage.java@@ -49,7 +49,7 @@ public class UserTwoFactorAuthenticationPage extends UserPage {@Overridepublic void onClick(AjaxRequestTarget target) {getUser().setTwoFactorAuthentication(null);- getUserManager().save(getUser());+ getUserManager().update(getUser(), null);Session.get().success("Two-factor authentication disabled");setResponsePage(UserTwoFactorAuthenticationPage.class, UserTwoFactorAuthenticationPage.paramsOf(getUser()));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.javaindex 6eea158215..9dc97f8fbd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java@@ -160,7 +160,7 @@ public class BuildListPage extends LayoutPage {} else {namedQuery.setQuery(query);}- OneDev.getInstance(UserManager.class).save(getLoginUser());+ OneDev.getInstance(UserManager.class).update(getLoginUser(), null);target.add(savedQueries);close();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.javaindex 851d03e6ec..2338750152 100644--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java@@ -164,7 +164,7 @@ public class IssueListPage extends LayoutPage {} else {namedQuery.setQuery(query);}- OneDev.getInstance(UserManager.class).save(getLoginUser());+ OneDev.getInstance(UserManager.class).update(getLoginUser(), null);target.add(savedQueries);close();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.javaindex 2ca644dfcf..d9b029dc26 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/twofactorauthentication/MyTwoFactorAuthenticationPage.java@@ -68,7 +68,7 @@ public class MyTwoFactorAuthenticationPage extends MyPage {@Overridepublic void onClick(AjaxRequestTarget target) {getLoginUser().setTwoFactorAuthentication(null);- getUserManager().save(getLoginUser());+ getUserManager().update(getLoginUser(), null);Session.get().success("Two-factor authentication disabled");setResponsePage(MyTwoFactorAuthenticationPage.class);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex f0e9ccbb73..4f4fa83381 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -160,7 +160,7 @@ public class ProjectListPage extends LayoutPage {} else {namedQuery.setQuery(query);}- OneDev.getInstance(UserManager.class).save(getLoginUser());+ OneDev.getInstance(UserManager.class).update(getLoginUser(), null);target.add(savedQueries);close();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.javaindex c391d05b98..51fef8bc45 100644--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java@@ -156,7 +156,7 @@ public class PullRequestListPage extends LayoutPage {} else {namedQuery.setQuery(query);}- OneDev.getInstance(UserManager.class).save(getLoginUser());+ OneDev.getInstance(UserManager.class).update(getLoginUser(), null);target.add(savedQueries);close();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.javaindex 4408f0f1a4..7bd8a4e838 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/CreateUserFromInvitationPage.java@@ -86,7 +86,7 @@ public class CreateUserFromInvitationPage extends SimplePage {@Overridepublic void run() {- getUserManager().save(user);+ getUserManager().create(user);getEmailAddressManager().save(emailAddress);getInvitationManager().delete(invitationModel.getObject());}diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.javaindex 928aaadc1e..44661cd312 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java@@ -295,7 +295,7 @@ public class LoginPage extends SimplePage {super.onSubmit();User user = getUserManager().load(userId);if (user.getTwoFactorAuthentication().getScratchCodes().remove(recoveryCode)) {- getUserManager().save(user);+ getUserManager().update(user, null);afterLogin(user);} else {error("Recovery code verification failed");diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.javaindex 4ba6d12d72..0b52250445 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java@@ -84,7 +84,7 @@ public class PasswordResetPage extends SimplePage {String password = CryptoUtils.generateSecret();user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(password));user.setSsoConnector(null);- userManager.save(user);+ userManager.update(user, null);MailManager mailManager = OneDev.getInstance(MailManager.class);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 c267e9daa0..c45a2e6152 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@@ -74,7 +74,7 @@ public class SignUpPage extends SimplePage {@Overridepublic void run() {- getUserManager().save(user);+ getUserManager().create(user);getEmailAddressManager().save(emailAddress);}