opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 18:15:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

统一客户端，优化授权流程

Browse Source
This commit is contained in:
thiszhc 2023-07-01 16:23:28 +08:00
parent d05c641968
commit 360f6378d6
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
View File

@ -110,23 +110,8 @@ public class AuthController {
* @return 结果
*/
@SuppressWarnings("unchecked")
@PostMapping("/social-login")
@PostMapping("/social/callback")
public R<LoginVo> socialLogin(@RequestBody LoginBody loginBody) {
// 授权类型和客户端id
String clientId = loginBody.getClientId();
String grantType = loginBody.getGrantType();
SysClient client = clientService.queryByClientId(clientId);
// 查询不到 client 或 client 内不包含 grantType
if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {
log.info("客户端id: {} 认证类型：{} 异常!.", clientId, grantType);
return R.fail(MessageUtils.message("auth.grant.type.error"));
}
// 校验租户
loginService.checkTenant(loginBody.getTenantId());
//判断用户登录状态，如果已经登录那么就默认为注册，如果没有登录那么默认登录
if (!StpUtil.isLogin()) {
return R.ok(IAuthStrategy.login(loginBody, client));
}else {
// 获取第三方登录信息
AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties);
AuthUser authUserData = response.getData();
@ -135,7 +120,6 @@ public class AuthController {
return R.fail(response.getMsg());
}
return loginService.sociaRegister(authUserData);
}
}