⚡ 完善第三方登录逻辑

blade-auth/src/main/java/org/springblade/auth/endpoint/BladeSocialEndpoint.java

@@ -0,0 +1,86 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.auth.endpoint;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthToken;
+import me.zhyd.oauth.request.AuthRequest;
+import me.zhyd.oauth.utils.AuthStateUtils;
+import org.springblade.core.social.props.SocialProperties;
+import org.springblade.core.social.utils.SocialUtil;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * SocialEndpoint
+ *
+ * @author Chill
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+@ConditionalOnProperty(value = "social.enabled", havingValue = "true")
+public class BladeSocialEndpoint {
+
+	private final SocialProperties socialProperties;
+
+	/**
+	 * 授权完毕跳转
+	 */
+	@RequestMapping("/oauth/render/{source}")
+	public void renderAuth(@PathVariable("source") String source, HttpServletResponse response) throws IOException {
+		AuthRequest authRequest = SocialUtil.getAuthRequest(source, socialProperties);
+		String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());
+		response.sendRedirect(authorizeUrl);
+	}
+
+	/**
+	 * 获取认证信息
+	 */
+	@RequestMapping("/oauth/callback/{source}")
+	public Object login(@PathVariable("source") String source, AuthCallback callback) {
+		AuthRequest authRequest = SocialUtil.getAuthRequest(source, socialProperties);
+		return authRequest.login(callback);
+	}
+
+	/**
+	 * 撤销授权
+	 */
+	@RequestMapping("/oauth/revoke/{source}/{token}")
+	public Object revokeAuth(@PathVariable("source") String source, @PathVariable("token") String token) {
+		AuthRequest authRequest = SocialUtil.getAuthRequest(source, socialProperties);
+		return authRequest.revoke(AuthToken.builder().accessToken(token).build());
+	}
+
+	/**
+	 * 续期令牌
+	 */
+	@RequestMapping("/oauth/refresh/{source}")
+	public Object refreshAuth(@PathVariable("source") String source, String token) {
+		AuthRequest authRequest = SocialUtil.getAuthRequest(source, socialProperties);
+		return authRequest.refresh(AuthToken.builder().refreshToken(token).build());
+	}
+
+
+}

blade-auth/src/main/resources/application.yml

@@ -31,20 +31,20 @@ social:
     GITHUB:
       client-id: 233************
       client-secret: 233************************************
-      redirect-uri: ${blade.social.domain}/oauth/redirect/github
+      redirect-uri: ${social.domain}/oauth/redirect/github
     GITEE:
       client-id: 233************
       client-secret: 233************************************
-      redirect-uri: ${blade.social.domain}/oauth/redirect/gitee
+      redirect-uri: ${social.domain}/oauth/redirect/gitee
     WECHAT_OPEN:
       client-id: 233************
       client-secret: 233************************************
-      redirect-uri: ${blade.social.domain}/oauth/redirect/wechat
+      redirect-uri: ${social.domain}/oauth/redirect/wechat
     QQ:
       client-id: 233************
       client-secret: 233************************************
-      redirect-uri: ${blade.social.domain}/oauth/redirect/qq
+      redirect-uri: ${social.domain}/oauth/redirect/qq
     DINGTALK:
       client-id: 233************
       client-secret: 233************************************
-      redirect-uri: ${blade.social.domain}/oauth/redirect/dingtalk
+      redirect-uri: ${social.domain}/oauth/redirect/dingtalk

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/UserOauth.java

@@ -37,13 +37,12 @@ public class UserOauth implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-
 	/**
 	 * 主键
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
 	@ApiModelProperty(value = "主键")
-	@TableId(value = "id", type = IdType.ID_WORKER)
+	@TableId(value = "id", type = IdType.ASSIGN_ID)
 	private Long id;
 
 	/**
@@ -55,8 +54,7 @@ public class UserOauth implements Serializable {
 	 * 用户名
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty(value = "主键")
-	@TableId(value = "id", type = IdType.ID_WORKER)
+	@ApiModelProperty(value = "用户主键")
 	private Long userId;
 
 	/**

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -267,13 +267,20 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		if (userCnt > 0) {
 			throw new ApiException("当前系统用户名已存在!");
 		}
-		user.setTenantId(AuthUtil.getTenantId());
+		UserOauth userOauth = userOauthService.getById(oauthId);
+		if (userOauth == null || userOauth.getId() == null) {
+			throw new ApiException("第三方登陆信息错误!");
+		}
 		user.setRealName(user.getName());
+		user.setAvatar(userOauth.getAvatar());
+		user.setPassword(DigestUtil.encrypt(user.getPassword()));
+		user.setRoleId(StringPool.MINUS_ONE);
+		user.setDeptId(StringPool.MINUS_ONE);
+		user.setPostId(StringPool.MINUS_ONE);
 		boolean userTemp = this.save(user);
-		UserOauth uo = new UserOauth();
-		uo.setId(oauthId);
-		uo.setUserId(user.getId());
-		boolean oauthTemp = userOauthService.updateById(uo);
+		userOauth.setUserId(user.getId());
+		userOauth.setTenantId(user.getTenantId());
+		boolean oauthTemp = userOauthService.updateById(userOauth);
 		return (userTemp && oauthTemp);
 	}