From cbd59f84fd7d688569cade242e4e9d6d0f381f15 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 18 六月 2024 18:44:04 +0800
Subject: [PATCH] update 优化 三方登录不同域名获取不到租户id问题
---
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 59 insertions(+), 26 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 2ed4ed4..8b83e29 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,19 +10,23 @@
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.encrypt.annotation.ApiEncrypt;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
import org.dromara.common.social.config.properties.SocialProperties;
import org.dromara.common.social.utils.SocialUtils;
import org.dromara.common.tenant.helper.TenantHelper;
-import org.dromara.system.domain.SysClient;
+import org.dromara.common.websocket.dto.WebSocketMessageDto;
+import org.dromara.common.websocket.utils.WebSocketUtils;
import org.dromara.system.domain.bo.SysTenantBo;
+import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.system.domain.vo.SysTenantVo;
import org.dromara.system.service.ISysClientService;
import org.dromara.system.service.ISysConfigService;
@@ -39,6 +43,8 @@
import java.net.URL;
import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
/**
* 璁よ瘉
@@ -47,7 +53,6 @@
*/
@Slf4j
@SaIgnore
-@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/auth")
@@ -60,29 +65,48 @@
private final ISysTenantService tenantService;
private final ISysSocialService socialUserService;
private final ISysClientService clientService;
+ private final ScheduledExecutorService scheduledExecutorService;
/**
* 鐧诲綍鏂规硶
*
- * @param loginBody 鐧诲綍淇℃伅
+ * @param body 鐧诲綍淇℃伅
* @return 缁撴灉
*/
+ @ApiEncrypt
@PostMapping("/login")
- public R<LoginVo> login(@Validated @RequestBody LoginBody loginBody) {
+ public R<LoginVo> login(@RequestBody String body) {
+ LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
+ ValidatorUtils.validate(loginBody);
// 鎺堟潈绫诲瀷鍜屽鎴风id
String clientId = loginBody.getClientId();
String grantType = loginBody.getGrantType();
- SysClient client = clientService.queryByClientId(clientId);
+ SysClientVo client = clientService.queryByClientId(clientId);
// 鏌ヨ涓嶅埌 client 鎴� client 鍐呬笉鍖呭惈 grantType
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());
+ SysTenantVo tenant = loginService.checkTenant(loginBody.getTenantId());
// 鐧诲綍
- return R.ok(IAuthStrategy.login(loginBody, client));
+ LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
+
+ Long userId = LoginHelper.getUserId();
+ scheduledExecutorService.schedule(() -> {
+ WebSocketMessageDto dto = new WebSocketMessageDto();
+ dto.setMessage("娆㈣繋鐧诲綍RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺");
+ dto.setSessionKeys(List.of(userId));
+ WebSocketUtils.publishMessage(dto);
+ }, 3, TimeUnit.SECONDS);
+
+ if (StringUtils.isNotBlank(tenant.getTenantId())) {
+ loginVo.setDomain(tenant.getDomain());
+ }
+ return R.ok(loginVo);
}
/**
@@ -99,26 +123,34 @@
}
AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);
String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());
- return R.ok(authorizeUrl);
+ return R.ok("鎿嶄綔鎴愬姛", authorizeUrl);
}
/**
- * 绗笁鏂圭櫥褰曞洖璋冧笟鍔″鐞�
- * 缁戝畾鎺堟潈
- * @param loginBody
+ * 绗笁鏂圭櫥褰曞洖璋冧笟鍔″鐞� 缁戝畾鎺堟潈
+ *
+ * @param loginBody 璇锋眰浣�
* @return 缁撴灉
*/
- @SuppressWarnings("unchecked")
@PostMapping("/social/callback")
- public R<LoginVo> socialLogin(@RequestBody LoginBody loginBody) {
- // 鑾峰彇绗笁鏂圭櫥褰曚俊鎭�
- AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties);
- AuthUser authUserData = response.getData();
- // 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
- if (!response.ok()) {
- return R.fail(response.getMsg());
- }
- return loginService.sociaRegister(authUserData);
+ public R<LoginVo> socialCallback(@RequestBody SocialLoginBody loginBody) {
+ // 鑾峰彇绗笁鏂圭櫥褰曚俊鎭�
+ AuthResponse<AuthUser> response = SocialUtils.loginAuth(
+ loginBody.getSource(), loginBody.getSocialCode(),
+ loginBody.getSocialState(), socialProperties);
+ AuthUser authUserData = response.getData();
+ // 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
+ if (!response.ok()) {
+ return R.fail(response.getMsg());
+ }
+ loginService.socialRegister(authUserData);
+
+ LoginVo loginVo = new LoginVo();
+ SysTenantVo tenant = tenantService.queryByTenantId(LoginHelper.getTenantId());
+ if (StringUtils.isNotBlank(tenant.getTenantId())) {
+ loginVo.setDomain(tenant.getDomain());
+ }
+ return R.ok(loginVo);
}
@@ -146,6 +178,7 @@
/**
* 鐢ㄦ埛娉ㄥ唽
*/
+ @ApiEncrypt
@PostMapping("/register")
public R<Void> register(@Validated @RequestBody RegisterBody user) {
if (!configService.selectRegisterEnabled(user.getTenantId())) {
@@ -175,7 +208,7 @@
}
// 鏍规嵁鍩熷悕杩涜绛涢��
List<TenantListVo> list = StreamUtils.filter(voList, vo ->
- StringUtils.equals(vo.getDomain(), host));
+ StringUtils.equals(vo.getDomain(), host));
// 杩斿洖瀵硅薄
LoginTenantVo vo = new LoginTenantVo();
vo.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
--
Gitblit v1.9.3