The Unified and Autonomous Development Platform
Fix the bug that current user can lose the autenticated identify sometimes
Robin Shenaf7dd2dcc6c2
diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.javaindex f2bbd5e16e..d1103a029d 100644--- a/core/src/main/java/io/onedev/server/model/User.java+++ b/core/src/main/java/io/onedev/server/model/User.java@@ -11,8 +11,6 @@ import javax.persistence.Index;import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.Version;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;import org.apache.shiro.SecurityUtils;import org.apache.shiro.authc.AuthenticationInfo;@@ -20,8 +18,6 @@ import org.apache.shiro.subject.PrincipalCollection;import org.apache.shiro.subject.SimplePrincipalCollection;import org.apache.shiro.subject.Subject;import org.apache.shiro.web.mgt.WebSecurityManager;-import org.apache.shiro.web.subject.WebSubject;-import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.PersonIdent;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;@@ -115,13 +111,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {public static Subject asSubject(Long userId) {WebSecurityManager securityManager = AppLoader.getInstance(WebSecurityManager.class);- if (RequestCycle.get() != null) {- ServletRequest request = (ServletRequest) RequestCycle.get().getRequest().getContainerRequest();- ServletResponse response = (ServletResponse) RequestCycle.get().getResponse().getContainerResponse();- return new WebSubject.Builder(securityManager, request, response).principals(asPrincipal(userId)).buildSubject();- } else {- return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();- }+ return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();}@Editable(name="Login Name", order=100)diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.javaindex 49035be63d..f3aec16720 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java@@ -83,11 +83,6 @@ public class UserAuthorizationsPage extends UserPage {@Overrideprotected Map<Long, UserAuthorizationFacade> load() {Map<Long, UserAuthorizationFacade> authorizations = new HashMap<>();- for (UserAuthorizationFacade authorization:- OneDev.getInstance(CacheManager.class).getUserAuthorizations().values()) {- if (authorization.getUserId().equals(getUser().getId()))- authorizations.put(authorization.getProjectId(), authorization);- }return authorizations;}