The Unified and Autonomous Development Platform
fix: Error trying to link existing user (OD-2647)
Robin Shenf7b86a27046c
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 67770c6373..0fa3295e20 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@@ -4,6 +4,8 @@ import static io.onedev.server.model.User.Type.ORDINARY;import static io.onedev.server.validation.validator.UserNameValidator.normalizeUserName;import static io.onedev.server.web.translation.Translation._T;+import java.io.ObjectStreamException;+import java.io.Serializable;import java.text.MessageFormat;import java.util.HashSet;@@ -23,6 +25,7 @@ import org.jspecify.annotations.Nullable;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.model.EmailAddress;import io.onedev.server.model.User;@@ -36,7 +39,7 @@ import io.onedev.server.service.SshKeyService;import io.onedev.server.service.UserService;@Singleton-public class DefaultAuthenticatingService extends AuthenticatingRealm implements AuthenticatingService {+public class DefaultAuthenticatingService extends AuthenticatingRealm implements AuthenticatingService, Serializable {private static final Logger logger = LoggerFactory.getLogger(DefaultAuthenticatingService.class);@@ -204,4 +207,9 @@ public class DefaultAuthenticatingService extends AuthenticatingRealm implements}});}++ public Object writeReplace() throws ObjectStreamException {+ return new ManagedSerializedForm(AuthenticatingService.class);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java b/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.javaindex 85e88b1772..4dace66572 100644--- a/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java+++ b/server-core/src/main/java/io/onedev/server/security/DefaultAuthorizingService.java@@ -2,6 +2,8 @@ package io.onedev.server.security;import static io.onedev.server.security.SecurityUtils.getUser;+import java.io.ObjectStreamException;+import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -23,6 +25,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import com.google.common.collect.Lists;+import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.server.model.Group;import io.onedev.server.model.IssueAuthorization;import io.onedev.server.model.Project;@@ -38,7 +41,7 @@ import io.onedev.server.util.Pair;import io.onedev.server.util.facade.UserFacade;@Singleton-public class DefaultAuthorizingService extends AuthorizingRealm implements AuthorizingService {+public class DefaultAuthorizingService extends AuthorizingRealm implements AuthorizingService, Serializable {@Injectprivate SessionService sessionService;@@ -172,4 +175,8 @@ public class DefaultAuthorizingService extends AuthorizingRealm implements Authothrow new UnsupportedOperationException();}+ public Object writeReplace() throws ObjectStreamException {+ return new ManagedSerializedForm(AuthorizingService.class);+ }+}\ No newline at end of filediff --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 02ea6d0557..34a304ec03 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@@ -40,7 +40,7 @@ import io.onedev.server.model.SsoProvider;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.sso.SsoAuthenticated;import io.onedev.server.persistence.TransactionService;-import io.onedev.server.security.DefaultAuthenticatingService;+import io.onedev.server.security.AuthenticatingService;import io.onedev.server.security.SecurityUtils;import io.onedev.server.service.EmailAddressService;import io.onedev.server.service.MembershipService;@@ -93,7 +93,7 @@ public class SsoProcessPage extends SimplePage {private SshKeyService sshKeyService;@Inject- private DefaultAuthenticatingService authenticatingService;+ private AuthenticatingService authenticatingService;@Injectprivate TransactionService transactionService;