Merge remote-tracking branch 'origin/master'

src/components/auth/AuthGate.test.tsx

@@ -18,6 +18,7 @@ const authMocks = vi.hoisted(() => ({
   loginWithPhoneCode: vi.fn(),
   logoutAllAuthSessions: vi.fn(),
   logoutAuthUser: vi.fn(),
+  redeemRegistrationInviteCode: vi.fn(),
   resetPassword: vi.fn(),
   sendPhoneLoginCode: vi.fn(),
   startWechatLogin: vi.fn(),
@@ -46,6 +47,7 @@ vi.mock('../../services/authService', () => ({
   loginWithPhoneCode: authMocks.loginWithPhoneCode,
   logoutAllAuthSessions: authMocks.logoutAllAuthSessions,
   logoutAuthUser: authMocks.logoutAuthUser,
+  redeemRegistrationInviteCode: authMocks.redeemRegistrationInviteCode,
   resetPassword: authMocks.resetPassword,
   revokeAuthSession: vi.fn(),
   sendPhoneLoginCode: authMocks.sendPhoneLoginCode,
@@ -84,6 +86,7 @@ const mockUser: AuthUser = {
   loginMethod: 'phone',
   bindingStatus: 'active',
   wechatBound: false,
+  createdAt: new Date().toISOString(),
 };
 
 beforeEach(() => {
@@ -105,6 +108,25 @@ beforeEach(() => {
   authMocks.changePassword.mockResolvedValue(mockUser);
   authMocks.logoutAllAuthSessions.mockResolvedValue(undefined);
   authMocks.logoutAuthUser.mockResolvedValue(undefined);
+  authMocks.redeemRegistrationInviteCode.mockResolvedValue({
+    center: {
+      inviteCode: 'SY12345678',
+      inviteLinkPath: '/?inviteCode=SY12345678',
+      invitedCount: 1,
+      rewardedInviteCount: 1,
+      todayInviterRewardCount: 0,
+      todayInviterRewardRemaining: 3,
+      rewardPoints: 30,
+      hasRedeemedCode: true,
+      boundInviterUserId: 'user_inviter',
+      boundAt: '2026-05-01T00:00:00Z',
+      updatedAt: '2026-05-01T00:00:00Z',
+    },
+    inviteeRewardGranted: true,
+    inviterRewardGranted: true,
+    inviteeBalanceAfter: 30,
+    inviterBalanceAfter: 30,
+  });
   authMocks.resetPassword.mockResolvedValue(mockUser);
   authMocks.sendPhoneLoginCode.mockResolvedValue({
     cooldownSeconds: 60,
@@ -251,7 +273,9 @@ test('auth gate keeps password entry available when login options are empty', as
 test('auth gate falls back to password entry when login options request fails', async () => {
   const user = userEvent.setup();
 
-  authMocks.getAuthLoginOptions.mockRejectedValue(new Error('读取登录方式失败'));
+  authMocks.getAuthLoginOptions.mockRejectedValue(
+    new Error('读取登录方式失败'),
+  );
 
   render(
     <AuthGate>
@@ -294,7 +318,6 @@ test('auth gate opens a login modal for protected actions and resumes after logi
     expect(authMocks.loginWithPhoneCode).toHaveBeenCalledWith(
       '13800000000',
       '123456',
-      undefined,
     );
     expect(authMocks.getCurrentAuthUser).toHaveBeenCalledTimes(1);
     expect(onAuthenticated).toHaveBeenCalledTimes(1);
@@ -303,44 +326,98 @@ test('auth gate opens a login modal for protected actions and resumes after logi
   expect(screen.queryByRole('dialog', { name: '账号入口' })).toBeNull();
 });
 
-test('auth gate opens register tab and preloads invite code from url', async () => {
+test('auth gate hides register entry and opens invite modal for new sms account', async () => {
   const user = userEvent.setup();
   window.history.replaceState(null, '', '/?inviteCode=spring-2026');
   authMocks.getAuthLoginOptions.mockResolvedValue({
     availableLoginMethods: ['phone'],
   });
+  authMocks.loginWithPhoneCode.mockResolvedValueOnce({
+    token: 'jwt-phone-new',
+    user: mockUser,
+    created: true,
+    referral: null,
+  });
 
   render(
     <AuthGate>
       <div>公开内容</div>
+      <ProtectedActionButton onAuthenticated={vi.fn()} />
     </AuthGate>,
   );
 
-  const dialog = await screen.findByRole('dialog', { name: '账号入口' });
-  await waitFor(() => {
-    expect(
-      within(dialog)
-        .getByRole('tab', { name: '注册' })
-        .getAttribute('aria-selected'),
-    ).toBe('true');
-  });
-  expect(
-    (within(dialog).getByLabelText('邀请码') as HTMLInputElement).value,
-  ).toBe('SPRING2026');
+  expect(await screen.findByText('公开内容')).toBeTruthy();
+  expect(screen.queryByRole('dialog', { name: '账号入口' })).toBeNull();
 
+  await user.click(screen.getByRole('button', { name: '进入作品' }));
+  const dialog = await screen.findByRole('dialog', { name: '账号入口' });
+  expect(within(dialog).queryByRole('tab', { name: '注册' })).toBeNull();
+  expect(within(dialog).queryByLabelText('邀请码')).toBeNull();
   await user.type(within(dialog).getByLabelText('手机号'), '13800000000');
   await user.type(within(dialog).getByLabelText('验证码'), '123456');
-  await user.click(within(dialog).getByRole('button', { name: '注册' }));
+  await user.click(within(dialog).getByRole('button', { name: '登录' }));
 
   await waitFor(() => {
     expect(authMocks.loginWithPhoneCode).toHaveBeenCalledWith(
       '13800000000',
       '123456',
+    );
+  });
+
+  const inviteDialog = await screen.findByRole('dialog', {
+    name: '请填写邀请码',
+  });
+  expect(
+    (within(inviteDialog).getByLabelText('邀请码') as HTMLInputElement).value,
+  ).toBe('SPRING2026');
+  expect(
+    within(inviteDialog).getByRole('button', { name: '提交' }),
+  ).toBeTruthy();
+
+  await user.click(within(inviteDialog).getByRole('button', { name: '提交' }));
+
+  await waitFor(() => {
+    expect(authMocks.redeemRegistrationInviteCode).toHaveBeenCalledWith(
       'SPRING2026',
     );
   });
 });
 
+test('registration invite modal can skip when invite code is empty', async () => {
+  const user = userEvent.setup();
+  authMocks.getAuthLoginOptions.mockResolvedValue({
+    availableLoginMethods: ['phone'],
+  });
+  authMocks.loginWithPhoneCode.mockResolvedValueOnce({
+    token: 'jwt-phone-new',
+    user: mockUser,
+    created: true,
+    referral: null,
+  });
+
+  render(
+    <AuthGate>
+      <ProtectedActionButton onAuthenticated={vi.fn()} />
+    </AuthGate>,
+  );
+
+  await user.click(await screen.findByRole('button', { name: '进入作品' }));
+  const dialog = screen.getByRole('dialog', { name: '账号入口' });
+  await user.type(within(dialog).getByLabelText('手机号'), '13800000000');
+  await user.type(within(dialog).getByLabelText('验证码'), '123456');
+  await user.click(within(dialog).getByRole('button', { name: '登录' }));
+
+  const inviteDialog = await screen.findByRole('dialog', {
+    name: '请填写邀请码',
+  });
+  await user.click(within(inviteDialog).getByRole('button', { name: '跳过' }));
+
+  await waitFor(() => {
+    expect(screen.queryByRole('dialog', { name: '请填写邀请码' })).toBeNull();
+  });
+  expect(authMocks.redeemRegistrationInviteCode).not.toHaveBeenCalled();
+});
+
 test('auth state refresh keeps mounted platform content and local tab state', async () => {
   const user = userEvent.setup();
   authMocks.getCurrentAuthUser.mockResolvedValue({