fix: close auth, permission, contract and e2e review blockers

2026-05-28 15:19:13 +08:00
parent f33e39a702
commit 6be90ddff8
29 changed files with 1356 additions and 259 deletions
--- a/frontend/admin/src/pages/admin/ProfileSecurityPage/ContactBindingsSection.tsx
+++ b/frontend/admin/src/pages/admin/ProfileSecurityPage/ContactBindingsSection.tsx
@@ -345,14 +345,12 @@ export function ContactBindingsSection({
              label="验证码"
              rules={[{ required: true, message: '请输入验证码' }]}
            >
-              <Input
-                placeholder="请输入验证码"
-                addonAfter={
-                  <Button type="link" size="small" loading={sendCodeLoading} onClick={handleSendCode}>
-                    发送验证码
-                  </Button>
-                }
-              />
+              <Space.Compact style={{ width: '100%' }}>
+                <Input placeholder="请输入验证码" />
+                <Button type="link" loading={sendCodeLoading} onClick={handleSendCode}>
+                  发送验证码
+                </Button>
+              </Space.Compact>
            </Form.Item>

            <Form.Item name="current_password" label="当前密码">
--- a/frontend/admin/src/pages/auth/BootstrapAdminPage/BootstrapAdminPage.test.tsx
+++ b/frontend/admin/src/pages/auth/BootstrapAdminPage/BootstrapAdminPage.test.tsx
@@ -29,7 +29,7 @@ const authContextValue: AuthContextValue = {

 function renderBootstrapAdminPage() {
  return render(
-    <MemoryRouter initialEntries={['/bootstrap-admin']}>
+    <MemoryRouter future={{ v7_startTransition: true, v7_relativeSplatPath: true }} initialEntries={['/bootstrap-admin']}>
      <AuthContext.Provider value={authContextValue}>
        <BootstrapAdminPage />
      </AuthContext.Provider>
@@ -88,7 +88,8 @@ describe('BootstrapAdminPage', () => {

    await user.type(screen.getByPlaceholderText('管理员用户名'), 'bootstrap_admin')
    await user.type(screen.getByPlaceholderText('管理员昵称（选填）'), 'Bootstrap Admin')
-    await user.type(screen.getByPlaceholderText('管理员邮箱（选填）'), 'bootstrap_admin@example.com')
+    await user.type(screen.getByPlaceholderText('管理员邮箱'), 'bootstrap_admin@example.com')
+    await user.type(screen.getByPlaceholderText('Bootstrap Secret'), 'bootstrap-secret-demo')
    await user.type(screen.getByPlaceholderText('管理员密码'), 'Bootstrap123!@#')
    await user.type(screen.getByPlaceholderText('确认管理员密码'), 'Bootstrap123!@#')
    await user.click(screen.getByRole('button', { name: '完成初始化并进入系统' }))
@@ -99,6 +100,7 @@ describe('BootstrapAdminPage', () => {
        nickname: 'Bootstrap Admin',
        email: 'bootstrap_admin@example.com',
        password: 'Bootstrap123!@#',
+        bootstrap_secret: 'bootstrap-secret-demo',
      }),
    )

--- a/frontend/admin/src/pages/auth/BootstrapAdminPage/BootstrapAdminPage.tsx
+++ b/frontend/admin/src/pages/auth/BootstrapAdminPage/BootstrapAdminPage.tsx
@@ -24,7 +24,8 @@ const DEFAULT_CAPABILITIES: AuthCapabilities = {
 type BootstrapAdminFormValues = {
  username: string
  nickname?: string
-  email?: string
+  email: string
+  bootstrapSecret: string
  password: string
  confirmPassword: string
 }
@@ -71,7 +72,8 @@ export function BootstrapAdminPage() {
      const tokenBundle = await bootstrapAdmin({
        username: values.username.trim(),
        nickname: values.nickname?.trim() || undefined,
-        email: values.email?.trim() || undefined,
+        email: values.email!.trim(),
+        bootstrap_secret: values.bootstrapSecret!.trim(),
        password: values.password,
      })
      await onLoginSuccess(tokenBundle)
@@ -110,7 +112,7 @@ export function BootstrapAdminPage() {
        初始化首个管理员账号
      </Title>
      <Paragraph type="secondary" style={{ marginBottom: 24 }}>
-        当前版本不内置默认账号。首次部署时，请先创建首个管理员账号，初始化完成后系统会自动关闭该入口。
+        当前版本不内置默认账号。首次部署时，请提供 Bootstrap Secret 并创建首个管理员账号，初始化完成后系统会自动关闭该入口。
      </Paragraph>

      <Alert
@@ -143,15 +145,29 @@ export function BootstrapAdminPage() {
        </Form.Item>
        <Form.Item
          name="email"
-          rules={[{ type: 'email', message: '请输入有效的邮箱地址' }]}
+          rules={[
+            { required: true, message: '请输入管理员邮箱' },
+            { type: 'email', message: '请输入有效的邮箱地址' },
+          ]}
        >
          <Input
            prefix={<MailOutlined />}
-            placeholder="管理员邮箱（选填）"
+            placeholder="管理员邮箱"
            size="large"
            autoComplete="email"
          />
        </Form.Item>
+        <Form.Item
+          name="bootstrapSecret"
+          rules={[{ required: true, message: '请输入 Bootstrap Secret' }]}
+        >
+          <Input.Password
+            prefix={<LockOutlined />}
+            placeholder="Bootstrap Secret"
+            size="large"
+            autoComplete="one-time-code"
+          />
+        </Form.Item>
        <Form.Item
          name="password"
          rules={[{ required: true, message: '请输入管理员密码' }]}
--- a/frontend/admin/src/pages/auth/RegisterPage/RegisterPage.test.tsx
+++ b/frontend/admin/src/pages/auth/RegisterPage/RegisterPage.test.tsx
@@ -41,16 +41,13 @@ const defaultCapabilities: AuthCapabilities = {
 }

 const activeRegisterResponse: RegisterResponse = {
-  user: {
-    id: 2,
-    username: 'new-user',
-    email: 'new-user@example.com',
-    phone: '',
-    nickname: 'New User',
-    avatar: '',
-    status: 1,
-  },
-  message: 'registered successfully',
+  id: 2,
+  username: 'new-user',
+  email: 'new-user@example.com',
+  phone: '',
+  nickname: 'New User',
+  avatar: '',
+  status: 1,
 }

 vi.mock('@/services/auth', () => ({
@@ -61,7 +58,7 @@ vi.mock('@/services/auth', () => ({

 function renderRegisterPage() {
  return render(
-    <MemoryRouter initialEntries={['/register']}>
+    <MemoryRouter future={{ v7_startTransition: true, v7_relativeSplatPath: true }} initialEntries={['/register']}>
      <RegisterPage />
    </MemoryRouter>,
  )
@@ -321,16 +318,13 @@ describe('RegisterPage', () => {
      email_activation: true,
    })
    registerMock.mockResolvedValue({
-      user: {
-        id: 3,
-        username: 'inactive-user',
-        email: 'inactive-user@example.com',
-        phone: '',
-        nickname: 'Inactive User',
-        avatar: '',
-        status: 0,
-      },
-      message: 'registered successfully, please check your email to activate the account',
+      id: 3,
+      username: 'inactive-user',
+      email: 'inactive-user@example.com',
+      phone: '',
+      nickname: 'Inactive User',
+      avatar: '',
+      status: 0,
    })

    renderRegisterPage()
@@ -350,16 +344,13 @@ describe('RegisterPage', () => {

  it('shows the generic activation summary when the new inactive account has no email address', async () => {
    registerMock.mockResolvedValue({
-      user: {
-        id: 4,
-        username: 'inactive-without-email',
-        email: '',
-        phone: '',
-        nickname: '',
-        avatar: '',
-        status: 0,
-      },
-      message: 'registered successfully, activation required',
+      id: 4,
+      username: 'inactive-without-email',
+      email: '',
+      phone: '',
+      nickname: '',
+      avatar: '',
+      status: 0,
    })

    renderRegisterPage()
--- a/frontend/admin/src/pages/auth/RegisterPage/RegisterPage.tsx
+++ b/frontend/admin/src/pages/auth/RegisterPage/RegisterPage.tsx
@@ -38,10 +38,10 @@ type RegisterFormValues = {
  confirmPassword: string
 }

-function buildRegisterSummary(result: RegisterResponse) {
-  if (result.user.status === 0) {
-    if (result.user.email) {
-      return `账号已创建，激活邮件会发送到 ${result.user.email}。请完成激活后再登录。`
+function buildRegisterSummary(user: RegisterResponse) {
+  if (user.status === 0) {
+    if (user.email) {
+      return `账号已创建，激活邮件会发送到 ${user.email}。请完成激活后再登录。`
    }
    return '账号已创建，请按页面提示完成激活后再登录。'
  }
@@ -128,7 +128,7 @@ export function RegisterPage() {
      form.resetFields()
      setSmsCountdown(0)
      setSubmitted(result)
-      message.success(result.user.status === 0 ? '注册成功，请完成邮箱激活' : '注册成功')
+      message.success(result.status === 0 ? '注册成功，请完成邮箱激活' : '注册成功')
    } catch (error) {
      message.error(getErrorMessage(error, '注册失败，请检查输入信息后重试'))
    } finally {
@@ -137,7 +137,7 @@ export function RegisterPage() {
  }, [capabilities.sms_code, form])

  if (submitted) {
-    const activationEmail = submitted.user.email?.trim()
+    const activationEmail = submitted.email?.trim()

    return (
      <AuthLayout>
@@ -146,7 +146,7 @@ export function RegisterPage() {
          title="注册成功"
          subTitle={(
            <Paragraph>
-              <Text strong>{submitted.user.username}</Text>
+              <Text strong>{submitted.username}</Text>
              {' '}
              {buildRegisterSummary(submitted)}
            </Paragraph>
@@ -155,7 +155,7 @@ export function RegisterPage() {
            <Link key="login" to="/login">
              <Button type="primary">返回登录</Button>
            </Link>,
-            submitted.user.status === 0 && activationEmail && capabilities.email_activation ? (
+            submitted.status === 0 && activationEmail && capabilities.email_activation ? (
              <Link key="activation" to={`/activate-account?email=${encodeURIComponent(activationEmail)}`}>
                <Button>重新发送激活邮件</Button>
              </Link>