From 864e5d695f05f2b441f593fc5d912f3b28bb60f9 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 02 十一月 2023 12:25:54 +0800 Subject: [PATCH] update 优化 重构登录策略增加扩展性降低复杂度 --- ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java index abbfae5..187ea2a 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -10,13 +10,13 @@ import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.request.AuthRequest; import me.zhyd.oauth.utils.AuthStateUtils; +import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.model.LoginBody; import org.dromara.common.core.domain.model.RegisterBody; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.MessageUtils; -import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.domain.model.SocialLoginBody; +import org.dromara.common.core.utils.*; +import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.social.config.properties.SocialLoginConfigProperties; import org.dromara.common.social.config.properties.SocialProperties; import org.dromara.common.social.utils.SocialUtils; @@ -65,11 +65,13 @@ /** * 鐧诲綍鏂规硶 * - * @param loginBody 鐧诲綍淇℃伅 + * @param body 鐧诲綍淇℃伅 * @return 缁撴灉 */ @PostMapping("/login") - public R<LoginVo> login(@Validated @RequestBody LoginBody loginBody) { + public R<LoginVo> login(@Validated @RequestBody String body) { + LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class); + ValidatorUtils.validate(loginBody); // 鎺堟潈绫诲瀷鍜屽鎴风id String clientId = loginBody.getClientId(); String grantType = loginBody.getGrantType(); @@ -78,11 +80,13 @@ if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) { log.info("瀹㈡埛绔痠d: {} 璁よ瘉绫诲瀷锛歿} 寮傚父!.", clientId, grantType); return R.fail(MessageUtils.message("auth.grant.type.error")); + } else if (!UserConstants.NORMAL.equals(client.getStatus())) { + return R.fail(MessageUtils.message("auth.grant.type.blocked")); } // 鏍¢獙绉熸埛 loginService.checkTenant(loginBody.getTenantId()); // 鐧诲綍 - return R.ok(IAuthStrategy.login(loginBody, client)); + return R.ok(IAuthStrategy.login(body, client, grantType)); } /** @@ -99,7 +103,7 @@ } AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties); String authorizeUrl = authRequest.authorize(AuthStateUtils.createState()); - return R.ok(authorizeUrl); + return R.ok("鎿嶄綔鎴愬姛", authorizeUrl); } /** @@ -109,15 +113,18 @@ * @return 缁撴灉 */ @PostMapping("/social/callback") - public R<LoginVo> socialCallback(@RequestBody LoginBody loginBody) { + public R<Void> socialCallback(@RequestBody SocialLoginBody loginBody) { // 鑾峰彇绗笁鏂圭櫥褰曚俊鎭� - AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties); + AuthResponse<AuthUser> response = SocialUtils.loginAuth( + loginBody.getSource(), loginBody.getSocialCode(), + loginBody.getSocialState(), socialProperties); AuthUser authUserData = response.getData(); // 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛 if (!response.ok()) { return R.fail(response.getMsg()); } - return loginService.sociaRegister(authUserData); + loginService.socialRegister(authUserData); + return R.ok(); } -- Gitblit v1.9.3