From 18e919bde3d925ee76fe29c7a6621c2716b1e4e4 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 21 三月 2025 09:43:31 +0800
Subject: [PATCH] feat(social): 添加 Keycloak社交登录支持
---
ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java | 82 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java
index 419dbd6..9d62dd8 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java
@@ -10,9 +10,11 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthToken;
import me.zhyd.oauth.model.AuthUser;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.domain.model.PasswordLoginBody;
import org.dromara.common.core.domain.model.SocialLoginBody;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.exception.user.UserException;
@@ -21,8 +23,13 @@
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.keycloak.AuthKeycloakRequest;
import org.dromara.common.social.utils.SocialUtils;
import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.system.domain.SysSocial;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.bo.SysSocialBo;
+import org.dromara.system.domain.bo.SysUserBo;
import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.system.domain.vo.SysSocialVo;
import org.dromara.system.domain.vo.SysUserVo;
@@ -59,15 +66,34 @@
*/
@Override
public LoginVo login(String body, SysClientVo client) {
- SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class);
- ValidatorUtils.validate(loginBody);
- AuthResponse<AuthUser> response = SocialUtils.loginAuth(
+ // 濡傛灉bodyp瀛楃涓蹭腑鍖呭惈login_type瀛楁锛屽垯灏哹ody杞负password鐧诲綍
+ AuthUser authUserData = null;
+ String tenantId = null;
+ if (body.contains("login_type")) {
+ PasswordLoginBody passwordLoginBody = JsonUtils.parseObject(body, PasswordLoginBody.class);
+ tenantId = passwordLoginBody.getTenantId();
+ ValidatorUtils.validate(passwordLoginBody);
+ AuthKeycloakRequest authRequest = SocialUtils.getAuthKeyloakRequest("keycloak", socialProperties);
+ AuthToken accessToken = authRequest.getAccessToken(passwordLoginBody);
+ authUserData = authRequest.getUserInfo(accessToken);
+
+
+ } else {
+ SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class);
+ tenantId =loginBody.getTenantId();
+ ValidatorUtils.validate(loginBody);
+ AuthResponse<AuthUser> response = SocialUtils.loginAuth(
loginBody.getSource(), loginBody.getSocialCode(),
loginBody.getSocialState(), socialProperties);
- if (!response.ok()) {
- throw new ServiceException(response.getMsg());
+ if (!response.ok()) {
+ throw new ServiceException(response.getMsg());
+ }
+ authUserData = response.getData();
}
- AuthUser authUserData = response.getData();
+
+
+
+
if ("GITEE".equals(authUserData.getSource())) {
// 濡傜敤鎴蜂娇鐢� gitee 鐧诲綍椤烘墜 star 缁欎綔鑰呬竴鐐规敮鎸� 鎷掔粷鐧藉珫
HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Vue-Plus")
@@ -77,6 +103,47 @@
.formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken()))
.executeAsync();
}
+ if ("KEYCLOAK".equals(authUserData.getSource())) {
+ // 鏂板KEYCLOAK鐢ㄦ埛鑷姩鍒涘缓閫昏緫
+ String authId = authUserData.getSource() + authUserData.getUuid();
+ List<SysSocialVo> list = sysSocialService.selectByAuthId(authId);
+ if (CollUtil.isEmpty(list)) {
+ // 鑷姩鍒涘缓鏂扮敤鎴�
+ SysUser newUser = new SysUser();
+ newUser.setUserName(authUserData.getUsername());
+ newUser.setEmail(authUserData.getEmail());
+ newUser.setNickName(authUserData.getNickname());
+ newUser.setPassword("Initial123@"); // 鍒濆瀵嗙爜闇�绗﹀悎瀹夊叏绛栫暐
+ newUser.setStatus(SystemConstants.NORMAL);
+
+ userMapper.insert(newUser); // 鍋囪瀛樺湪鎻掑叆鏂规硶
+
+ // 鍒涘缓绀句氦缁戝畾璁板綍
+ SysSocialBo newSocial = new SysSocialBo();
+ newSocial.setUserId(newUser.getUserId());
+ newSocial.setUserName(newUser.getUserName());
+ newSocial.setAuthId(authId);
+ newSocial.setSource(authUserData.getSource());
+ newSocial.setTenantId(newUser.getTenantId());
+ newSocial.setOpenId(authUserData.getUuid());
+ newSocial.setAccessToken(authUserData.getToken().getAccessToken());
+ newSocial.setRefreshToken(authUserData.getToken().getRefreshToken());
+ newSocial.setIdToken(authUserData.getToken().getIdToken());
+ sysSocialService.insertByBo(newSocial); // 闇�纭繚鏈嶅姟鏈夋柊澧炴柟娉�
+
+ // 閲嶆柊鏌ヨ纭繚鏁版嵁鍙敤
+ list = sysSocialService.selectByAuthId(authId);
+ } else {
+ // 鏇存柊绀句氦缁戝畾璁板綍
+ SysSocialBo socialBo = new SysSocialBo();
+ socialBo.setId(list.get(0).getId());
+ socialBo.setAccessToken(authUserData.getToken().getAccessToken());
+ socialBo.setRefreshToken(authUserData.getToken().getRefreshToken());
+ socialBo.setIdToken(authUserData.getToken().getIdToken());
+ sysSocialService.updateByBo(socialBo);
+
+ }
+ }
List<SysSocialVo> list = sysSocialService.selectByAuthId(authUserData.getSource() + authUserData.getUuid());
if (CollUtil.isEmpty(list)) {
@@ -84,7 +151,8 @@
}
SysSocialVo social;
if (TenantHelper.isEnable()) {
- Optional<SysSocialVo> opt = StreamUtils.findAny(list, x -> x.getTenantId().equals(loginBody.getTenantId()));
+ String finalTenantId = tenantId;
+ Optional<SysSocialVo> opt = StreamUtils.findAny(list, x -> x.getTenantId().equals(finalTenantId));
if (opt.isEmpty()) {
throw new ServiceException("瀵逛笉璧凤紝浣犳病鏈夋潈闄愮櫥褰曞綋鍓嶇鎴凤紒");
}
--
Gitblit v1.9.3