feat(停用账号): 停用/删除即强制下线并点名成因——写入口、X-Auth-Reason 头、三面接线
- Java:AdminUserUpdateRequest 加 disabled 开关(不能停自己、归属门沿用既有闸), AccountExpiryService/AdminAuthSupport 抛停用/删除子类型,GlobalExceptionHandler 打 X-Auth-Reason: disabled|deleted 响应头;业务码保持 401 不变,不惊动三个既有消费者 - 后台管理:用户页停用/解除停用按钮 + 已停用徽章;拦截器把成因随 &auth= 带给登录页, 登录页分停用/删除两种文案;源码钉子棘轮基线按正路重生成 - 用户端:kick-handler 按 X-Auth-Reason 分支亮停用/删除标记(互斥清理), 登录页两段专属文案且各自关自动登录;跳转目标仍是 /login?expired=1 - 反假绿:摘掉成因头注入实测 2/4 红(变异自证),还原等值后复跑回绿
This commit is contained in:
+143
@@ -0,0 +1,143 @@
|
||||
package com.nanri.aiimage.modules.admin.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.admin.model.dto.AdminUserUpdateRequest;
|
||||
import com.nanri.aiimage.modules.admin.spi.UserSecretCleanupPort;
|
||||
import com.nanri.aiimage.modules.auth.util.WerkzeugPasswordEncoder;
|
||||
import com.nanri.aiimage.modules.company.service.CompanyService;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatCode;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyList;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.isNull;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 停用/解除停用(V155)走 updateUser 的 disabled 开关。
|
||||
*
|
||||
* <p>断言全部打在真正落库的 UPDATE 的 SET 子句上:只 verify(update 被调了一次)
|
||||
* 是把「发了 UPDATE」当成「改了 disabled_at」的假绿。</p>
|
||||
*/
|
||||
class AdminUserDisableTest {
|
||||
|
||||
private AdminUserMapper userMapper;
|
||||
private AdminAuthSupport authSupport;
|
||||
private AdminUserService service;
|
||||
|
||||
@BeforeEach
|
||||
@SuppressWarnings("unchecked")
|
||||
void setUp() {
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""), AdminUserEntity.class);
|
||||
userMapper = mock(AdminUserMapper.class);
|
||||
WerkzeugPasswordEncoder passwordEncoder = mock(WerkzeugPasswordEncoder.class);
|
||||
authSupport = mock(AdminAuthSupport.class);
|
||||
PermissionMenuService permissionService = mock(PermissionMenuService.class);
|
||||
service = new AdminUserService(userMapper, passwordEncoder, authSupport, permissionService,
|
||||
mock(UserSecretCleanupPort.class), mock(CompanyService.class));
|
||||
when(permissionService.hasAnyAdminMenu(any(), anyList())).thenReturn(true);
|
||||
when(passwordEncoder.hash(anyString())).thenReturn("hashed");
|
||||
}
|
||||
|
||||
private AdminUserEntity operator(String role, Long companyId) {
|
||||
AdminUserEntity user = new AdminUserEntity();
|
||||
user.setId("super_admin".equals(role) ? 1L : 10L);
|
||||
user.setUsername("op");
|
||||
user.setRole(role);
|
||||
user.setIsAdmin("normal".equals(role) ? 0 : 1);
|
||||
user.setCreatedById(1L);
|
||||
user.setCompanyId(companyId);
|
||||
when(authSupport.currentRole(user)).thenReturn(role);
|
||||
return user;
|
||||
}
|
||||
|
||||
private AdminUserEntity target(Long createdById) {
|
||||
AdminUserEntity user = new AdminUserEntity();
|
||||
user.setId(20L);
|
||||
user.setUsername("target-user");
|
||||
user.setRole("normal");
|
||||
user.setIsAdmin(0);
|
||||
user.setCreatedById(createdById);
|
||||
when(userMapper.selectById(20L)).thenReturn(user);
|
||||
return user;
|
||||
}
|
||||
|
||||
private AdminUserUpdateRequest disableOnly(Boolean disabled) {
|
||||
AdminUserUpdateRequest request = new AdminUserUpdateRequest();
|
||||
request.setDisabled(disabled);
|
||||
return request;
|
||||
}
|
||||
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
private String setClause() {
|
||||
ArgumentCaptor<LambdaUpdateWrapper> captor = ArgumentCaptor.forClass((Class) LambdaUpdateWrapper.class);
|
||||
verify(userMapper).update(isNull(), captor.capture());
|
||||
String set = captor.getValue().getSqlSet();
|
||||
return set == null ? "" : set;
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("停用:只带 disabled=true 的请求是合法编辑,SET 里真的有 disabled_at")
|
||||
void disablingAloneIsAValidEditAndWritesDisabledAt() {
|
||||
AdminUserEntity op = operator("super_admin", 5L);
|
||||
target(88L);
|
||||
|
||||
assertThatCode(() -> service.updateUser(op, 20L, disableOnly(true))).doesNotThrowAnyException();
|
||||
|
||||
assertThat(setClause()).contains("disabled_at");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("解除停用:清 disabled_at,且不许顺手动收费到期字段")
|
||||
void enablingClearsDisabledAtWithoutTouchingExpiry() {
|
||||
AdminUserEntity op = operator("super_admin", 5L);
|
||||
target(88L);
|
||||
|
||||
assertThatCode(() -> service.updateUser(op, 20L, disableOnly(false))).doesNotThrowAnyException();
|
||||
|
||||
assertThat(setClause()).contains("disabled_at");
|
||||
assertThat(setClause()).doesNotContain("expires_at");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("归属门原样生效:admin 能停自己创建的普通账号")
|
||||
void adminMayDisableOwnNormalAccount() {
|
||||
AdminUserEntity op = operator("admin", 5L);
|
||||
target(op.getId());
|
||||
|
||||
assertThatCode(() -> service.updateUser(op, 20L, disableOnly(true))).doesNotThrowAnyException();
|
||||
|
||||
assertThat(setClause()).contains("disabled_at");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("不能停自己:显式闸门挡住并点名,一条 UPDATE 都不发")
|
||||
void selfDisableIsRefused() {
|
||||
AdminUserEntity op = operator("super_admin", 5L);
|
||||
|
||||
assertThatThrownBy(() -> service.updateUser(op, 1L, disableOnly(true)))
|
||||
.isInstanceOfSatisfying(BusinessException.class, ex -> {
|
||||
assertThat(ex.getCode()).isEqualTo(400);
|
||||
assertThat(ex.getMessage()).contains("不能停用自己的账号");
|
||||
});
|
||||
verify(userMapper, never()).update(any(), any());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user