The Unified and Autonomous Development Platform
chore: Move user enable/disable/delete action to overview page
Robin Shen4334d2d481ad
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java b/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.javaindex 1f9312fd37..adf8225a7f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java@@ -7,6 +7,9 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.page.admin.usermanagement.UserListPage;import io.onedev.server.web.util.ConfirmClickModifier;++import static io.onedev.server.web.translation.Translation._T;+import org.apache.wicket.RestartResponseException;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.flow.RedirectToUrlException;@@ -21,23 +24,21 @@ public abstract class UserDeleteLink extends Link<Void> {protected void onInitialize() {super.onInitialize();- if (getUser().equals(SecurityUtils.getAuthUser()))- add(new ConfirmClickModifier("Do you really want to remove your account?"));- else- add(new ConfirmClickModifier("Do you really want to delete user '" + getUser().getDisplayName() + "'?"));+ add(new ConfirmClickModifier(_T("Do you really want to remove this account?")));}@Overridepublic void onClick() {+ var userManager = OneDev.getInstance(UserManager.class);if (getUser().equals(SecurityUtils.getAuthUser())) {- OneDev.getInstance(UserManager.class).delete(getUser());+ userManager.delete(getUser());+ WebSession.get().success("Account removed");WebSession.get().logout();- WebSession.get().warn("Your account is deleted");throw new RestartResponseException(getApplication().getHomePage());} else {- OneDev.getInstance(UserManager.class).delete(getUser());- WebSession.get().success("User '" + getUser().getDisplayName() + "' deleted");- String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(User.class);+ userManager.delete(getUser());+ WebSession.get().success("Account removed");+ String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(User.class);if (redirectUrlAfterDelete != null)throw new RedirectToUrlException(redirectUrlAfterDelete);elsediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.htmlindex 2dfeae9624..34bc7459ac 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.html@@ -1,6 +1,6 @@<wicket:panel><div class="user-overview d-flex m-n5 no-autofocus">- <div class="flex-shrink-0 info border-right p-5 text-center d-none d-lg-block">+ <div class="flex-shrink-0 info p-5 border-right d-none d-lg-block text-center"><img wicket:id="avatar"><div wicket:id="name" class="mt-4"></div><div wicket:id="fullName" class="mt-1"></div>@@ -9,6 +9,12 @@<a wicket:id="emailAddress"><span wicket:id="label"></span></a></div></wicket:enclosure>+ <div wicket:id="note" class="mt-5"></div>+ <div class="mt-5 text-center">+ <a wicket:id="enable" class="btn btn-sm btn-outline-primary mr-3"><wicket:t>Enable</wicket:t></a>+ <a wicket:id="disable" class="btn btn-sm btn-outline-warning mr-3"><wicket:t>Disable</wicket:t></a>+ <a wicket:id="delete" class="btn btn-sm btn-outline-danger"><wicket:t>Delete</wicket:t></a>+ </div></div><div class="activities p-5"><div class="d-flex mb-4 align-items-center">@@ -30,6 +36,31 @@</ul></div></div>+ <wicket:fragment wicket:id="authViaInternalDatabaseFrag">+ <div class="alert alert-light p-2 font-size-sm">+ <wicket:t>This user is authenticating via internal database.</wicket:t>+ <div wicket:id="actions">+ <a wicket:id="removePassword">Remove password</a> to force the user to authenticate via external system+ </div>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="authViaExternalSystemFrag">+ <div class="alert alert-light p-2 font-size-sm">+ <wicket:t>This user is authenticating via external system.</wicket:t>+ <form wicket:id="form" class="d-inline">+ To authenticate via internal database, <a wicket:id="setPasswordForUser">set password for user</a> or <a wicket:id="tellUserToResetPassword">tell user to reset password</a>+ </form>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="serviceAccountFrag">+ <div class="alert alert-light p-2 font-size-sm"><wicket:t>This is a service account for task automation purpose</wicket:t></div>+ </wicket:fragment>+ <wicket:fragment wicket:id="disabledFrag">+ <div class="alert alert-light-warning p-2 font-size-sm"><wicket:t>This account is disabled</wicket:t></div>+ </wicket:fragment>+ <wicket:fragment wicket:id="disabledServiceAccountFrag">+ <div class="alert alert-light-warning p-2 font-size-sm"><wicket:t>This is a disabled service account</wicket:t></div>+ </wicket:fragment><wicket:fragment wicket:id="dateFrag"><h5 class="mt-4 mb-3 d-flex align-items-center"><wicket:svg href="calendar" class="icon mr-2"/> <span wicket:id="date"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.javaindex 4dc0c55fc0..8437384aa0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/overview/UserOverviewPanel.java@@ -15,6 +15,7 @@ import java.util.Map;import javax.annotation.Nullable;import org.apache.wicket.Component;+import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -24,6 +25,9 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.markup.repeater.RepeatingView;@@ -32,8 +36,10 @@ import org.apache.wicket.model.Model;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;+import com.google.common.collect.Lists;import io.onedev.commons.utils.ExplicitException;+import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;@@ -44,7 +50,11 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.entitymanager.PullRequestCommentManager;import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.mail.MailManager;import io.onedev.server.model.User;+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;@@ -52,10 +62,16 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardDimport io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;+import io.onedev.server.persistence.SessionManager;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.CryptoUtils;import io.onedev.server.util.DateRange;import io.onedev.server.util.DateUtils;import io.onedev.server.web.component.datepicker.DateRangePicker;+import io.onedev.server.web.component.taskbutton.TaskButton;+import io.onedev.server.web.component.taskbutton.TaskResult;import io.onedev.server.web.component.user.UserAvatar;+import io.onedev.server.web.component.user.UserDeleteLink;import io.onedev.server.web.component.user.overview.activity.ApprovePullRequest;import io.onedev.server.web.component.user.overview.activity.CommentIssue;import io.onedev.server.web.component.user.overview.activity.CommentPullRequest;@@ -72,7 +88,10 @@ import io.onedev.server.web.component.user.overview.activity.ResolveCodeComment;import io.onedev.server.web.component.user.overview.activity.TransitIssue;import io.onedev.server.web.component.user.overview.activity.UnresolveCodeComment;import io.onedev.server.web.component.user.overview.activity.UserActivity;+import io.onedev.server.web.page.user.password.UserPasswordPage;+import io.onedev.server.web.util.ConfirmClickModifier;import io.onedev.server.web.util.TextUtils;+import io.onedev.server.web.util.WicketUtils;import io.onedev.server.xodus.CommitInfoManager;public abstract class UserOverviewPanel extends GenericPanel<User> {@@ -159,7 +178,7 @@ public abstract class UserOverviewPanel extends GenericPanel<User> {protected void onInitialize() {super.onInitialize();- var user = getModelObject();+ var user = getUser();add(new UserAvatar("avatar", user));add(new Label("name", "@" + user.getName()));@@ -194,6 +213,149 @@ public abstract class UserOverviewPanel extends GenericPanel<User> {}.setVisible(false));}+ WebMarkupContainer noteContainer;+ if (user.isDisabled() && WicketUtils.isSubscriptionActive()) {+ if (user.isServiceAccount())+ noteContainer = new Fragment("note", "disabledServiceAccountFrag", this);+ else+ noteContainer = new Fragment("note", "disabledFrag", this);+ } else if (user.isServiceAccount() && WicketUtils.isSubscriptionActive()) {+ noteContainer = new Fragment("note", "serviceAccountFrag", this);+ } else if (user.getPassword() != null) {+ noteContainer = new Fragment("note", "authViaInternalDatabaseFrag", this);+ var actions = new WebMarkupContainer("actions");+ actions.setVisible(SecurityUtils.isAdministrator());+ noteContainer.add(actions);+ actions.add(new Link<Void>("removePassword") {++ @Override+ public void onClick() {+ var user = getUser();+ user.setPassword(null);+ getUserManager().update(user, null);+ Session.get().success(_T("Password has been removed"));+ setResponsePage(UserPasswordPage.class, UserPasswordPage.paramsOf(user));+ }++ }.add(new ConfirmClickModifier(_T("Do you really want to remove password of this user?"))));++ noteContainer.setVisible(SecurityUtils.isAdministrator() || getUser().equals(SecurityUtils.getAuthUser()));+ } else {+ noteContainer = new Fragment("note", "authViaExternalSystemFrag", this);+ var form = new Form<Void>("form");+ form.setVisible(SecurityUtils.isAdministrator());+ noteContainer.add(form);+ form.add(new BookmarkablePageLink<Void>("setPasswordForUser",+ UserPasswordPage.class, UserPasswordPage.paramsOf(getUser())));+ var passwordResetRequestSentMessage = _T("Password reset request has been sent");+ var noVerifiedPrimaryEmailAddressMessage = _T("No verified primary email address");+ var mailServiceNotConfiguredMessage = _T("Unable to notify user as mail service is not configured");+ var mailSubject = _T("[Reset Password] Please Reset Your OneDev Password");+ form.add(new TaskButton("tellUserToResetPassword") {++ @Override+ protected TaskResult runTask(TaskLogger logger) {+ var sessionManager = OneDev.getInstance(SessionManager.class);+ return sessionManager.call(() -> {+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);+ if (settingManager.getMailService() != null) {+ var user = getUser();+ if (user.getPrimaryEmailAddress() != null && user.getPrimaryEmailAddress().isVerified()) {+ String passwordResetCode = CryptoUtils.generateSecret();+ user.setPasswordResetCode(passwordResetCode);+ getUserManager().update(user, null);++ MailManager mailManager = OneDev.getInstance(MailManager.class);++ Map<String, Object> bindings = new HashMap<>();+ bindings.put("passwordResetUrl", settingManager.getSystemSetting().getServerUrl() + "/~reset-password/" + passwordResetCode);+ bindings.put("user", user);++ var template = settingManager.getEmailTemplates().getPasswordReset();+ var htmlBody = EmailTemplates.evalTemplate(true, template, bindings);+ var textBody = EmailTemplates.evalTemplate(false, template, bindings);++ mailManager.sendMail(Arrays.asList(user.getPrimaryEmailAddress().getValue()),+ Lists.newArrayList(), Lists.newArrayList(),+ mailSubject,+ htmlBody, textBody, null, null, null);++ return new TaskResult(true, new TaskResult.PlainMessage(passwordResetRequestSentMessage));+ } else {+ return new TaskResult(false, new TaskResult.PlainMessage(noVerifiedPrimaryEmailAddressMessage));+ }+ } else {+ return new TaskResult(false, new TaskResult.PlainMessage(mailServiceNotConfiguredMessage));+ }+ });+ }++ });+ noteContainer.setVisible(SecurityUtils.isAdministrator() || getUser().equals(SecurityUtils.getUser()));+ }++ add(noteContainer);++ add(new Link<Void>("enable") {++ @Override+ public void onClick() {+ getUserManager().enable(getUser());+ Session.get().success("User enabled");+ setResponsePage(getPage().getClass(), getPage().getPageParameters());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator() && getUser().isDisabled() && WicketUtils.isSubscriptionActive());+ }++ }.add(new ConfirmClickModifier(_T("Do you really want to enable this account?"))));++ add(new Link<Void>("disable") {++ @Override+ public void onClick() {+ getUserManager().disable(getUser());+ Session.get().success(_T("User disabled"));+ setResponsePage(getPage().getClass(), getPage().getPageParameters());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator()+ && !getUser().equals(SecurityUtils.getAuthUser())+ && !getUser().isDisabled()+ && WicketUtils.isSubscriptionActive());+ }++ }.add(new ConfirmClickModifier(_T("Disabling account will reset password, clear access tokens, "+ + "and remove all references from other entities except for past activities. Do you "+ + "really want to continue?"))));++ add(new UserDeleteLink("delete") {++ @Override+ protected User getUser() {+ return UserOverviewPanel.this.getUser();+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ if (getUser().isRoot()) {+ setVisible(false);+ } else if (SecurityUtils.isAdministrator()) {+ setVisible(true);+ } else {+ setVisible(getUser().equals(SecurityUtils.getAuthUser())+ && getSettingManager().getSecuritySetting().isEnableSelfDeregister());+ }+ }+ });+var dateRangePicker = new DateRangePicker("dateRange", Model.of(new DateRange(fromDate, toDate)));dateRangePicker.add(new AjaxFormComponentUpdatingBehavior("change") {@Override@@ -263,6 +425,18 @@ public abstract class UserOverviewPanel extends GenericPanel<User> {setOutputMarkupId(true);}+ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);+ }++ private SettingManager getSettingManager() {+ return OneDev.getInstance(SettingManager.class);+ }++ private User getUser() {+ return getModelObject();+ }+private List<Component> newActivityRows(RepeatingView activitiesView, UserActivity activity) {var rows = new ArrayList<Component>();var activityDate = DateUtils.toLocalDate(activity.getDate());@@ -284,7 +458,7 @@ public abstract class UserOverviewPanel extends GenericPanel<User> {private List<UserActivity> getActivities(Date fromDate, Date toDate) {var activities = new ArrayList<UserActivity>();- var user = getModelObject();+ var user = getUser();var commitInfoManager = OneDev.getInstance(CommitInfoManager.class);for (var entry: commitInfoManager.getUserCommits(user, fromDate, toDate).entrySet()) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.css b/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.cssindex a263f7feba..c07a80e10d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.css+++ b/server-core/src/main/java/io/onedev/server/web/component/user/overview/user-overview.css@@ -1,3 +1,6 @@+.user-overview .info {+ width: 240px;+}.user-overview>.info .avatar {width: 160px;height: 160px;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.htmlindex 46716841af..755eb443e3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.html@@ -1,12 +1,7 @@<wicket:panel><form wicket:id="form" class="leave-confirm"><div wicket:id="feedback" class="mb-4"></div>- <div wicket:id="editor"></div>- <div class="d-flex mt-5">- <input wicket:id="submit" class="btn btn-primary dirty-aware mr-3" type="submit">- <a wicket:id="enable" class="btn btn-light-primary mr-3"><wicket:t>Enable</wicket:t></a>- <a wicket:id="disable" class="btn btn-light-warning mr-3"><wicket:t>Disable</wicket:t></a>- <a wicket:id="delete" class="btn btn-light-danger ml-auto"><wicket:t>Delete</wicket:t></a>- </div>+ <div wicket:id="editor" class="mb-5"></div>+ <input wicket:id="submit" class="btn btn-primary dirty-aware" type="submit"></form></wicket:panel>\ No newline at end of filediff --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 277698400c..aec0898729 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@@ -10,25 +10,18 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import com.google.common.collect.Sets;import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.web.component.user.UserDeleteLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.page.my.profile.MyProfilePage;-import io.onedev.server.web.util.ConfirmClickModifier;-import io.onedev.server.web.util.WicketUtils;public class ProfileEditPanel extends GenericPanel<User> {@@ -95,61 +88,9 @@ public class ProfileEditPanel extends GenericPanel<User> {};form.add(editor);- form.add(new FencedFeedbackPanel("feedback", form));-+ form.add(new FencedFeedbackPanel("feedback", form));form.add(new WebMarkupContainer("submit").add(AttributeAppender.append("value", _T("Save"))));- form.add(new Link<Void>("enable") {-- @Override- public void onClick() {- getUserManager().enable(getUser());- Session.get().success("User enabled");- setResponsePage(getPage().getClass(), getPage().getPageParameters());- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getUser().isDisabled() && WicketUtils.isSubscriptionActive());- }- }.add(new ConfirmClickModifier(_T("Do you really want to enable this account?"))));-- form.add(new Link<Void>("disable") {-- @Override- public void onClick() {- getUserManager().disable(getUser());- Session.get().success(_T("User disabled"));- setResponsePage(getPage().getClass(), getPage().getPageParameters());- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getUser().isDisabled() && WicketUtils.isSubscriptionActive());- }-- }.add(new ConfirmClickModifier(_T("Disabling account will reset password, clear access tokens, "- + "and remove all references from other entities except for past activities. Do you "- + "really want to continue?"))));- boolean canDelete;- if (getPage() instanceof MyProfilePage) {- canDelete = !getUser().isRoot()- && SecurityUtils.isAnonymous(SecurityUtils.getPrevPrincipal())- && OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableSelfDeregister();- } else {- canDelete = !getUser().isRoot() && !getUser().equals(SecurityUtils.getAuthUser());- }- form.add(new UserDeleteLink("delete") {-- @Override- protected User getUser() {- return ProfileEditPanel.this.getUser();- }-- }.setVisible(canDelete));-add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.javaindex 01fe7d7f6a..4078f8e9b6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java@@ -658,8 +658,8 @@ public class UserListPage extends AdministrationPage {};link.add(new UserAvatar("avatar", user));link.add(new Label("name", user.getName()));- link.add(new Label("service", "service").setVisible(user.isServiceAccount() && WicketUtils.isSubscriptionActive()));- link.add(new Label("disabled", "disabled").setVisible(user.isDisabled() && WicketUtils.isSubscriptionActive()));+ link.add(new WebMarkupContainer("service").setVisible(user.isServiceAccount() && WicketUtils.isSubscriptionActive()));+ link.add(new WebMarkupContainer("disabled").setVisible(user.isDisabled() && WicketUtils.isSubscriptionActive()));fragment.add(link);cellItem.add(fragment);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.htmlindex 2c5a6342df..d93f935cce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.html@@ -1,19 +1,3 @@<wicket:extend>- <div wicket:id="note" class="mb-4"></div><div wicket:id="content"></div>- <wicket:fragment wicket:id="authViaInternalDatabaseFrag">- <div class="alert alert-light alert-notice"><wicket:t>You are authenticating via internal database</wicket:t></div>- </wicket:fragment>- <wicket:fragment wicket:id="authViaExternalSystemFrag">- <div class="alert alert-light-warning alert-notice"><wicket:t>You are authenticating via external system</wicket:t></div>- </wicket:fragment>- <wicket:fragment wicket:id="serviceAccountFrag">- <div class="alert alert-light-info alert-notice"><wicket:t>This is a service account for task automation purpose</wicket:t></div>- </wicket:fragment>- <wicket:fragment wicket:id="disabledFrag">- <div class="alert alert-light-warning alert-notice"><wicket:t>This account is disabled</wicket:t></div>- </wicket:fragment>- <wicket:fragment wicket:id="disabledServiceAccountFrag">- <div class="alert alert-light-warning alert-notice"><wicket:t>This is a disabled service account</wicket:t></div>- </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.javaindex fb2b458eca..df9fb1ce8d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/profile/MyProfilePage.java@@ -4,14 +4,12 @@ import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.User;import io.onedev.server.web.component.user.profileedit.ProfileEditPanel;import io.onedev.server.web.page.my.MyPage;-import io.onedev.server.web.util.WicketUtils;public class MyProfilePage extends MyPage {@@ -22,20 +20,6 @@ public class MyProfilePage extends MyPage {@Overrideprotected void onInitialize() {super.onInitialize();-- if (getUser().isDisabled() && WicketUtils.isSubscriptionActive()) {- if (getUser().isServiceAccount())- add(new Fragment("note", "disabledServiceAccountFrag", this));- else- add(new Fragment("note", "disabledFrag", this));- } else if (getUser().isServiceAccount() && WicketUtils.isSubscriptionActive()) {- add(new Fragment("note", "serviceAccountFrag", this));- } else if (getUser().getPassword() != null) {- add(new Fragment("note", "authViaInternalDatabaseFrag", this));- } else {- add(new Fragment("note", "authViaExternalSystemFrag", this));- }-add(new ProfileEditPanel("content", new AbstractReadOnlyModel<>() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.html b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.htmlindex 44fddf7cfe..d93f935cce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.html@@ -1,31 +1,3 @@<wicket:extend>- <div wicket:id="note"></div><div wicket:id="content"></div>- <wicket:fragment wicket:id="authViaInternalDatabaseFrag">- <div class="alert alert-light alert-notice">- <wicket:t>- This user is authenticating via internal database.- <a wicket:id="removePassword">Remove password</a> to force the user to authenticate via external system- </wicket:t>- </div>- </wicket:fragment>- <wicket:fragment wicket:id="authViaExternalSystemFrag">- <div class="alert alert-light-warning alert-notice">- <form wicket:id="form" class="d-inline">- <wicket:t>- This user is authenticating via external system.- To authenticate via internal database, <a wicket:id="setPasswordForUser">set password for user</a> or <a wicket:id="tellUserToResetPassword">tell user to reset password</a>- </wicket:t>- </form>- </div>- </wicket:fragment>- <wicket:fragment wicket:id="serviceAccountFrag">- <div class="alert alert-light-info alert-notice"><wicket:t>This is a service account for task automation purpose</wicket:t></div>- </wicket:fragment>- <wicket:fragment wicket:id="disabledFrag">- <div class="alert alert-light-warning alert-notice"><wicket:t>This account is disabled</wicket:t></div>- </wicket:fragment>- <wicket:fragment wicket:id="disabledServiceAccountFrag">- <div class="alert alert-light-warning alert-notice"><wicket:t>This is a disabled service account</wicket:t></div>- </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.javaindex 9e0057785a..b6af7f28ec 100644--- a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java@@ -1,36 +1,9 @@package io.onedev.server.web.page.user.profile;-import static io.onedev.server.web.translation.Translation._T;--import java.util.Arrays;-import java.util.HashMap;-import java.util.Map;--import org.apache.wicket.Session;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.google.common.collect.Lists;--import io.onedev.commons.utils.TaskLogger;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.mail.MailManager;-import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;-import io.onedev.server.persistence.SessionManager;-import io.onedev.server.util.CryptoUtils;-import io.onedev.server.web.component.taskbutton.TaskButton;-import io.onedev.server.web.component.taskbutton.TaskResult;import io.onedev.server.web.component.user.profileedit.ProfileEditPanel;-import io.onedev.server.web.page.user.password.UserPasswordPage;import io.onedev.server.web.page.user.UserPage;-import io.onedev.server.web.util.ConfirmClickModifier;-import io.onedev.server.web.util.WicketUtils;public class UserProfilePage extends UserPage {@@ -41,87 +14,7 @@ public class UserProfilePage extends UserPage {@Overrideprotected void onInitialize() {super.onInitialize();-- WebMarkupContainer noteContainer;- if (getUser().isDisabled() && WicketUtils.isSubscriptionActive()) {- if (getUser().isServiceAccount())- noteContainer = new Fragment("note", "disabledServiceAccountFrag", this);- else- noteContainer = new Fragment("note", "disabledFrag", this);- } else if (getUser().isServiceAccount() && WicketUtils.isSubscriptionActive()) {- noteContainer = new Fragment("note", "serviceAccountFrag", this);- } else if (getUser().getPassword() != null) {- noteContainer = new Fragment("note", "authViaInternalDatabaseFrag", this);- noteContainer.add(new Link<Void>("removePassword") {-- @Override- public void onClick() {- getUser().setPassword(null);- getUserManager().update(getUser(), null);- Session.get().success(_T("Password has been removed"));- setResponsePage(UserPasswordPage.class, paramsOf(getUser()));- }- }.add(new ConfirmClickModifier(_T("Do you really want to remove password of this user?"))));- } else {- noteContainer = new Fragment("note", "authViaExternalSystemFrag", this);- var form = new Form<Void>("form");- noteContainer.add(form);- form.add(new BookmarkablePageLink<Void>("setPasswordForUser",- UserPasswordPage.class, UserPasswordPage.paramsOf(getUser())));- var userId = getUser().getId();- var passwordResetRequestSentMessage = _T("Password reset request has been sent");- var noVerifiedPrimaryEmailAddressMessage = _T("No verified primary email address");- var mailServiceNotConfiguredMessage = _T("Unable to notify user as mail service is not configured");- var mailSubject = _T("[Reset Password] Please Reset Your OneDev Password");- form.add(new TaskButton("tellUserToResetPassword") {-- @Override- protected TaskResult runTask(TaskLogger logger) {- var sessionManager = OneDev.getInstance(SessionManager.class);- return sessionManager.call(() -> {- SettingManager settingManager = OneDev.getInstance(SettingManager.class);- if (settingManager.getMailService() != null) {- var user = getUserManager().load(userId);- if (user.getPrimaryEmailAddress() != null && user.getPrimaryEmailAddress().isVerified()) {- String passwordResetCode = CryptoUtils.generateSecret();- user.setPasswordResetCode(passwordResetCode);- getUserManager().update(user, null);-- MailManager mailManager = OneDev.getInstance(MailManager.class);-- Map<String, Object> bindings = new HashMap<>();- bindings.put("passwordResetUrl", settingManager.getSystemSetting().getServerUrl() + "/~reset-password/" + passwordResetCode);- bindings.put("user", user);-- var template = settingManager.getEmailTemplates().getPasswordReset();- var htmlBody = EmailTemplates.evalTemplate(true, template, bindings);- var textBody = EmailTemplates.evalTemplate(false, template, bindings);-- mailManager.sendMail(Arrays.asList(user.getPrimaryEmailAddress().getValue()),- Lists.newArrayList(), Lists.newArrayList(),- mailSubject,- htmlBody, textBody, null, null, null);-- return new TaskResult(true, new TaskResult.PlainMessage(passwordResetRequestSentMessage));- } else {- return new TaskResult(false, new TaskResult.PlainMessage(noVerifiedPrimaryEmailAddressMessage));- }- } else {- return new TaskResult(false, new TaskResult.PlainMessage(mailServiceNotConfiguredMessage));- }- });- }-- });- }-- add(noteContainer);-add(new ProfileEditPanel("content", userModel));}-- private UserManager getUserManager() {- return OneDev.getInstance(UserManager.class);- }-+}diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.javaindex ba6805daff..c8f8e7ed4c 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java@@ -1759,7 +1759,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Private Key Secret", "私钥密钥");m.put("Privilege", "权限");m.put("Privilege Settings", "权限设置");- m.put("Profile", "资料");+ m.put("Profile", "基本信息");m.put("Profile updated", "配置已更新");m.put("Programming language", "编程语言");m.put("Project", "项目");@@ -2592,10 +2592,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {"此步骤设置 trivy 数据库缓存以加速各种扫描步骤。如果需要使用,请将其放置在扫描步骤之前");m.put("This trigger will only be applicable if tagged commit is reachable from branches specified here. Multiple branches should be separated with spaces. Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude. Leave empty to match all branches","此触发器仅在标记的提交可从此处指定的分支访问时适用。多个分支应以空格分隔。使用 '**'、'*' 或 '?' 进行 <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>路径通配符匹配</a>。以 '-' 为前缀表示排除。留空表示匹配所有分支");- m.put("This user is authenticating via external system. To authenticate via internal database, <a wicket:id=\"setPasswordForUser\">set password for user</a> or <a wicket:id=\"tellUserToResetPassword\">tell user to reset password</a>",- "此用户通过外部系统进行认证。要通过内部数据库进行认证,<a wicket:id=\"setPasswordForUser\">设置用户密码</a> 或 <a wicket:id=\"tellUserToResetPassword\">告诉用户重置密码</a>");- m.put("This user is authenticating via internal database. <a wicket:id=\"removePassword\">Remove password</a> to force the user to authenticate via external system",- "此用户正在通过内部数据库进行认证。<a wicket:id=\"removePassword\">删除密码</a> 以强制用户通过外部系统进行认证");m.put("Threads", "线程");m.put("Time Estimate Issue Field", "工单时间估算字段");m.put("Time Range", "时间范围");@@ -2835,8 +2831,6 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Window Memory", "窗口内存");m.put("Working Directory", "工作目录");m.put("Write", "写入");- m.put("You are authenticating via external system", "您正在通过外部系统进行认证");- m.put("You are authenticating via internal database", "您正在通过内部数据库进行认证");m.put("You have unverified <a wicket:id=\"hasUnverifiedLink\">email addresses</a>", "您有未验证的 <a wicket:id=\"hasUnverifiedLink\">电子邮件地址</a>");m.put("You may also drop file/image to the input box, or paste image from clipboard", "您也可以将文件/图像拖到输入框中,或从剪贴板粘贴图像");m.put("You may initialize the project by <a wicket:id=\"addFiles\" class=\"link-primary\">adding files</a>, <a wicket:id=\"setupBuildSpec\" class=\"link-primary\">setting up build spec</a>, or <a wicket:id=\"pushInstructions\" class=\"link-primary\">pushing an existing repository</a>",@@ -2853,6 +2847,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("YouTrack Project", "YouTrack 项目");m.put("YouTrack Projects to Import", "要导入的 YouTrack 项目");m.put("[Reset Password] Please Reset Your OneDev Password", "[重置密码] 请重置您的 OneDev 密码");+ m.put("access [{0}]", "访问 [{0}]");+ m.put("artifacts", "制品");m.put("branches", "分支");m.put("builds", "构建");m.put("choose a color for this state", "选择一个颜色");@@ -2880,6 +2876,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("is not empty", "不为空");m.put("issues", "工单");m.put("lines", "行");+ m.put("log", "日志");+ m.put("manage job", "管理任务");m.put("may not be empty", "不能为空");m.put("md.heading", "标题");m.put("md.image", "图片");@@ -2900,8 +2898,11 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("outdated", "过时");m.put("packages", "包");m.put("personal", "个人");+ m.put("pipeline", "流水线");m.put("pull requests", "合并请求");+ m.put("reports", "报告");m.put("root", "根");+ m.put("run job", "运行任务");m.put("search in this revision will be accurate after indexed", "索引完成后,在当前版本中的搜索将更准确");m.put("service", "服务");m.put("skipped {0} lines", "跳过 {0} 行");@@ -2931,14 +2932,10 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("{javax.validation.constraints.NotEmpty.message}", "不能为空");m.put("{javax.validation.constraints.NotNull.message}", "不能为空");m.put("{javax.validation.constraints.Size.message}", "至少需要指定一个值");- m.put("access [{0}]", "访问 [{0}]");- m.put("artifacts", "制品");- m.put("log", "日志");- m.put("manage job", "管理任务");- m.put("pipeline", "流水线");- m.put("reports", "报告");- m.put("run job", "运行任务");-+ m.put("Do you really want to remove this account?", "您确定要删除此账户吗?");+ m.put("This user is authenticating via external system.", "此用户通过外部系统进行身份验证。");+ m.put("This user is authenticating via internal database.", "此用户通过内部数据库进行身份验证。");+// Manually added keysm.put("Create Administrator Account", "创建管理员账户");m.put("Server Setup", "服务器设置");