From 9448782f451790beb05b2e6717683dc0a59d6a24 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 20 六月 2023 15:00:16 +0800
Subject: [PATCH] update 优化 !pr370 完成三方登录授权功能
---
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 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 515ec1b..41a5362 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
@@ -25,7 +25,7 @@
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.service.ISocialUserService;
+import org.dromara.system.service.ISysSocialService;
import org.dromara.system.service.ISysConfigService;
import org.dromara.system.service.ISysTenantService;
import org.dromara.web.domain.vo.LoginTenantVo;
@@ -36,7 +36,6 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
import java.net.URL;
import java.util.List;
@@ -57,8 +56,7 @@
private final SysRegisterService registerService;
private final ISysConfigService configService;
private final ISysTenantService tenantService;
- private final ISocialUserService socialUserService;
-
+ private final ISysSocialService socialUserService;
/**
@@ -133,13 +131,14 @@
/**
* 璁よ瘉鎺堟潈
- * @param source
+ *
+ * @param source 鐧诲綍鏉ユ簮
+ * @return 缁撴灉
*/
@GetMapping("/binding/{source}")
- @ResponseBody
- public R<LoginVo> authBinding(@PathVariable("source") String source, HttpServletRequest request){
+ public R<String> authBinding(@PathVariable("source") String source) {
SocialLoginConfigProperties obj = socialProperties.getType().get(source);
- if (ObjectUtil.isNull(obj)){
+ if (ObjectUtil.isNull(obj)) {
return R.fail(source + "骞冲彴璐﹀彿鏆備笉鏀寔");
}
AuthRequest authRequest = SocialUtils.getAuthRequest(source,
@@ -152,16 +151,16 @@
/**
* 绗笁鏂圭櫥褰曞洖璋冧笟鍔″鐞�
- * @param source
- * @param callback
- * @param request
- * @return
+ *
+ * @param source 鐧诲綍鏉ユ簮
+ * @param callback 鎺堟潈鍝嶅簲瀹炰綋
+ * @return 缁撴灉
*/
@SuppressWarnings("unchecked")
@GetMapping("/social-login/{source}")
- public R<String> socialLogin(@PathVariable("source") String source, AuthCallback callback, HttpServletRequest request) throws IOException {
+ public R<String> socialLogin(@PathVariable("source") String source, AuthCallback callback) {
SocialLoginConfigProperties obj = socialProperties.getType().get(source);
- if (ObjectUtil.isNull(obj)){
+ if (ObjectUtil.isNull(obj)) {
return R.fail(source + "骞冲彴璐﹀彿鏆備笉鏀寔");
}
AuthRequest authRequest = SocialUtils.getAuthRequest(source,
@@ -169,16 +168,16 @@
obj.getClientSecret(),
obj.getRedirectUri());
AuthResponse<AuthUser> response = authRequest.login(callback);
- return loginService.socialLogin(source, response, request);
+ return loginService.socialLogin(source, response);
}
/**
* 鍙栨秷鎺堟潈
- * @param socialId
+ *
+ * @param socialId socialId
*/
@DeleteMapping(value = "/unlock/{socialId}")
- public R<Void> unlockSocial(@PathVariable Long socialId)
- {
+ public R<Void> unlockSocial(@PathVariable Long socialId) {
Boolean rows = socialUserService.deleteWithValidById(socialId);
return rows ? R.ok() : R.fail("鍙栨秷鎺堟潈澶辫触");
}
--
Gitblit v1.9.3