!382 统一登录，授权

三个三

2023-07-02 6b147786912eeaa62350610b7ee9235ff156e3ba

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

@@ -6,7 +6,6 @@
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthCallback;
import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.request.AuthRequest;
@@ -87,7 +86,7 @@
    }

    /**
     * 认证授权
     * 第三方登录请求
     *
     * @param source 登录来源
     * @return 结果
@@ -98,36 +97,31 @@
        if (ObjectUtil.isNull(obj)) {
            return R.fail(source + "平台账号暂不支持");
        }
        AuthRequest authRequest = SocialUtils.getAuthRequest(source,
            obj.getClientId(),
            obj.getClientSecret(),
            obj.getRedirectUri());
        AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);
        String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());
        return R.ok(authorizeUrl);
    }

    /**
     * 第三方登录回调业务处理
     *
     * @param source   登录来源
     * @param callback 授权响应实体
     *  绑定授权
     * @param loginBody
     * @return 结果
     */
    @SuppressWarnings("unchecked")
    @GetMapping("/social-login")
    public R<String> socialLogin(String source, AuthCallback callback) {
        SocialLoginConfigProperties obj = socialProperties.getType().get(source);
        if (ObjectUtil.isNull(obj)) {
            return R.fail(source + "平台账号暂不支持");
        }
        AuthRequest authRequest = SocialUtils.getAuthRequest(source,
            obj.getClientId(),
            obj.getClientSecret(),
            obj.getRedirectUri());
        AuthResponse<AuthUser> response = authRequest.login(callback);
        return loginService.socialLogin(source, response);
    @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);
    }


    /**
     * 取消授权
     *