feat(auth): 接入 DCAuth v2 登录并完善成员管理
- 登录链路改为用户名 + 密码 + 短信验证码 + DCAuth v2 设备签名 - 迁移 014:新增 login_sms_codes / user_devices / device_challenges 与 users.phone - 新增 /api/dcauth/authorize 与 challenge 状态轮询;旧密码登录仅放行未绑定手机号的账号 - 成员管理支持手机号绑定、设备重置、账号改名、昵称与重置密码 - 移除最后一个商户关系时软删除账号,释放用户名、手机号并撤销设备绑定
This commit is contained in:
@@ -267,7 +267,7 @@ func TestDefaultMerchantRolesCanBeEdited(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestMemberCanBeUpdatedOrRemovedWithoutDeletingAccount(t *testing.T) {
|
||||
func TestMemberCanBeUpdatedOrRemovedWithAccountRetired(t *testing.T) {
|
||||
db := newServiceTestDB(t)
|
||||
merchant := model.Merchant{Code: "member-crud", Name: "成员管理商户", Status: model.MerchantStatusActive}
|
||||
actor := model.User{Username: "member-crud-owner", PasswordHash: "hash", Role: model.RoleMerchant, Status: 1}
|
||||
@@ -303,8 +303,11 @@ func TestMemberCanBeUpdatedOrRemovedWithoutDeletingAccount(t *testing.T) {
|
||||
t.Fatalf("remove member: %v", err)
|
||||
}
|
||||
var user model.User
|
||||
if err := db.First(&user, employee.ID).Error; err != nil {
|
||||
t.Fatalf("employee account should remain: %v", err)
|
||||
if err := db.Unscoped().First(&user, employee.ID).Error; err != nil {
|
||||
t.Fatalf("employee account row should be retained for audit: %v", err)
|
||||
}
|
||||
if !user.DeletedAt.Valid {
|
||||
t.Fatal("employee account should be soft-deleted after the last membership is removed")
|
||||
}
|
||||
var count int64
|
||||
if err := db.Model(&model.MerchantMember{}).Where("id = ?", member.ID).Count(&count).Error; err != nil || count != 0 {
|
||||
@@ -532,9 +535,9 @@ func TestUsernameCanBeReusedAfterMerchantAccountSoftDelete(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestRemoveMemberDoesNotReleaseUsername 固化行为:商户侧"移除成员"只删除成员关系,
|
||||
// 登录账号(含用户名)保留,同名用户名仍被占用,无法新建。
|
||||
func TestRemoveMemberDoesNotReleaseUsername(t *testing.T) {
|
||||
// TestRemoveMemberReleasesUsername 固化新行为:移除最后一个商户关系后账号软删除,
|
||||
// 用户名立即释放,可以用同名账号重新建员工。
|
||||
func TestRemoveMemberReleasesUsername(t *testing.T) {
|
||||
db := newServiceTestDB(t)
|
||||
merchant := model.Merchant{Code: "remove-member-keep", Name: "移除成员保留账号", Status: model.MerchantStatusActive}
|
||||
actor := model.User{Username: "remove-member-actor", PasswordHash: "hash", Role: model.RoleMerchant, Status: 1}
|
||||
@@ -560,13 +563,16 @@ func TestRemoveMemberDoesNotReleaseUsername(t *testing.T) {
|
||||
t.Fatalf("remove member: %v", err)
|
||||
}
|
||||
|
||||
// 登录账号仍在(未被删除),用户名继续占用。
|
||||
var kept model.User
|
||||
if err := db.First(&kept, staff.ID).Error; err != nil {
|
||||
t.Fatalf("login account should be retained after member removal: %v", err)
|
||||
// 账号已软删除(保留行供审计),用户名立即释放。
|
||||
var released model.User
|
||||
if err := db.Unscoped().First(&released, staff.ID).Error; err != nil {
|
||||
t.Fatalf("account row should be retained for audit: %v", err)
|
||||
}
|
||||
if !released.DeletedAt.Valid {
|
||||
t.Fatal("account should be soft-deleted after member removal")
|
||||
}
|
||||
userSvc := NewUserService(db, nil)
|
||||
if _, err := userSvc.Create("kf-2", "password123", "新员工", model.RoleMerchant, 0); err == nil {
|
||||
t.Fatalf("username should still be occupied after member removal")
|
||||
if _, err := userSvc.Create("kf-2", "password123", "新员工", model.RoleMerchant, 0); err != nil {
|
||||
t.Fatalf("username should be reusable after member removal: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user