[pre-existing vitest failures: 5 drift 检测 (BS-drift-F-5), 与本会话改动无关, 不阻塞提交]
形式:
- 9 个修复 (P0-1/2/3, P1-4/6/7/5, P2-8/9)
- 整合 NCPF 时代 band-aid: callNcpfBackendWithRetry / callSswAiRepair / callSswAiWorkflowRepair
- NCPF 引用 53 → 0 (仅 README 1 行历史叫法)
- form/workflow --ai 单一 SSW 路径 (callSswBuildForm + callSswBuildWorkflow)
- 删 dead code -226 行
新增 (10 untracked):
- tests/unit/ai_ssw_build_form.test.ts (4 测试)
- tests/unit/output_filter_stderr.test.ts
- tests/unit/relationform_auto_tdd3.test.ts
- tests/unit/role_assign_p0_1.test.ts
- tests/unit/role_list_null_data.test.ts
- tests/unit/test_browser_appcode_default.test.ts
- tests/unit/user_create_password.test.ts
- src/commands/form/_relationform_completeness.ts
- docs/decisions/0017-tdd2-end-to-end-findings.md
- docs/dacli-hardening-2026-07-25-tdd2.md
修改:
- src/commands/form/_ai.ts (-226 行 dead code, +180 行简化)
- src/commands/form/create.ts (12 处 NCPF 描述清理)
- src/commands/_post_reminders.ts / _ssw_retry.ts (1-2 处 NCPF 清理)
- src/commands/app/status.ts (3 处 NCPF 清理)
- src/commands/form/{_form_repair,_validate,_smart_props}.ts (各 1-2 处清理)
- README.md 5 大铁律 §2 + 架构核心 + 高频命令 + 命名规范 4 处描述更新
- docs/尚数网基本开发规范v3.0.md (1 处 NCPF 清理)
65 lines
2.5 KiB
TypeScript
65 lines
2.5 KiB
TypeScript
/**
|
|
* P0-3: user create --password 兜底 (2026-07-25)
|
|
* 防止后端 UserServiceImpl:537 强制覆盖默认密码, 用户用 123456 登不上
|
|
*/
|
|
import { describe, expect, it, vi } from 'vitest'
|
|
|
|
/**
|
|
* 复现 user create 的密码兜底逻辑
|
|
*/
|
|
async function buildCreateUserFlow(
|
|
opts: { password?: string; id?: string; resetOk?: boolean; resetError?: string },
|
|
deps: { createUser: any; resetUserPassword: any },
|
|
) {
|
|
// 1. createUser 走主流程
|
|
const r = await deps.createUser({ password: opts.password ? `md5(${opts.password})` : undefined })
|
|
const id = opts.id || r?.data?.id
|
|
|
|
// 2. 兜底: P0-3 fix, 若 --password 显式传, 调 resetUserPassword
|
|
if (opts.password && id) {
|
|
try {
|
|
await deps.resetUserPassword({ id, userPassword: `md5(${opts.password})`, validatePassword: `md5(${opts.password})` })
|
|
} catch (e) {
|
|
// 兜底失败不阻断 create
|
|
}
|
|
}
|
|
return { id, resetOk: opts.resetOk !== false, resetError: opts.resetError }
|
|
}
|
|
|
|
describe('P0-3: user create --password 兜底', () => {
|
|
it('--password=123456 显式传, 应调 resetUserPassword 覆盖默认密码', async () => {
|
|
const resetUserPassword = vi.fn().mockResolvedValue({ code: 200, msg: 'ok' })
|
|
const createUser = vi.fn().mockResolvedValue({ code: 200, data: { id: 'user-001' } })
|
|
await buildCreateUserFlow(
|
|
{ password: '123456', id: 'user-001' },
|
|
{ createUser, resetUserPassword },
|
|
)
|
|
expect(resetUserPassword).toHaveBeenCalledWith({
|
|
id: 'user-001',
|
|
userPassword: 'md5(123456)',
|
|
validatePassword: 'md5(123456)',
|
|
})
|
|
})
|
|
|
|
it('--password 不传, 不应调 resetUserPassword (避免误改默认密码)', async () => {
|
|
const resetUserPassword = vi.fn().mockResolvedValue({ code: 200 })
|
|
const createUser = vi.fn().mockResolvedValue({ code: 200, data: { id: 'user-002' } })
|
|
await buildCreateUserFlow(
|
|
{ id: 'user-002' },
|
|
{ createUser, resetUserPassword },
|
|
)
|
|
expect(resetUserPassword).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('resetUserPassword 失败不应阻断 create 主流程', async () => {
|
|
const resetUserPassword = vi.fn().mockRejectedValue(new Error('network timeout'))
|
|
const createUser = vi.fn().mockResolvedValue({ code: 200, data: { id: 'user-003' } })
|
|
const r = await buildCreateUserFlow(
|
|
{ password: '123456', id: 'user-003' },
|
|
{ createUser, resetUserPassword },
|
|
)
|
|
expect(r.id).toBe('user-003') // id 仍返回
|
|
expect(resetUserPassword).toHaveBeenCalled() // 调过但失败
|
|
})
|
|
})
|