Commit f639a76b430f6133b2b5664e162068742aff6666
1 parent
5b5bd40b
fix(auth): 拦截禁用用户登录并撤销会员令牌
Showing
11 changed files
with
278 additions
and
28 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/system/oauth2/OAuth2TokenCommonApi.java
| ... | ... | @@ -38,6 +38,15 @@ public interface OAuth2TokenCommonApi { |
| 38 | 38 | OAuth2AccessTokenRespDTO removeAccessToken(String accessToken); |
| 39 | 39 | |
| 40 | 40 | /** |
| 41 | + * 移除用户的所有访问令牌 | |
| 42 | + * 注意:该流程中,会移除相关的刷新令牌 | |
| 43 | + * | |
| 44 | + * @param userId 用户编号 | |
| 45 | + * @param userType 用户类型 | |
| 46 | + */ | |
| 47 | + void removeAccessToken(Long userId, Integer userType); | |
| 48 | + | |
| 49 | + /** | |
| 41 | 50 | * 刷新访问令牌 |
| 42 | 51 | * |
| 43 | 52 | * @param refreshToken 刷新令牌 | ... | ... |
yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
| ... | ... | @@ -88,10 +88,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { |
| 88 | 88 | Assert.notNull(user, "获取用户失败,结果为空"); |
| 89 | 89 | |
| 90 | 90 | // 校验是否禁用 |
| 91 | - if (CommonStatusEnum.isDisable(user.getStatus())) { | |
| 92 | - createLoginLog(user.getId(), reqVO.getMobile(), LoginLogTypeEnum.LOGIN_SMS, LoginResultEnum.USER_DISABLED); | |
| 93 | - throw exception(AUTH_LOGIN_USER_DISABLED); | |
| 94 | - } | |
| 91 | + validateUserStatus(user, reqVO.getMobile(), LoginLogTypeEnum.LOGIN_SMS); | |
| 95 | 92 | |
| 96 | 93 | // 如果 socialType 非空,说明需要绑定社交用户 |
| 97 | 94 | String openid = null; |
| ... | ... | @@ -128,6 +125,9 @@ public class MemberAuthServiceImpl implements MemberAuthService { |
| 128 | 125 | throw exception(USER_NOT_EXISTS); |
| 129 | 126 | } |
| 130 | 127 | |
| 128 | + // 校验是否禁用 | |
| 129 | + validateUserStatus(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL); | |
| 130 | + | |
| 131 | 131 | // 创建 Token 令牌,记录登录日志 |
| 132 | 132 | return createTokenAfterLoginSuccess(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL, socialUser.getOpenid()); |
| 133 | 133 | } |
| ... | ... | @@ -143,6 +143,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { |
| 143 | 143 | MemberUserDO user = userService.createUserIfAbsent(phoneNumberInfo.getPurePhoneNumber(), |
| 144 | 144 | getClientIP(), TerminalEnum.WECHAT_MINI_PROGRAM.getTerminal()); |
| 145 | 145 | Assert.notNull(user, "获取用户失败,结果为空"); |
| 146 | + validateUserStatus(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL); | |
| 146 | 147 | |
| 147 | 148 | // 绑定社交用户 |
| 148 | 149 | String openid = socialUserApi.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(), |
| ... | ... | @@ -154,6 +155,9 @@ public class MemberAuthServiceImpl implements MemberAuthService { |
| 154 | 155 | |
| 155 | 156 | private AppAuthLoginRespVO createTokenAfterLoginSuccess(MemberUserDO user, String mobile, |
| 156 | 157 | LoginLogTypeEnum logType, String openid) { |
| 158 | + // 统一校验用户状态,避免登录方式增加后遗漏 | |
| 159 | + validateUserStatus(user, mobile, logType); | |
| 160 | + | |
| 157 | 161 | // 插入登陆日志 |
| 158 | 162 | createLoginLog(user.getId(), mobile, logType, LoginResultEnum.SUCCESS); |
| 159 | 163 | // 创建 Token 令牌 |
| ... | ... | @@ -164,6 +168,13 @@ public class MemberAuthServiceImpl implements MemberAuthService { |
| 164 | 168 | return AuthConvert.INSTANCE.convert(accessTokenRespDTO, openid); |
| 165 | 169 | } |
| 166 | 170 | |
| 171 | + private void validateUserStatus(MemberUserDO user, String mobile, LoginLogTypeEnum logType) { | |
| 172 | + if (CommonStatusEnum.isDisable(user.getStatus())) { | |
| 173 | + createLoginLog(user.getId(), mobile, logType, LoginResultEnum.USER_DISABLED); | |
| 174 | + throw exception(AUTH_LOGIN_USER_DISABLED); | |
| 175 | + } | |
| 176 | + } | |
| 177 | + | |
| 167 | 178 | @Override |
| 168 | 179 | public String getSocialAuthorizeUrl(Integer type, String redirectUri) { |
| 169 | 180 | return socialClientApi.getAuthorizeUrl(type, UserTypeEnum.MEMBER.getValue(), redirectUri); |
| ... | ... | @@ -182,10 +193,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { |
| 182 | 193 | throw exception(AUTH_LOGIN_BAD_CREDENTIALS); |
| 183 | 194 | } |
| 184 | 195 | // 校验是否禁用 |
| 185 | - if (CommonStatusEnum.isDisable(user.getStatus())) { | |
| 186 | - createLoginLog(user.getId(), mobile, logTypeEnum, LoginResultEnum.USER_DISABLED); | |
| 187 | - throw exception(AUTH_LOGIN_USER_DISABLED); | |
| 188 | - } | |
| 196 | + validateUserStatus(user, mobile, logTypeEnum); | |
| 189 | 197 | return user; |
| 190 | 198 | } |
| 191 | 199 | ... | ... |
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; |
| 4 | 4 | import cn.hutool.core.collection.ListUtil; |
| 5 | 5 | import cn.hutool.core.lang.Assert; |
| 6 | 6 | import cn.hutool.core.util.*; |
| 7 | +import cn.iocoder.yudao.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; | |
| 7 | 8 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 8 | 9 | import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; |
| 9 | 10 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| ... | ... | @@ -54,9 +55,10 @@ public class MemberUserServiceImpl implements MemberUserService { |
| 54 | 55 | |
| 55 | 56 | @Resource |
| 56 | 57 | private SmsCodeApi smsCodeApi; |
| 57 | - | |
| 58 | 58 | @Resource |
| 59 | 59 | private SocialClientApi socialClientApi; |
| 60 | + @Resource | |
| 61 | + private OAuth2TokenCommonApi oauth2TokenApi; | |
| 60 | 62 | |
| 61 | 63 | @Resource |
| 62 | 64 | private PasswordEncoder passwordEncoder; |
| ... | ... | @@ -250,6 +252,11 @@ public class MemberUserServiceImpl implements MemberUserService { |
| 250 | 252 | // 更新 |
| 251 | 253 | MemberUserDO updateObj = MemberUserConvert.INSTANCE.convert(updateReqVO); |
| 252 | 254 | memberUserMapper.updateById(updateObj); |
| 255 | + | |
| 256 | + // 如果是禁用用户,则删除其 Token 信息 | |
| 257 | + if (CommonStatusEnum.isDisable(updateObj.getStatus())) { | |
| 258 | + oauth2TokenApi.removeAccessToken(updateObj.getId(), UserTypeEnum.MEMBER.getValue()); | |
| 259 | + } | |
| 253 | 260 | } |
| 254 | 261 | |
| 255 | 262 | @VisibleForTesting | ... | ... |
yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImplStatusTest.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.auth; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 6 | +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; | |
| 7 | +import cn.iocoder.yudao.module.member.controller.app.auth.vo.AppAuthSocialLoginReqVO; | |
| 8 | +import cn.iocoder.yudao.module.member.controller.app.auth.vo.AppAuthWeixinMiniAppLoginReqVO; | |
| 9 | +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | |
| 10 | +import cn.iocoder.yudao.module.member.service.user.MemberUserService; | |
| 11 | +import cn.iocoder.yudao.module.system.api.logger.LoginLogApi; | |
| 12 | +import cn.iocoder.yudao.module.system.api.social.SocialClientApi; | |
| 13 | +import cn.iocoder.yudao.module.system.api.social.SocialUserApi; | |
| 14 | +import cn.iocoder.yudao.module.system.api.social.dto.SocialUserRespDTO; | |
| 15 | +import cn.iocoder.yudao.module.system.api.social.dto.SocialWxPhoneNumberInfoRespDTO; | |
| 16 | +import cn.iocoder.yudao.module.system.enums.logger.LoginLogTypeEnum; | |
| 17 | +import cn.iocoder.yudao.module.system.enums.logger.LoginResultEnum; | |
| 18 | +import cn.iocoder.yudao.module.system.enums.social.SocialTypeEnum; | |
| 19 | +import org.junit.jupiter.api.Test; | |
| 20 | +import org.mockito.InjectMocks; | |
| 21 | +import org.mockito.Mock; | |
| 22 | + | |
| 23 | +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; | |
| 24 | +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.AUTH_LOGIN_USER_DISABLED; | |
| 25 | +import static org.mockito.ArgumentMatchers.*; | |
| 26 | +import static org.mockito.Mockito.never; | |
| 27 | +import static org.mockito.Mockito.verify; | |
| 28 | +import static org.mockito.Mockito.when; | |
| 29 | + | |
| 30 | +class MemberAuthServiceImplStatusTest extends BaseMockitoUnitTest { | |
| 31 | + | |
| 32 | + @InjectMocks | |
| 33 | + private MemberAuthServiceImpl authService; | |
| 34 | + | |
| 35 | + @Mock | |
| 36 | + private MemberUserService userService; | |
| 37 | + @Mock | |
| 38 | + private LoginLogApi loginLogApi; | |
| 39 | + @Mock | |
| 40 | + private SocialUserApi socialUserApi; | |
| 41 | + @Mock | |
| 42 | + private SocialClientApi socialClientApi; | |
| 43 | + @Mock | |
| 44 | + private OAuth2TokenCommonApi oauth2TokenApi; | |
| 45 | + | |
| 46 | + @Test | |
| 47 | + void testSocialLogin_userDisabled() { | |
| 48 | + // 准备参数 | |
| 49 | + AppAuthSocialLoginReqVO reqVO = AppAuthSocialLoginReqVO.builder() | |
| 50 | + .type(SocialTypeEnum.GITEE.getType()).code("code").state("state").build(); | |
| 51 | + MemberUserDO user = MemberUserDO.builder().id(1L).mobile("15601691300") | |
| 52 | + .status(CommonStatusEnum.DISABLE.getStatus()).build(); | |
| 53 | + when(socialUserApi.getSocialUserByCode(UserTypeEnum.MEMBER.getValue(), reqVO.getType(), | |
| 54 | + reqVO.getCode(), reqVO.getState())) | |
| 55 | + .thenReturn(new SocialUserRespDTO("openid", "nickname", "avatar", user.getId())); | |
| 56 | + when(userService.getUser(user.getId())).thenReturn(user); | |
| 57 | + | |
| 58 | + // 调用,并断言 | |
| 59 | + assertServiceException(() -> authService.socialLogin(reqVO), AUTH_LOGIN_USER_DISABLED); | |
| 60 | + verify(loginLogApi).createLoginLog(argThat(o -> | |
| 61 | + o.getLogType().equals(LoginLogTypeEnum.LOGIN_SOCIAL.getType()) | |
| 62 | + && o.getResult().equals(LoginResultEnum.USER_DISABLED.getResult()) | |
| 63 | + && o.getUserId().equals(user.getId()))); | |
| 64 | + verify(oauth2TokenApi, never()).createAccessToken(any()); | |
| 65 | + } | |
| 66 | + | |
| 67 | + @Test | |
| 68 | + void testWeixinMiniAppLogin_userDisabled() { | |
| 69 | + // 准备参数 | |
| 70 | + AppAuthWeixinMiniAppLoginReqVO reqVO = AppAuthWeixinMiniAppLoginReqVO.builder() | |
| 71 | + .phoneCode("phone-code").loginCode("login-code").state("state").build(); | |
| 72 | + SocialWxPhoneNumberInfoRespDTO phoneNumberInfo = new SocialWxPhoneNumberInfoRespDTO(); | |
| 73 | + phoneNumberInfo.setPurePhoneNumber("15601691300"); | |
| 74 | + when(socialClientApi.getWxMaPhoneNumberInfo(UserTypeEnum.MEMBER.getValue(), reqVO.getPhoneCode())) | |
| 75 | + .thenReturn(phoneNumberInfo); | |
| 76 | + MemberUserDO user = MemberUserDO.builder().id(1L).mobile(phoneNumberInfo.getPurePhoneNumber()) | |
| 77 | + .status(CommonStatusEnum.DISABLE.getStatus()).build(); | |
| 78 | + when(userService.createUserIfAbsent(eq(phoneNumberInfo.getPurePhoneNumber()), isNull(), anyInt())) | |
| 79 | + .thenReturn(user); | |
| 80 | + | |
| 81 | + // 调用,并断言 | |
| 82 | + assertServiceException(() -> authService.weixinMiniAppLogin(reqVO), AUTH_LOGIN_USER_DISABLED); | |
| 83 | + verify(loginLogApi).createLoginLog(argThat(o -> | |
| 84 | + o.getLogType().equals(LoginLogTypeEnum.LOGIN_SOCIAL.getType()) | |
| 85 | + && o.getResult().equals(LoginResultEnum.USER_DISABLED.getResult()) | |
| 86 | + && o.getUserId().equals(user.getId()))); | |
| 87 | + verify(socialUserApi, never()).bindSocialUser(any()); | |
| 88 | + verify(oauth2TokenApi, never()).createAccessToken(any()); | |
| 89 | + } | |
| 90 | + | |
| 91 | +} | ... | ... |
yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplStatusTest.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.user; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; | |
| 4 | +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | |
| 5 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 6 | +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; | |
| 7 | +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; | |
| 8 | +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; | |
| 9 | +import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper; | |
| 10 | +import org.junit.jupiter.api.Test; | |
| 11 | +import org.mockito.InjectMocks; | |
| 12 | +import org.mockito.Mock; | |
| 13 | + | |
| 14 | +import static org.mockito.ArgumentMatchers.argThat; | |
| 15 | +import static org.mockito.Mockito.never; | |
| 16 | +import static org.mockito.Mockito.verify; | |
| 17 | +import static org.mockito.Mockito.when; | |
| 18 | + | |
| 19 | +class MemberUserServiceImplStatusTest extends BaseMockitoUnitTest { | |
| 20 | + | |
| 21 | + @InjectMocks | |
| 22 | + private MemberUserServiceImpl userService; | |
| 23 | + | |
| 24 | + @Mock | |
| 25 | + private MemberUserMapper memberUserMapper; | |
| 26 | + @Mock | |
| 27 | + private OAuth2TokenCommonApi oauth2TokenApi; | |
| 28 | + | |
| 29 | + @Test | |
| 30 | + void testUpdateUser_disableRevokesToken() { | |
| 31 | + // 准备参数 | |
| 32 | + Long userId = 1L; | |
| 33 | + when(memberUserMapper.selectById(userId)).thenReturn(MemberUserDO.builder().id(userId).build()); | |
| 34 | + MemberUserUpdateReqVO reqVO = new MemberUserUpdateReqVO(); | |
| 35 | + reqVO.setId(userId); | |
| 36 | + reqVO.setStatus(CommonStatusEnum.DISABLE.getStatus().byteValue()); | |
| 37 | + | |
| 38 | + // 调用 | |
| 39 | + userService.updateUser(reqVO); | |
| 40 | + | |
| 41 | + // 断言 | |
| 42 | + verify(memberUserMapper).updateById(argThat((MemberUserDO user) -> user.getId().equals(userId) | |
| 43 | + && CommonStatusEnum.isDisable(user.getStatus()))); | |
| 44 | + verify(oauth2TokenApi).removeAccessToken(userId, UserTypeEnum.MEMBER.getValue()); | |
| 45 | + } | |
| 46 | + | |
| 47 | + @Test | |
| 48 | + void testUpdateUser_enableKeepsToken() { | |
| 49 | + // 准备参数 | |
| 50 | + Long userId = 1L; | |
| 51 | + when(memberUserMapper.selectById(userId)).thenReturn(MemberUserDO.builder().id(userId).build()); | |
| 52 | + MemberUserUpdateReqVO reqVO = new MemberUserUpdateReqVO(); | |
| 53 | + reqVO.setId(userId); | |
| 54 | + reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus().byteValue()); | |
| 55 | + | |
| 56 | + // 调用 | |
| 57 | + userService.updateUser(reqVO); | |
| 58 | + | |
| 59 | + // 断言 | |
| 60 | + verify(oauth2TokenApi, never()).removeAccessToken(userId, UserTypeEnum.MEMBER.getValue()); | |
| 61 | + } | |
| 62 | + | |
| 63 | +} | ... | ... |
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/oauth2/OAuth2TokenApiImpl.java
| ... | ... | @@ -42,6 +42,11 @@ public class OAuth2TokenApiImpl implements OAuth2TokenCommonApi { |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | @Override |
| 45 | + public void removeAccessToken(Long userId, Integer userType) { | |
| 46 | + oauth2TokenService.removeAccessToken(userId, userType); | |
| 47 | + } | |
| 48 | + | |
| 49 | + @Override | |
| 45 | 50 | public OAuth2AccessTokenRespDTO refreshAccessToken(String refreshToken, String clientId) { |
| 46 | 51 | OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.refreshAccessToken(refreshToken, clientId); |
| 47 | 52 | return BeanUtils.toBean(accessTokenDO, OAuth2AccessTokenRespDTO.class); | ... | ... |
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
| ... | ... | @@ -91,10 +91,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { |
| 91 | 91 | throw exception(AUTH_LOGIN_BAD_CREDENTIALS); |
| 92 | 92 | } |
| 93 | 93 | // 校验是否禁用 |
| 94 | - if (CommonStatusEnum.isDisable(user.getStatus())) { | |
| 95 | - createLoginLog(user.getId(), username, logTypeEnum, LoginResultEnum.USER_DISABLED); | |
| 96 | - throw exception(AUTH_LOGIN_USER_DISABLED); | |
| 97 | - } | |
| 94 | + validateUserStatus(user, username, logTypeEnum); | |
| 98 | 95 | return user; |
| 99 | 96 | } |
| 100 | 97 | |
| ... | ... | @@ -113,7 +110,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { |
| 113 | 110 | reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState())); |
| 114 | 111 | } |
| 115 | 112 | // 创建 Token 令牌,记录登录日志 |
| 116 | - return createTokenAfterLoginSuccess(user.getId(), reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); | |
| 113 | + return createTokenAfterLoginSuccess(user, reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); | |
| 117 | 114 | } |
| 118 | 115 | |
| 119 | 116 | @Override |
| ... | ... | @@ -146,7 +143,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { |
| 146 | 143 | } |
| 147 | 144 | |
| 148 | 145 | // 创建 Token 令牌,记录登录日志 |
| 149 | - return createTokenAfterLoginSuccess(user.getId(), reqVO.getMobile(), LoginLogTypeEnum.LOGIN_MOBILE); | |
| 146 | + return createTokenAfterLoginSuccess(user, reqVO.getMobile(), LoginLogTypeEnum.LOGIN_MOBILE); | |
| 150 | 147 | } |
| 151 | 148 | |
| 152 | 149 | private void createLoginLog(Long userId, String username, |
| ... | ... | @@ -184,7 +181,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { |
| 184 | 181 | } |
| 185 | 182 | |
| 186 | 183 | // 创建 Token 令牌,记录登录日志 |
| 187 | - return createTokenAfterLoginSuccess(user.getId(), user.getUsername(), LoginLogTypeEnum.LOGIN_SOCIAL); | |
| 184 | + return createTokenAfterLoginSuccess(user, user.getUsername(), LoginLogTypeEnum.LOGIN_SOCIAL); | |
| 188 | 185 | } |
| 189 | 186 | |
| 190 | 187 | @VisibleForTesting |
| ... | ... | @@ -209,16 +206,26 @@ public class AdminAuthServiceImpl implements AdminAuthService { |
| 209 | 206 | return captchaService.verification(captchaVO); |
| 210 | 207 | } |
| 211 | 208 | |
| 212 | - private AuthLoginRespVO createTokenAfterLoginSuccess(Long userId, String username, LoginLogTypeEnum logType) { | |
| 209 | + private AuthLoginRespVO createTokenAfterLoginSuccess(AdminUserDO user, String username, LoginLogTypeEnum logType) { | |
| 210 | + // 统一校验用户状态,避免短信、社交等登录方式遗漏 | |
| 211 | + validateUserStatus(user, username, logType); | |
| 212 | + | |
| 213 | 213 | // 插入登陆日志 |
| 214 | - createLoginLog(userId, username, logType, LoginResultEnum.SUCCESS); | |
| 214 | + createLoginLog(user.getId(), username, logType, LoginResultEnum.SUCCESS); | |
| 215 | 215 | // 创建访问令牌 |
| 216 | - OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.createAccessToken(userId, getUserType().getValue(), | |
| 216 | + OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.createAccessToken(user.getId(), getUserType().getValue(), | |
| 217 | 217 | OAuth2ClientConstants.CLIENT_ID_DEFAULT, null); |
| 218 | 218 | // 构建返回结果 |
| 219 | 219 | return BeanUtils.toBean(accessTokenDO, AuthLoginRespVO.class); |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | + private void validateUserStatus(AdminUserDO user, String username, LoginLogTypeEnum logType) { | |
| 223 | + if (CommonStatusEnum.isDisable(user.getStatus())) { | |
| 224 | + createLoginLog(user.getId(), username, logType, LoginResultEnum.USER_DISABLED); | |
| 225 | + throw exception(AUTH_LOGIN_USER_DISABLED); | |
| 226 | + } | |
| 227 | + } | |
| 228 | + | |
| 222 | 229 | @Override |
| 223 | 230 | public AuthLoginRespVO refreshToken(String refreshToken) { |
| 224 | 231 | OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.refreshAccessToken(refreshToken, OAuth2ClientConstants.CLIENT_ID_DEFAULT); |
| ... | ... | @@ -271,10 +278,10 @@ public class AdminAuthServiceImpl implements AdminAuthService { |
| 271 | 278 | validateCaptcha(registerReqVO); |
| 272 | 279 | |
| 273 | 280 | // 2. 校验用户名是否已存在 |
| 274 | - Long userId = userService.registerUser(registerReqVO); | |
| 281 | + AdminUserDO user = userService.registerUser(registerReqVO); | |
| 275 | 282 | |
| 276 | 283 | // 3. 创建 Token 令牌,记录登录日志 |
| 277 | - return createTokenAfterLoginSuccess(userId, registerReqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); | |
| 284 | + return createTokenAfterLoginSuccess(user, registerReqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); | |
| 278 | 285 | } |
| 279 | 286 | |
| 280 | 287 | @VisibleForTesting | ... | ... |
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
| ... | ... | @@ -38,9 +38,9 @@ public interface AdminUserService { |
| 38 | 38 | * 注册用户 |
| 39 | 39 | * |
| 40 | 40 | * @param registerReqVO 用户信息 |
| 41 | - * @return 用户编号 | |
| 41 | + * @return 用户信息 | |
| 42 | 42 | */ |
| 43 | - Long registerUser(@Valid AuthRegisterReqVO registerReqVO); | |
| 43 | + AdminUserDO registerUser(@Valid AuthRegisterReqVO registerReqVO); | |
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * 修改用户 | ... | ... |
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
| ... | ... | @@ -124,7 +124,7 @@ public class AdminUserServiceImpl implements AdminUserService { |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | @Override |
| 127 | - public Long registerUser(AuthRegisterReqVO registerReqVO) { | |
| 127 | + public AdminUserDO registerUser(AuthRegisterReqVO registerReqVO) { | |
| 128 | 128 | // 1.1 校验是否开启注册 |
| 129 | 129 | if (ObjUtil.notEqual(configApi.getConfigValueByKey(USER_REGISTER_ENABLED_KEY), "true")) { |
| 130 | 130 | throw exception(USER_REGISTER_DISABLED); |
| ... | ... | @@ -144,7 +144,7 @@ public class AdminUserServiceImpl implements AdminUserService { |
| 144 | 144 | user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启 |
| 145 | 145 | user.setPassword(encodePassword(registerReqVO.getPassword())); // 加密密码 |
| 146 | 146 | userMapper.insert(user); |
| 147 | - return user.getId(); | |
| 147 | + return user; | |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | @Override | ... | ... |
yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
| ... | ... | @@ -215,7 +215,8 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest { |
| 215 | 215 | return true; |
| 216 | 216 | }))); |
| 217 | 217 | // mock 方法(用户信息) |
| 218 | - AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L)); | |
| 218 | + AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L) | |
| 219 | + .setStatus(CommonStatusEnum.ENABLE.getStatus())); | |
| 219 | 220 | when(userService.getUserByMobile(eq(mobile))).thenReturn(user); |
| 220 | 221 | // mock 缓存登录用户到 Redis |
| 221 | 222 | OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class, o -> o.setUserId(1L) |
| ... | ... | @@ -243,7 +244,8 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest { |
| 243 | 244 | when(socialUserService.getSocialUserByCode(eq(UserTypeEnum.ADMIN.getValue()), eq(reqVO.getType()), |
| 244 | 245 | eq(reqVO.getCode()), eq(reqVO.getState()))).thenReturn(new SocialUserRespDTO(randomString(), randomString(), randomString(), userId)); |
| 245 | 246 | // mock(用户) |
| 246 | - AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(userId)); | |
| 247 | + AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(userId) | |
| 248 | + .setStatus(CommonStatusEnum.ENABLE.getStatus())); | |
| 247 | 249 | when(userService.getUser(eq(userId))).thenReturn(user); |
| 248 | 250 | // mock 缓存登录用户到 Redis |
| 249 | 251 | OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class, o -> o.setUserId(1L) |
| ... | ... | @@ -263,6 +265,62 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest { |
| 263 | 265 | } |
| 264 | 266 | |
| 265 | 267 | @Test |
| 268 | + public void testSmsLogin_userDisabled() { | |
| 269 | + // 准备参数 | |
| 270 | + AuthSmsLoginReqVO reqVO = new AuthSmsLoginReqVO(randomString(), randomString()); | |
| 271 | + AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())); | |
| 272 | + when(userService.getUserByMobile(eq(reqVO.getMobile()))).thenReturn(user); | |
| 273 | + | |
| 274 | + // 调用,并断言 | |
| 275 | + assertServiceException(() -> authService.smsLogin(reqVO), AUTH_LOGIN_USER_DISABLED); | |
| 276 | + verify(loginLogService).createLoginLog(argThat(o -> | |
| 277 | + o.getLogType().equals(LoginLogTypeEnum.LOGIN_MOBILE.getType()) | |
| 278 | + && o.getResult().equals(LoginResultEnum.USER_DISABLED.getResult()) | |
| 279 | + && o.getUserId().equals(user.getId()))); | |
| 280 | + verify(oauth2TokenService, never()).createAccessToken(anyLong(), anyInt(), anyString(), any()); | |
| 281 | + } | |
| 282 | + | |
| 283 | + @Test | |
| 284 | + public void testSocialLogin_userDisabled() { | |
| 285 | + // 准备参数 | |
| 286 | + AuthSocialLoginReqVO reqVO = randomPojo(AuthSocialLoginReqVO.class); | |
| 287 | + Long userId = 1L; | |
| 288 | + when(socialUserService.getSocialUserByCode(eq(UserTypeEnum.ADMIN.getValue()), eq(reqVO.getType()), | |
| 289 | + eq(reqVO.getCode()), eq(reqVO.getState()))) | |
| 290 | + .thenReturn(new SocialUserRespDTO(randomString(), randomString(), randomString(), userId)); | |
| 291 | + AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(userId) | |
| 292 | + .setStatus(CommonStatusEnum.DISABLE.getStatus())); | |
| 293 | + when(userService.getUser(eq(userId))).thenReturn(user); | |
| 294 | + | |
| 295 | + // 调用,并断言 | |
| 296 | + assertServiceException(() -> authService.socialLogin(reqVO), AUTH_LOGIN_USER_DISABLED); | |
| 297 | + verify(loginLogService).createLoginLog(argThat(o -> | |
| 298 | + o.getLogType().equals(LoginLogTypeEnum.LOGIN_SOCIAL.getType()) | |
| 299 | + && o.getResult().equals(LoginResultEnum.USER_DISABLED.getResult()) | |
| 300 | + && o.getUserId().equals(user.getId()))); | |
| 301 | + verify(oauth2TokenService, never()).createAccessToken(anyLong(), anyInt(), anyString(), any()); | |
| 302 | + } | |
| 303 | + | |
| 304 | + @Test | |
| 305 | + public void testRegister_success() { | |
| 306 | + // 准备参数 | |
| 307 | + AuthRegisterReqVO reqVO = randomPojo(AuthRegisterReqVO.class); | |
| 308 | + authService.setCaptchaEnable(false); | |
| 309 | + AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L) | |
| 310 | + .setUsername(reqVO.getUsername()).setStatus(CommonStatusEnum.ENABLE.getStatus())); | |
| 311 | + when(userService.registerUser(reqVO)).thenReturn(user); | |
| 312 | + OAuth2AccessTokenDO accessTokenDO = randomPojo(OAuth2AccessTokenDO.class, o -> o.setUserId(user.getId()) | |
| 313 | + .setUserType(UserTypeEnum.ADMIN.getValue())); | |
| 314 | + when(oauth2TokenService.createAccessToken(eq(user.getId()), eq(UserTypeEnum.ADMIN.getValue()), | |
| 315 | + eq("default"), isNull())).thenReturn(accessTokenDO); | |
| 316 | + | |
| 317 | + // 调用,并断言 | |
| 318 | + AuthLoginRespVO loginRespVO = authService.register(reqVO); | |
| 319 | + assertPojoEquals(accessTokenDO, loginRespVO); | |
| 320 | + verify(userService, never()).getUser(anyLong()); | |
| 321 | + } | |
| 322 | + | |
| 323 | + @Test | |
| 266 | 324 | public void testValidateCaptcha_successWithEnable() { |
| 267 | 325 | // 准备参数 |
| 268 | 326 | AuthLoginReqVO reqVO = randomPojo(AuthLoginReqVO.class); | ... | ... |
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; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.util.RandomUtil; |
| 4 | 4 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 5 | +import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; | |
| 5 | 6 | import cn.iocoder.yudao.framework.common.exception.ServiceException; |
| 6 | 7 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 7 | 8 | import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; |
| ... | ... | @@ -278,13 +279,14 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest { |
| 278 | 279 | userMapper.insert(dbUser); |
| 279 | 280 | // 准备参数 |
| 280 | 281 | Long userId = dbUser.getId(); |
| 281 | - Integer status = randomCommonStatus(); | |
| 282 | + Integer status = CommonStatusEnum.DISABLE.getStatus(); | |
| 282 | 283 | |
| 283 | 284 | // 调用 |
| 284 | 285 | userService.updateUserStatus(userId, status); |
| 285 | 286 | // 断言 |
| 286 | 287 | AdminUserDO user = userMapper.selectById(userId); |
| 287 | 288 | assertEquals(status, user.getStatus()); |
| 289 | + verify(oauth2TokenService).removeAccessToken(userId, UserTypeEnum.ADMIN.getValue()); | |
| 288 | 290 | } |
| 289 | 291 | |
| 290 | 292 | @Test | ... | ... |