Unverified Commit 627883e8 authored by Lemon-miaow's avatar Lemon-miaow
Browse files

fix(panel): refine reset password messages and fix empty email placeholder in mock api response

parent 2c95da8d
Loading
Loading
Loading
Loading
+1 −1
Changes for panel/dev/mockApi.ts: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1045,7 +1045,7 @@ async function handleUserRoute(ctx: SessionContext): Promise<boolean> {
    if (is("POST", ctx) && subAction === "reset-password") {
      acc.mustChangePassword = true;
      acc.updated_at = new Date().toISOString();
      sendJSON(ctx.res, 200, { ok: true });
      sendJSON(ctx.res, 200, { ok: true, email: acc.email || "" });
      return true;
    }

+5 −4
Changes for panel/src/i18n/resources/en-US/admin.json: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -175,18 +175,19 @@
  "users_danger_enable_desc": "Allow this user to log in again.",
  "users_danger_enable_btn": "Enable",
  "users_danger_reset_pw": "Reset Password",
  "users_danger_reset_pw_desc": "A high-entropy random password will be generated and the user will be forced to change it on next login. All active sessions are revoked immediately.",
  "users_danger_reset_pw_desc_email": "A high-entropy random password will be generated and sent to {{email}}. The user will be forced to change it on next login. All active sessions are revoked immediately.",
  "users_danger_reset_pw_desc": "A random password will be generated and the user will be forced to change it on next login. All active sessions are revoked immediately.",
  "users_danger_reset_pw_desc_email": "A random password will be generated and sent to {{email}}. The user will be forced to change it on next login. All active sessions are revoked immediately.",
  "users_danger_reset_pw_btn": "Reset Password",
  "users_danger_reset_pw_confirm": "Reset Password",
  "users_pw_reset_ok": "Password reset. The new password was sent to {{email}}.",
  "users_pw_reset_ok_no_email": "Password reset. Since this user has no email address, it was logged server-side.",
  "users_danger_disable_dlg_title": "Disable User",
  "users_danger_disable_dlg_desc": "This user will be unable to log in. All active sessions will be revoked immediately.",
  "users_danger_enable_dlg_title": "Enable User",
  "users_danger_enable_dlg_desc": "This user will be able to log in again.",
  "users_danger_reset_pw_dlg_title": "Reset Password",
  "users_danger_reset_pw_dlg_desc_email": "A high-entropy random password will be generated and sent to {{email}}. The user will be forced to change it on next login. All existing sessions will be revoked.",
  "users_danger_reset_pw_dlg_desc_no_email": "A high-entropy random password will be generated. Since this user has no email address, it will be logged server-side. The user will be forced to change it on next login. All existing sessions will be revoked.",
  "users_danger_reset_pw_dlg_desc_email": "A random password will be generated and sent to {{email}}. The user will be forced to change it on next login. All existing sessions will be revoked.",
  "users_danger_reset_pw_dlg_desc_no_email": "A random password will be generated. Since this user has no email address, it will be logged server-side. The user will be forced to change it on next login. All existing sessions will be revoked.",
  "users_danger_delete_dlg_title": "Delete User",
  "users_danger_delete_dlg_desc": "This action is permanent. The user's owned servers will be released, all sessions revoked, and the account permanently disabled. This cannot be undone through the panel.",
  "users_danger_delete": "Delete User",
+5 −4
Changes for panel/src/i18n/resources/zh-CN/admin.json: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -175,18 +175,19 @@
  "users_danger_enable_desc": "允许此用户重新登录。",
  "users_danger_enable_btn": "启用",
  "users_danger_reset_pw": "重置密码",
  "users_danger_reset_pw_desc": "将生成高熵随机密码,用户下次登录时将被强制修改密码。所有活跃会话将被立即撤销。",
  "users_danger_reset_pw_desc_email": "将生成高熵随机密码并发送至 {{email}}。用户下次登录时将被强制修改密码。所有活跃会话将被立即撤销。",
  "users_danger_reset_pw_desc": "将生成随机密码,用户下次登录时将被强制修改密码。所有活跃会话将被立即撤销。",
  "users_danger_reset_pw_desc_email": "将生成随机密码并发送至 {{email}}。用户下次登录时将被强制修改密码。所有活跃会话将被立即撤销。",
  "users_danger_reset_pw_btn": "重置密码",
  "users_danger_reset_pw_confirm": "确认重置",
  "users_pw_reset_ok": "密码已重置,新密码已发送至 {{email}}。",
  "users_pw_reset_ok_no_email": "密码已重置。该用户未设置邮箱,新密码已记录在服务端日志中。",
  "users_danger_disable_dlg_title": "禁用用户",
  "users_danger_disable_dlg_desc": "此用户将无法登录。所有活跃会话将被立即撤销。",
  "users_danger_enable_dlg_title": "启用用户",
  "users_danger_enable_dlg_desc": "此用户将可以重新登录。",
  "users_danger_reset_pw_dlg_title": "重置密码",
  "users_danger_reset_pw_dlg_desc_email": "将生成高熵随机密码并发送至 {{email}}。用户下次登录时将被强制修改密码。所有现有会话将被撤销。",
  "users_danger_reset_pw_dlg_desc_no_email": "将生成高熵随机密码。由于此用户未设置邮箱地址,密码将记录在服务端日志中。用户下次登录时将被强制修改密码。所有现有会话将被撤销。",
  "users_danger_reset_pw_dlg_desc_email": "将生成随机密码并发送至 {{email}}。用户下次登录时将被强制修改密码。所有现有会话将被撤销。",
  "users_danger_reset_pw_dlg_desc_no_email": "将生成随机密码。由于此用户未设置邮箱地址,密码将记录在服务端日志中。用户下次登录时将被强制修改密码。所有现有会话将被撤销。",
  "users_danger_delete_dlg_title": "删除用户",
  "users_danger_delete_dlg_desc": "此操作不可逆。该用户拥有的所有服务器将被释放,所有会话将被撤销,账号将被永久禁用。此操作无法通过面板撤销。",
  "users_danger_delete": "删除用户",
+4 −0
Changes for panel/src/pages/admin/UserDetailPage.tsx: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -825,7 +825,11 @@ function DangerDialogs({
    setErr(null);
    try {
      const r = await api.resetUserPassword(user.id);
      if (r.email) {
        setOk(t("users_pw_reset_ok", { email: r.email }));
      } else {
        setOk(t("users_pw_reset_ok_no_email"));
      }
      setLoading(false);
    } catch (e) {
      setErr(humanizeError(e));