From bb2836b6f1789a60c30537444a3bd331f16b45e1 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期日, 02 七月 2023 16:48:16 +0800 Subject: [PATCH] update 优化 !pr382 修复一些问题 完事流程逻辑 --- ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 122 +++++++++++++++++++++++++--------------- 1 files changed, 77 insertions(+), 45 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 f39fd30..82779b1 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 @@ -2,27 +2,38 @@ import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +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 me.zhyd.oauth.request.AuthRequest; +import me.zhyd.oauth.utils.AuthStateUtils; import org.dromara.common.core.domain.R; -import org.dromara.common.core.domain.model.EmailLoginBody; import org.dromara.common.core.domain.model.LoginBody; import org.dromara.common.core.domain.model.RegisterBody; -import org.dromara.common.core.domain.model.SmsLoginBody; import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.MessageUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.social.config.properties.SocialLoginConfigProperties; +import org.dromara.common.social.config.properties.SocialProperties; +import org.dromara.common.social.utils.SocialUtils; import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.system.domain.SysClient; import org.dromara.system.domain.bo.SysTenantBo; import org.dromara.system.domain.vo.SysTenantVo; +import org.dromara.system.service.ISysClientService; import org.dromara.system.service.ISysConfigService; +import org.dromara.system.service.ISysSocialService; import org.dromara.system.service.ISysTenantService; import org.dromara.web.domain.vo.LoginTenantVo; import org.dromara.web.domain.vo.LoginVo; import org.dromara.web.domain.vo.TenantListVo; +import org.dromara.web.service.IAuthStrategy; import org.dromara.web.service.SysLoginService; import org.dromara.web.service.SysRegisterService; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.validation.constraints.NotBlank; -import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -34,6 +45,7 @@ * * @author Lion Li */ +@Slf4j @SaIgnore @Validated @RequiredArgsConstructor @@ -41,73 +53,85 @@ @RequestMapping("/auth") public class AuthController { + private final SocialProperties socialProperties; private final SysLoginService loginService; private final SysRegisterService registerService; private final ISysConfigService configService; private final ISysTenantService tenantService; + private final ISysSocialService socialUserService; + private final ISysClientService clientService; + /** * 鐧诲綍鏂规硶 * - * @param body 鐧诲綍淇℃伅 + * @param loginBody 鐧诲綍淇℃伅 * @return 缁撴灉 */ @PostMapping("/login") - public R<LoginVo> login(@Validated @RequestBody LoginBody body) { - LoginVo loginVo = new LoginVo(); - // 鐢熸垚浠ょ墝 - String token = loginService.login( - body.getTenantId(), - body.getUsername(), body.getPassword(), - body.getCode(), body.getUuid()); - loginVo.setToken(token); - return R.ok(loginVo); + public R<LoginVo> login(@Validated @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("瀹㈡埛绔痠d: {} 璁よ瘉绫诲瀷锛歿} 寮傚父!.", clientId, grantType); + return R.fail(MessageUtils.message("auth.grant.type.error")); + } + // 鏍¢獙绉熸埛 + loginService.checkTenant(loginBody.getTenantId()); + // 鐧诲綍 + return R.ok(IAuthStrategy.login(loginBody, client)); } /** - * 鐭俊鐧诲綍 + * 绗笁鏂圭櫥褰曡姹� * - * @param body 鐧诲綍淇℃伅 + * @param source 鐧诲綍鏉ユ簮 * @return 缁撴灉 */ - @PostMapping("/smsLogin") - public R<LoginVo> smsLogin(@Validated @RequestBody SmsLoginBody body) { - LoginVo loginVo = new LoginVo(); - // 鐢熸垚浠ょ墝 - String token = loginService.smsLogin(body.getTenantId(), body.getPhonenumber(), body.getSmsCode()); - loginVo.setToken(token); - return R.ok(loginVo); + @GetMapping("/binding/{source}") + public R<String> authBinding(@PathVariable("source") String source) { + SocialLoginConfigProperties obj = socialProperties.getType().get(source); + if (ObjectUtil.isNull(obj)) { + return R.fail(source + "骞冲彴璐﹀彿鏆備笉鏀寔"); + } + AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties); + String authorizeUrl = authRequest.authorize(AuthStateUtils.createState()); + return R.ok("鎿嶄綔鎴愬姛", authorizeUrl); } /** - * 閭欢鐧诲綍 + * 绗笁鏂圭櫥褰曞洖璋冧笟鍔″鐞� 缁戝畾鎺堟潈 * - * @param body 鐧诲綍淇℃伅 + * @param loginBody 璇锋眰浣� * @return 缁撴灉 */ - @PostMapping("/emailLogin") - public R<LoginVo> emailLogin(@Validated @RequestBody EmailLoginBody body) { - LoginVo loginVo = new LoginVo(); - // 鐢熸垚浠ょ墝 - String token = loginService.emailLogin(body.getTenantId(), body.getEmail(), body.getEmailCode()); - loginVo.setToken(token); - return R.ok(loginVo); + @PostMapping("/social/callback") + public R<LoginVo> socialCallback(@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); } + /** - * 灏忕▼搴忕櫥褰�(绀轰緥) + * 鍙栨秷鎺堟潈 * - * @param xcxCode 灏忕▼搴廲ode - * @return 缁撴灉 + * @param socialId socialId */ - @PostMapping("/xcxLogin") - public R<LoginVo> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) { - LoginVo loginVo = new LoginVo(); - // 鐢熸垚浠ょ墝 - String token = loginService.xcxLogin(xcxCode); - loginVo.setToken(token); - return R.ok(loginVo); + @DeleteMapping(value = "/unlock/{socialId}") + public R<Void> unlockSocial(@PathVariable Long socialId) { + Boolean rows = socialUserService.deleteWithValidById(socialId); + return rows ? R.ok() : R.fail("鍙栨秷鎺堟潈澶辫触"); } + /** * 閫�鍑虹櫥褰� @@ -140,9 +164,17 @@ List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo()); List<TenantListVo> voList = MapstructUtils.convert(tenantList, TenantListVo.class); // 鑾峰彇鍩熷悕 - String host = new URL(request.getRequestURL().toString()).getHost(); + String host; + String referer = request.getHeader("referer"); + if (StringUtils.isNotBlank(referer)) { + // 杩欓噷浠巖eferer涓彇鍊兼槸涓轰簡鏈湴浣跨敤hosts娣诲姞铏氭嫙鍩熷悕锛屾柟渚挎湰鍦扮幆澧冭皟璇� + host = referer.split("//")[1].split("/")[0]; + } else { + host = new URL(request.getRequestURL().toString()).getHost(); + } // 鏍规嵁鍩熷悕杩涜绛涢�� - List<TenantListVo> list = StreamUtils.filter(voList, vo -> StringUtils.equals(vo.getDomain(), host)); + List<TenantListVo> list = StreamUtils.filter(voList, vo -> + StringUtils.equals(vo.getDomain(), host)); // 杩斿洖瀵硅薄 LoginTenantVo vo = new LoginTenantVo(); vo.setVoList(CollUtil.isNotEmpty(list) ? list : voList); -- Gitblit v1.9.3