lxm_library_java/JustAuth
1
0
Fork 0
mirror of synced 2026-04-27 03:58:41 +08:00
Code Issues Projects Releases Wiki Activity

🔖 发布1.14.0，解耦HTTP工具

Browse Source
This commit is contained in:
yadong.zhang
2020-03-17 22:57:53 +08:00
parent d5a8ffcab2
commit 65c60a61b3
14 changed files with 77 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java
View File

@@ -725,6 +725,12 @@ public enum AuthDefaultSource implements AuthSource {
}
},
/**
* 飞书
* 注意：该平台暂时存在问题，请不要使用。待修复完成后会重新发版
*
* @since 1.14.0
*/
FEISHU{
@Override
public String authorize() {

55
src/main/java/me/zhyd/oauth/request/AuthFeishuRequest.java
View File

@@ -1,9 +1,9 @@
package me.zhyd.oauth.request;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.xkcoding.http.HttpUtil;
import com.xkcoding.http.support.HttpHeader;
import me.zhyd.oauth.config.AuthConfig;
import me.zhyd.oauth.config.AuthDefaultSource;
import me.zhyd.oauth.enums.AuthResponseStatus;
@@ -12,28 +12,33 @@ import me.zhyd.oauth.model.AuthCallback;
import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthToken;
import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.utils.GlobalAuthUtil;
import me.zhyd.oauth.utils.GlobalAuthUtils;
import me.zhyd.oauth.utils.UrlBuilder;
/**
* 注意：该平台暂时存在问题，请不要使用。待修复完成后会重新发版by yadong.zhang
*
* @author beacon
* @since 1.14.0
*/
@Deprecated
public class AuthFeishuRequest extends AuthDefaultRequest {
public AuthFeishuRequest(AuthConfig config) {
super(config, AuthDefaultSource.FEISHU);
throw new AuthException(AuthResponseStatus.FAILURE);
}
@Override
protected AuthToken getAccessToken(AuthCallback authCallback) {
JSONObject requestObject = new JSONObject();
requestObject.put("app_id",config.getClientId());
requestObject.put("app_secret",config.getClientSecret());
requestObject.put("grant_type","authorization_code");
requestObject.put("code",authCallback.getCode());
HttpResponse httpResponse = HttpRequest.post(source.accessToken()).body(requestObject.toJSONString(), "application/json").execute();
JSONObject jsonObject = JSON.parseObject(httpResponse.body());
requestObject.put("app_id", config.getClientId());
requestObject.put("app_secret", config.getClientSecret());
requestObject.put("grant_type", "authorization_code");
requestObject.put("code", authCallback.getCode());
String response = HttpUtil.post(source.accessToken(), requestObject.toJSONString(), new HttpHeader()
.add("Content-Type", "application/json"));
JSONObject jsonObject = JSON.parseObject(response);
this.checkResponse(jsonObject);
return AuthToken.builder()
.accessToken(jsonObject.getString("access_token"))
@@ -48,8 +53,10 @@ public class AuthFeishuRequest extends AuthDefaultRequest {
@Override
protected AuthUser getUserInfo(AuthToken authToken) {
String accessToken = authToken.getAccessToken();
HttpResponse userInfoResponse = HttpRequest.get(source.userInfo()).header("Authorization", "Bearer " + accessToken).execute();
JSONObject jsonObject = JSON.parseObject(userInfoResponse.body());
String response = HttpUtil.get(source.userInfo(), null, new HttpHeader()
.add("Content-Type", "application/json")
.add("Authorization", "Bearer " + accessToken), false);
JSONObject jsonObject = JSON.parseObject(response);
return AuthUser.builder()
.avatar(jsonObject.getString("AvatarUrl"))
.username(jsonObject.getString("Mobile"))
@@ -61,14 +68,13 @@ public class AuthFeishuRequest extends AuthDefaultRequest {
@Override
public AuthResponse refresh(AuthToken authToken) {
JSONObject requestObject = new JSONObject();
requestObject.put("app_id",config.getClientId());
requestObject.put("app_secret",config.getClientSecret());
requestObject.put("grant_type","refresh_token");
requestObject.put("refresh_token",authToken.getRefreshToken());
HttpResponse httpResponse = HttpRequest.post(source.refresh())
.body(requestObject.toJSONString(), "application/json")
.execute();
JSONObject jsonObject = JSON.parseObject(httpResponse.body());
requestObject.put("app_id", config.getClientId());
requestObject.put("app_secret", config.getClientSecret());
requestObject.put("grant_type", "refresh_token");
requestObject.put("refresh_token", authToken.getRefreshToken());
String response = HttpUtil.post(source.refresh(), requestObject.toJSONString(), new HttpHeader()
.add("Content-Type", "application/json"));
JSONObject jsonObject = JSON.parseObject(response);
this.checkResponse(jsonObject);
return AuthResponse.builder()
.code(AuthResponseStatus.SUCCESS.getCode())
@@ -86,19 +92,20 @@ public class AuthFeishuRequest extends AuthDefaultRequest {
@Override
public String authorize(String state) {
return UrlBuilder.fromBaseUrl(source.authorize())
.queryParam("app_id",config.getClientId())
.queryParam("redirect_uri", GlobalAuthUtil.urlEncode(config.getRedirectUri()))
.queryParam("state",getRealState(state))
.queryParam("app_id", config.getClientId())
.queryParam("redirect_uri", GlobalAuthUtils.urlEncode(config.getRedirectUri()))
.queryParam("state", getRealState(state))
.build();
}
/**
* 校验响应内容是否正确
*
* @param jsonObject 响应内容
*/
private void checkResponse(JSONObject jsonObject){
if(jsonObject.getIntValue("code") != 0){
private void checkResponse(JSONObject jsonObject) {
if (jsonObject.getIntValue("code") != 0) {
throw new AuthException(jsonObject.getString("message"));
}
}

1
src/main/java/me/zhyd/oauth/utils/AuthChecker.java
View File

@@ -91,6 +91,7 @@ public class AuthChecker {
* 2. {@code state}为前端伪造，本身就不存在
*
* @param state {@code state}一定不为空
* @param source {@code source}当前授权平台
* @param authStateCache {@code authStateCache} state缓存实现
*/
public static void checkState(String state, AuthSource source, AuthStateCache authStateCache) {