新增加第三方登录授权功能

This commit is contained in:
thiszhc
2023-06-10 21:39:31 +08:00
parent 204d882a8e
commit e4b405491f
12 changed files with 466 additions and 3 deletions

View File

@ -75,6 +75,21 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>me.zhyd.oauth</groupId>
<artifactId>JustAuth</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-auth</artifactId>
<version>5.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>credentials-java</artifactId>
<version>0.2.4</version>
<scope>compile</scope>
</dependency>
<!-- skywalking 整合 logback -->
<!-- <dependency>-->

View File

@ -2,9 +2,21 @@ package org.dromara.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor;
import me.zhyd.oauth.cache.AuthDefaultStateCache;
import me.zhyd.oauth.cache.AuthStateCache;
import me.zhyd.oauth.model.AuthCallback;
import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.request.AuthRequest;
import me.zhyd.oauth.utils.AuthStateUtils;
import org.dromara.common.auth.utils.AuthUtils;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.EmailLoginBody;
import org.dromara.common.core.domain.model.LoginBody;
@ -16,6 +28,8 @@ import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.domain.bo.SysTenantBo;
import org.dromara.system.domain.vo.SysTenantVo;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.mapper.SysUserMapper;
import org.dromara.system.service.ISysConfigService;
import org.dromara.system.service.ISysTenantService;
import org.dromara.web.domain.vo.LoginTenantVo;
@ -26,8 +40,11 @@ import org.dromara.web.service.SysRegisterService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 认证
@ -41,10 +58,18 @@ import java.util.List;
@RequestMapping("/auth")
public class AuthController {
private AuthStateCache authStateCache;
private final SysLoginService loginService;
private final SysRegisterService registerService;
private final ISysConfigService configService;
private final ISysTenantService tenantService;
private final SysUserMapper userMapper;
private final Map<String, String> auths = new HashMap<>();
{
auths.put("gitee", "{\"clientId\":\"38eaaa1b77b5e064313057a2f5745ce3a9f3e7686d9bd302c7df2f308ef6db81\",\"clientSecret\":\"2e633af8780cb9fe002c4c7291b722db944402e271efb99b062811f52d7da1ff\",\"redirectUri\":\"http://127.0.0.1:8888/social-login?source=gitee\"}");
auths.put("github", "{\"clientId\":\"Iv1.1be0cdcd71aca63b\",\"clientSecret\":\"0d59d28b43152bc8906011624db37b0fed88d154\",\"redirectUri\":\"http://127.0.0.1:80/social-login?source=github\"}");
authStateCache = AuthDefaultStateCache.INSTANCE;// 使用默认的缓存
}
/**
* 登录方法
@ -115,6 +140,64 @@ public class AuthController {
return R.ok(loginVo);
}
/**
* 认证授权
* @param source
* @throws IOException
*/
@GetMapping("/binding/{source}")
@ResponseBody
public R<LoginVo> authBinding(@PathVariable("source") String source, HttpServletRequest request){
SysUserVo userLoding = new SysUserVo();
if (ObjectUtil.isNull(userLoding)) {
return R.fail("授权失败,请先登录再绑定");
}
if (userMapper.checkAuthUser(userLoding.getUserId(),source) > 0)
{
return R.fail(source + "平台账号已经绑定");
}
String obj = auths.get(source);
if (StringUtils.isEmpty(obj))
{
return R.fail(source + "平台账号暂不支持");
}
JSONObject json = JSONUtil.parseObj(obj);
AuthRequest authRequest = AuthUtils.getAuthRequest(source,
json.getStr("clientId"),
json.getStr("clientSecret"),
json.getStr("redirectUri"), authStateCache);
String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());
return R.ok(authorizeUrl);
}
/**
* @param source
* @param callback
* @param request
* @return
*/
@SuppressWarnings("unchecked")
@GetMapping("/social-login/{source}")
public R<String> socialLogin(@PathVariable("source") String source, AuthCallback callback, HttpServletRequest request) throws IOException {
String obj = auths.get(source);
if (StringUtils.isEmpty(obj))
{
return R.fail("第三方平台系统不支持或未提供来源");
}
JSONObject json = JSONUtil.parseObj(obj);
AuthRequest authRequest = AuthUtils.getAuthRequest(source,
json.getStr("clientId"),
json.getStr("clientSecret"),
json.getStr("redirectUri"), authStateCache);
AuthResponse<AuthUser> response = authRequest.login(callback);
return loginService.socialLogin(source, response, request);
}
/**
* 退出登录
*/

View File

@ -6,11 +6,15 @@ import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.dto.RoleDTO;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.domain.model.XcxLoginUser;
@ -28,6 +32,7 @@ import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.exception.TenantException;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.common.web.config.properties.CaptchaProperties;
import org.dromara.system.domain.SysAuthUser;
import org.dromara.system.domain.SysUser;
import org.dromara.system.domain.vo.SysTenantVo;
import org.dromara.system.domain.vo.SysUserVo;
@ -37,6 +42,7 @@ import org.dromara.system.service.ISysTenantService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.io.IOException;
import java.time.Duration;
import java.util.Date;
import java.util.List;
@ -154,6 +160,65 @@ public class SysLoginService {
return StpUtil.getTokenValue();
}
/**
* 认证授权登录
* @param source
* @throws IOException
*/
/**
* 社交登录
* @param source 登录来源
* @param authUser 授权响应实体
* @param request Http请求对象
* @return 统一响应实体
* @throws IOException
*/
public R<String> socialLogin(String source, AuthResponse<AuthUser> authUser, HttpServletRequest request) throws IOException {
// 判断授权响应是否成功
if (!authUser.ok()) {
return R.fail("对不起,授权信息验证不通过,请联系管理员");
}
AuthUser authUserData = authUser.getData();
// 判断数据库中是否已存在该用户
SysUserVo user = userMapper.selectAuthUserByUuid(source + authUserData.getUuid());
if (ObjectUtil.isNotNull(user)) {
checkTenant(user.getTenantId());
SysUserVo dbUser = loadUserByUsername(user.getTenantId(), user.getUserName());
// 登录
LoginHelper.loginByDevice(buildLoginUser(dbUser), DeviceType.auth);
recordLogininfor(dbUser.getTenantId(), user.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
recordLoginInfo(user.getUserId());
return R.ok(StpUtil.getTokenValue());
} else {
if (LoginHelper.getUserId() == null) {
return R.fail("授权失败,请先登录再绑定");
}
// 组装授权用户信息
SysAuthUser sysAuthUser = new SysAuthUser();
sysAuthUser.setAvatar(authUserData.getAvatar());
sysAuthUser.setUuid(source + authUserData.getUuid());
sysAuthUser.setUserId(LoginHelper.getUserId());
sysAuthUser.setUserName(authUserData.getUsername());
sysAuthUser.setNickName(authUserData.getNickname());
sysAuthUser.setEmail(authUserData.getEmail());
sysAuthUser.setSource(source);
sysAuthUser.setCreateTime(new Date().toString());
// 新用户,绑定第三方账号
userMapper.insertAuthUser(sysAuthUser);
SysUserVo lodingData = loadUserByUsername(LoginHelper.getTenantId(), LoginHelper.getUsername());
checkTenant(lodingData.getTenantId());
LoginHelper.loginByDevice(buildLoginUser(lodingData), DeviceType.auth);
recordLogininfor(lodingData.getTenantId(), sysAuthUser.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
recordLoginInfo(sysAuthUser.getUserId());
return R.ok(StpUtil.getTokenValue());
}
}
/**
* 退出登录
*/