From f639a76b430f6133b2b5664e162068742aff6666 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 19 Jul 2026 20:18:25 +0800 Subject: [PATCH] fix(auth): 拦截禁用用户登录并撤销会员令牌 --- yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/system/oauth2/OAuth2TokenCommonApi.java | 9 +++++++++ yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java | 24 ++++++++++++++++-------- yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java | 9 ++++++++- yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImplStatusTest.java | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplStatusTest.java | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApiImpl.java | 5 +++++ yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java | 31 +++++++++++++++++++------------ yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java | 4 ++-- yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java | 4 ++-- yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java | 4 +++- 11 files changed, 278 insertions(+), 28 deletions(-) create mode 100644 yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImplStatusTest.java create mode 100644 yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplStatusTest.java diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/system/oauth2/OAuth2TokenCommonApi.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/system/oauth2/OAuth2TokenCommonApi.java index c23d936..69da9e6 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/system/oauth2/OAuth2TokenCommonApi.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/system/oauth2/OAuth2TokenCommonApi.java @@ -38,6 +38,15 @@ public interface OAuth2TokenCommonApi { OAuth2AccessTokenRespDTO removeAccessToken(String accessToken); /** + * 移除用户的所有访问令牌 + * 注意:该流程中,会移除相关的刷新令牌 + * + * @param userId 用户编号 + * @param userType 用户类型 + */ + void removeAccessToken(Long userId, Integer userType); + + /** * 刷新访问令牌 * * @param refreshToken 刷新令牌 diff --git a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java index d8c2377..8e1bda1 100644 --- a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java +++ b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java @@ -88,10 +88,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { Assert.notNull(user, "获取用户失败,结果为空"); // 校验是否禁用 - if (CommonStatusEnum.isDisable(user.getStatus())) { - createLoginLog(user.getId(), reqVO.getMobile(), LoginLogTypeEnum.LOGIN_SMS, LoginResultEnum.USER_DISABLED); - throw exception(AUTH_LOGIN_USER_DISABLED); - } + validateUserStatus(user, reqVO.getMobile(), LoginLogTypeEnum.LOGIN_SMS); // 如果 socialType 非空,说明需要绑定社交用户 String openid = null; @@ -128,6 +125,9 @@ public class MemberAuthServiceImpl implements MemberAuthService { throw exception(USER_NOT_EXISTS); } + // 校验是否禁用 + validateUserStatus(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL); + // 创建 Token 令牌,记录登录日志 return createTokenAfterLoginSuccess(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL, socialUser.getOpenid()); } @@ -143,6 +143,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { MemberUserDO user = userService.createUserIfAbsent(phoneNumberInfo.getPurePhoneNumber(), getClientIP(), TerminalEnum.WECHAT_MINI_PROGRAM.getTerminal()); Assert.notNull(user, "获取用户失败,结果为空"); + validateUserStatus(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL); // 绑定社交用户 String openid = socialUserApi.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(), @@ -154,6 +155,9 @@ public class MemberAuthServiceImpl implements MemberAuthService { private AppAuthLoginRespVO createTokenAfterLoginSuccess(MemberUserDO user, String mobile, LoginLogTypeEnum logType, String openid) { + // 统一校验用户状态,避免登录方式增加后遗漏 + validateUserStatus(user, mobile, logType); + // 插入登陆日志 createLoginLog(user.getId(), mobile, logType, LoginResultEnum.SUCCESS); // 创建 Token 令牌 @@ -164,6 +168,13 @@ public class MemberAuthServiceImpl implements MemberAuthService { return AuthConvert.INSTANCE.convert(accessTokenRespDTO, openid); } + private void validateUserStatus(MemberUserDO user, String mobile, LoginLogTypeEnum logType) { + if (CommonStatusEnum.isDisable(user.getStatus())) { + createLoginLog(user.getId(), mobile, logType, LoginResultEnum.USER_DISABLED); + throw exception(AUTH_LOGIN_USER_DISABLED); + } + } + @Override public String getSocialAuthorizeUrl(Integer type, String redirectUri) { return socialClientApi.getAuthorizeUrl(type, UserTypeEnum.MEMBER.getValue(), redirectUri); @@ -182,10 +193,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { throw exception(AUTH_LOGIN_BAD_CREDENTIALS); } // 校验是否禁用 - if (CommonStatusEnum.isDisable(user.getStatus())) { - createLoginLog(user.getId(), mobile, logTypeEnum, LoginResultEnum.USER_DISABLED); - throw exception(AUTH_LOGIN_USER_DISABLED); - } + validateUserStatus(user, mobile, logTypeEnum); return user; } diff --git a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index 7cfbeb5..67a59f8 100644 --- a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.*; +import cn.iocoder.yudao.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -54,9 +55,10 @@ public class MemberUserServiceImpl implements MemberUserService { @Resource private SmsCodeApi smsCodeApi; - @Resource private SocialClientApi socialClientApi; + @Resource + private OAuth2TokenCommonApi oauth2TokenApi; @Resource private PasswordEncoder passwordEncoder; @@ -250,6 +252,11 @@ public class MemberUserServiceImpl implements MemberUserService { // 更新 MemberUserDO updateObj = MemberUserConvert.INSTANCE.convert(updateReqVO); memberUserMapper.updateById(updateObj); + + // 如果是禁用用户,则删除其 Token 信息 + if (CommonStatusEnum.isDisable(updateObj.getStatus())) { + oauth2TokenApi.removeAccessToken(updateObj.getId(), UserTypeEnum.MEMBER.getValue()); + } } @VisibleForTesting diff --git a/yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImplStatusTest.java b/yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImplStatusTest.java new file mode 100644 index 0000000..e63a523 --- /dev/null +++ b/yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImplStatusTest.java @@ -0,0 +1,91 @@ +package cn.iocoder.yudao.module.member.service.auth; + +import cn.iocoder.yudao.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; +import cn.iocoder.yudao.module.member.controller.app.auth.vo.AppAuthSocialLoginReqVO; +import cn.iocoder.yudao.module.member.controller.app.auth.vo.AppAuthWeixinMiniAppLoginReqVO; +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; +import cn.iocoder.yudao.module.member.service.user.MemberUserService; +import cn.iocoder.yudao.module.system.api.logger.LoginLogApi; +import cn.iocoder.yudao.module.system.api.social.SocialClientApi; +import cn.iocoder.yudao.module.system.api.social.SocialUserApi; +import cn.iocoder.yudao.module.system.api.social.dto.SocialUserRespDTO; +import cn.iocoder.yudao.module.system.api.social.dto.SocialWxPhoneNumberInfoRespDTO; +import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; +import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; +import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; + +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.AUTH_LOGIN_USER_DISABLED; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +class MemberAuthServiceImplStatusTest extends BaseMockitoUnitTest { + + @InjectMocks + private MemberAuthServiceImpl authService; + + @Mock + private MemberUserService userService; + @Mock + private LoginLogApi loginLogApi; + @Mock + private SocialUserApi socialUserApi; + @Mock + private SocialClientApi socialClientApi; + @Mock + private OAuth2TokenCommonApi oauth2TokenApi; + + @Test + void testSocialLogin_userDisabled() { + // 准备参数 + AppAuthSocialLoginReqVO reqVO = AppAuthSocialLoginReqVO.builder() + .type(SocialTypeEnum.GITEE.getType()).code("code").state("state").build(); + MemberUserDO user = MemberUserDO.builder().id(1L).mobile("15601691300") + .status(CommonStatusEnum.DISABLE.getStatus()).build(); + when(socialUserApi.getSocialUserByCode(UserTypeEnum.MEMBER.getValue(), reqVO.getType(), + reqVO.getCode(), reqVO.getState())) + .thenReturn(new SocialUserRespDTO("openid", "nickname", "avatar", user.getId())); + when(userService.getUser(user.getId())).thenReturn(user); + + // 调用,并断言 + assertServiceException(() -> authService.socialLogin(reqVO), AUTH_LOGIN_USER_DISABLED); + verify(loginLogApi).createLoginLog(argThat(o -> + o.getLogType().equals(LoginLogTypeEnum.LOGIN_SOCIAL.getType()) + && o.getResult().equals(LoginResultEnum.USER_DISABLED.getResult()) + && o.getUserId().equals(user.getId()))); + verify(oauth2TokenApi, never()).createAccessToken(any()); + } + + @Test + void testWeixinMiniAppLogin_userDisabled() { + // 准备参数 + AppAuthWeixinMiniAppLoginReqVO reqVO = AppAuthWeixinMiniAppLoginReqVO.builder() + .phoneCode("phone-code").loginCode("login-code").state("state").build(); + SocialWxPhoneNumberInfoRespDTO phoneNumberInfo = new SocialWxPhoneNumberInfoRespDTO(); + phoneNumberInfo.setPurePhoneNumber("15601691300"); + when(socialClientApi.getWxMaPhoneNumberInfo(UserTypeEnum.MEMBER.getValue(), reqVO.getPhoneCode())) + .thenReturn(phoneNumberInfo); + MemberUserDO user = MemberUserDO.builder().id(1L).mobile(phoneNumberInfo.getPurePhoneNumber()) + .status(CommonStatusEnum.DISABLE.getStatus()).build(); + when(userService.createUserIfAbsent(eq(phoneNumberInfo.getPurePhoneNumber()), isNull(), anyInt())) + .thenReturn(user); + + // 调用,并断言 + assertServiceException(() -> authService.weixinMiniAppLogin(reqVO), AUTH_LOGIN_USER_DISABLED); + verify(loginLogApi).createLoginLog(argThat(o -> + o.getLogType().equals(LoginLogTypeEnum.LOGIN_SOCIAL.getType()) + && o.getResult().equals(LoginResultEnum.USER_DISABLED.getResult()) + && o.getUserId().equals(user.getId()))); + verify(socialUserApi, never()).bindSocialUser(any()); + verify(oauth2TokenApi, never()).createAccessToken(any()); + } + +} diff --git a/yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplStatusTest.java b/yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplStatusTest.java new file mode 100644 index 0000000..6660d8b --- /dev/null +++ b/yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplStatusTest.java @@ -0,0 +1,63 @@ +package cn.iocoder.yudao.module.member.service.user; + +import cn.iocoder.yudao.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; +import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; + +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +class MemberUserServiceImplStatusTest extends BaseMockitoUnitTest { + + @InjectMocks + private MemberUserServiceImpl userService; + + @Mock + private MemberUserMapper memberUserMapper; + @Mock + private OAuth2TokenCommonApi oauth2TokenApi; + + @Test + void testUpdateUser_disableRevokesToken() { + // 准备参数 + Long userId = 1L; + when(memberUserMapper.selectById(userId)).thenReturn(MemberUserDO.builder().id(userId).build()); + MemberUserUpdateReqVO reqVO = new MemberUserUpdateReqVO(); + reqVO.setId(userId); + reqVO.setStatus(CommonStatusEnum.DISABLE.getStatus().byteValue()); + + // 调用 + userService.updateUser(reqVO); + + // 断言 + verify(memberUserMapper).updateById(argThat((MemberUserDO user) -> user.getId().equals(userId) + && CommonStatusEnum.isDisable(user.getStatus()))); + verify(oauth2TokenApi).removeAccessToken(userId, UserTypeEnum.MEMBER.getValue()); + } + + @Test + void testUpdateUser_enableKeepsToken() { + // 准备参数 + Long userId = 1L; + when(memberUserMapper.selectById(userId)).thenReturn(MemberUserDO.builder().id(userId).build()); + MemberUserUpdateReqVO reqVO = new MemberUserUpdateReqVO(); + reqVO.setId(userId); + reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus().byteValue()); + + // 调用 + userService.updateUser(reqVO); + + // 断言 + verify(oauth2TokenApi, never()).removeAccessToken(userId, UserTypeEnum.MEMBER.getValue()); + } + +} diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApiImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApiImpl.java index 94fed14..60ffdc6 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApiImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApiImpl.java @@ -42,6 +42,11 @@ public class OAuth2TokenApiImpl implements OAuth2TokenCommonApi { } @Override + public void removeAccessToken(Long userId, Integer userType) { + oauth2TokenService.removeAccessToken(userId, userType); + } + + @Override public OAuth2AccessTokenRespDTO refreshAccessToken(String refreshToken, String clientId) { OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.refreshAccessToken(refreshToken, clientId); return BeanUtils.toBean(accessTokenDO, OAuth2AccessTokenRespDTO.class); diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java index 1957b22..52441b9 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java @@ -91,10 +91,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { throw exception(AUTH_LOGIN_BAD_CREDENTIALS); } // 校验是否禁用 - if (CommonStatusEnum.isDisable(user.getStatus())) { - createLoginLog(user.getId(), username, logTypeEnum, LoginResultEnum.USER_DISABLED); - throw exception(AUTH_LOGIN_USER_DISABLED); - } + validateUserStatus(user, username, logTypeEnum); return user; } @@ -113,7 +110,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState())); } // 创建 Token 令牌,记录登录日志 - return createTokenAfterLoginSuccess(user.getId(), reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); + return createTokenAfterLoginSuccess(user, reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); } @Override @@ -146,7 +143,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { } // 创建 Token 令牌,记录登录日志 - return createTokenAfterLoginSuccess(user.getId(), reqVO.getMobile(), LoginLogTypeEnum.LOGIN_MOBILE); + return createTokenAfterLoginSuccess(user, reqVO.getMobile(), LoginLogTypeEnum.LOGIN_MOBILE); } private void createLoginLog(Long userId, String username, @@ -184,7 +181,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { } // 创建 Token 令牌,记录登录日志 - return createTokenAfterLoginSuccess(user.getId(), user.getUsername(), LoginLogTypeEnum.LOGIN_SOCIAL); + return createTokenAfterLoginSuccess(user, user.getUsername(), LoginLogTypeEnum.LOGIN_SOCIAL); } @VisibleForTesting @@ -209,16 +206,26 @@ public class AdminAuthServiceImpl implements AdminAuthService { return captchaService.verification(captchaVO); } - private AuthLoginRespVO createTokenAfterLoginSuccess(Long userId, String username, LoginLogTypeEnum logType) { + private AuthLoginRespVO createTokenAfterLoginSuccess(AdminUserDO user, String username, LoginLogTypeEnum logType) { + // 统一校验用户状态,避免短信、社交等登录方式遗漏 + validateUserStatus(user, username, logType); + // 插入登陆日志 - createLoginLog(userId, username, logType, LoginResultEnum.SUCCESS); + createLoginLog(user.getId(), username, logType, LoginResultEnum.SUCCESS); // 创建访问令牌 - OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.createAccessToken(userId, getUserType().getValue(), + OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.createAccessToken(user.getId(), getUserType().getValue(), OAuth2ClientConstants.CLIENT_ID_DEFAULT, null); // 构建返回结果 return BeanUtils.toBean(accessTokenDO, AuthLoginRespVO.class); } + private void validateUserStatus(AdminUserDO user, String username, LoginLogTypeEnum logType) { + if (CommonStatusEnum.isDisable(user.getStatus())) { + createLoginLog(user.getId(), username, logType, LoginResultEnum.USER_DISABLED); + throw exception(AUTH_LOGIN_USER_DISABLED); + } + } + @Override public AuthLoginRespVO refreshToken(String refreshToken) { OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.refreshAccessToken(refreshToken, OAuth2ClientConstants.CLIENT_ID_DEFAULT); @@ -271,10 +278,10 @@ public class AdminAuthServiceImpl implements AdminAuthService { validateCaptcha(registerReqVO); // 2. 校验用户名是否已存在 - Long userId = userService.registerUser(registerReqVO); + AdminUserDO user = userService.registerUser(registerReqVO); // 3. 创建 Token 令牌,记录登录日志 - return createTokenAfterLoginSuccess(userId, registerReqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); + return createTokenAfterLoginSuccess(user, registerReqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); } @VisibleForTesting diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java index 63d9748..69904cc 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java @@ -38,9 +38,9 @@ public interface AdminUserService { * 注册用户 * * @param registerReqVO 用户信息 - * @return 用户编号 + * @return 用户信息 */ - Long registerUser(@Valid AuthRegisterReqVO registerReqVO); + AdminUserDO registerUser(@Valid AuthRegisterReqVO registerReqVO); /** * 修改用户 diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index d9dd5c8..8159ee8 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -124,7 +124,7 @@ public class AdminUserServiceImpl implements AdminUserService { } @Override - public Long registerUser(AuthRegisterReqVO registerReqVO) { + public AdminUserDO registerUser(AuthRegisterReqVO registerReqVO) { // 1.1 校验是否开启注册 if (ObjUtil.notEqual(configApi.getConfigValueByKey(USER_REGISTER_ENABLED_KEY), "true")) { throw exception(USER_REGISTER_DISABLED); @@ -144,7 +144,7 @@ public class AdminUserServiceImpl implements AdminUserService { user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启 user.setPassword(encodePassword(registerReqVO.getPassword())); // 加密密码 userMapper.insert(user); - return user.getId(); + return user; } @Override diff --git a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java index 0475437..0883249 100644 --- a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java +++ b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java @@ -215,7 +215,8 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest { return true; }))); // mock 方法(用户信息) - AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L)); + AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L) + .setStatus(CommonStatusEnum.ENABLE.getStatus())); when(userService.getUserByMobile(eq(mobile))).thenReturn(user); // mock 缓存登录用户到 Redis OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class, o -> o.setUserId(1L) @@ -243,7 +244,8 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest { when(socialUserService.getSocialUserByCode(eq(UserTypeEnum.ADMIN.getValue()), eq(reqVO.getType()), eq(reqVO.getCode()), eq(reqVO.getState()))).thenReturn(new SocialUserRespDTO(randomString(), randomString(), randomString(), userId)); // mock(用户) - AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(userId)); + AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(userId) + .setStatus(CommonStatusEnum.ENABLE.getStatus())); when(userService.getUser(eq(userId))).thenReturn(user); // mock 缓存登录用户到 Redis OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class, o -> o.setUserId(1L) @@ -263,6 +265,62 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest { } @Test + public void testSmsLogin_userDisabled() { + // 准备参数 + AuthSmsLoginReqVO reqVO = new AuthSmsLoginReqVO(randomString(), randomString()); + AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())); + when(userService.getUserByMobile(eq(reqVO.getMobile()))).thenReturn(user); + + // 调用,并断言 + assertServiceException(() -> authService.smsLogin(reqVO), AUTH_LOGIN_USER_DISABLED); + verify(loginLogService).createLoginLog(argThat(o -> + o.getLogType().equals(LoginLogTypeEnum.LOGIN_MOBILE.getType()) + && o.getResult().equals(LoginResultEnum.USER_DISABLED.getResult()) + && o.getUserId().equals(user.getId()))); + verify(oauth2TokenService, never()).createAccessToken(anyLong(), anyInt(), anyString(), any()); + } + + @Test + public void testSocialLogin_userDisabled() { + // 准备参数 + AuthSocialLoginReqVO reqVO = randomPojo(AuthSocialLoginReqVO.class); + Long userId = 1L; + when(socialUserService.getSocialUserByCode(eq(UserTypeEnum.ADMIN.getValue()), eq(reqVO.getType()), + eq(reqVO.getCode()), eq(reqVO.getState()))) + .thenReturn(new SocialUserRespDTO(randomString(), randomString(), randomString(), userId)); + AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(userId) + .setStatus(CommonStatusEnum.DISABLE.getStatus())); + when(userService.getUser(eq(userId))).thenReturn(user); + + // 调用,并断言 + assertServiceException(() -> authService.socialLogin(reqVO), AUTH_LOGIN_USER_DISABLED); + verify(loginLogService).createLoginLog(argThat(o -> + o.getLogType().equals(LoginLogTypeEnum.LOGIN_SOCIAL.getType()) + && o.getResult().equals(LoginResultEnum.USER_DISABLED.getResult()) + && o.getUserId().equals(user.getId()))); + verify(oauth2TokenService, never()).createAccessToken(anyLong(), anyInt(), anyString(), any()); + } + + @Test + public void testRegister_success() { + // 准备参数 + AuthRegisterReqVO reqVO = randomPojo(AuthRegisterReqVO.class); + authService.setCaptchaEnable(false); + AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L) + .setUsername(reqVO.getUsername()).setStatus(CommonStatusEnum.ENABLE.getStatus())); + when(userService.registerUser(reqVO)).thenReturn(user); + OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class, o -> o.setUserId(user.getId()) + .setUserType(UserTypeEnum.ADMIN.getValue())); + when(oauth2TokenService.createAccessToken(eq(user.getId()), eq(UserTypeEnum.ADMIN.getValue()), + eq("default"), isNull())).thenReturn(accessTokenDO); + + // 调用,并断言 + AuthLoginRespVO loginRespVO = authService.register(reqVO); + assertPojoEquals(accessTokenDO, loginRespVO); + verify(userService, never()).getUser(anyLong()); + } + + @Test public void testValidateCaptcha_successWithEnable() { // 准备参数 AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class); diff --git a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java index 1716226..5d4cd40 100644 --- a/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java +++ b/yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.service.user; import cn.hutool.core.util.RandomUtil; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.common.exception.ServiceException; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; @@ -278,13 +279,14 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest { userMapper.insert(dbUser); // 准备参数 Long userId = dbUser.getId(); - Integer status = randomCommonStatus(); + Integer status = CommonStatusEnum.DISABLE.getStatus(); // 调用 userService.updateUserStatus(userId, status); // 断言 AdminUserDO user = userMapper.selectById(userId); assertEquals(status, user.getStatus()); + verify(oauth2TokenService).removeAccessToken(userId, UserTypeEnum.ADMIN.getValue()); } @Test -- libgit2 0.21.4