From 3a04098e4cee2a03b6389ec73c9fd4a6c1a0b53e Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Fri, 19 Jul 2019 18:05:24 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhyd/oauth/config/AuthSource.java | 5 ++ .../zhyd/oauth/exception/AuthException.java | 4 ++ .../zhyd/oauth/request/AuthAlipayRequest.java | 4 +- .../zhyd/oauth/request/AuthBaiduRequest.java | 46 ++++++------ .../zhyd/oauth/request/AuthCodingRequest.java | 19 +++-- .../zhyd/oauth/request/AuthCsdnRequest.java | 21 ++++-- .../oauth/request/AuthDefaultRequest.java | 3 + .../zhyd/oauth/request/AuthDouyinRequest.java | 31 ++++---- .../oauth/request/AuthFacebookRequest.java | 47 +++++++----- .../zhyd/oauth/request/AuthGiteeRequest.java | 18 +++-- .../zhyd/oauth/request/AuthGithubRequest.java | 32 +++++---- .../zhyd/oauth/request/AuthGoogleRequest.java | 21 ++++-- .../oauth/request/AuthLinkedinRequest.java | 71 +++++++++++++------ .../oauth/request/AuthMicrosoftRequest.java | 12 +++- .../oauth/request/AuthOschinaRequest.java | 21 ++++-- .../oauth/request/AuthPinterestRequest.java | 25 +++++-- .../me/zhyd/oauth/request/AuthQqRequest.java | 37 ++++++---- .../zhyd/oauth/request/AuthRenrenRequest.java | 2 +- .../request/AuthStackOverflowRequest.java | 21 ++++-- .../request/AuthTencentCloudRequest.java | 23 +++--- .../oauth/request/AuthToutiaoRequest.java | 27 ++++--- .../zhyd/oauth/request/AuthWeChatRequest.java | 10 +-- .../zhyd/oauth/request/AuthWeiboRequest.java | 5 +- .../java/me/zhyd/oauth/utils/CustomTest.java | 63 ++++++++++++++++ .../me/zhyd/oauth/utils/UrlBuilderTest.java | 11 +-- update.md | 2 + 26 files changed, 394 insertions(+), 187 deletions(-) create mode 100644 src/test/java/me/zhyd/oauth/utils/CustomTest.java diff --git a/src/main/java/me/zhyd/oauth/config/AuthSource.java b/src/main/java/me/zhyd/oauth/config/AuthSource.java index 75eef7a..f712210 100644 --- a/src/main/java/me/zhyd/oauth/config/AuthSource.java +++ b/src/main/java/me/zhyd/oauth/config/AuthSource.java @@ -229,6 +229,11 @@ public enum AuthSource { public String userInfo() { return "https://graph.qq.com/user/get_user_info"; } + + @Override + public String refresh() { + return "https://graph.qq.com/oauth2.0/token"; + } }, /** * 微信 diff --git a/src/main/java/me/zhyd/oauth/exception/AuthException.java b/src/main/java/me/zhyd/oauth/exception/AuthException.java index 9393eba..f4f7473 100644 --- a/src/main/java/me/zhyd/oauth/exception/AuthException.java +++ b/src/main/java/me/zhyd/oauth/exception/AuthException.java @@ -30,6 +30,10 @@ public class AuthException extends RuntimeException { super(message, cause); } + public AuthException(Throwable cause) { + super(cause); + } + public int getErrorCode() { return errorCode; } diff --git a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java index b0363a0..18b49ad 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java @@ -9,11 +9,11 @@ import com.alipay.api.response.AlipaySystemOauthTokenResponse; import com.alipay.api.response.AlipayUserInfoShareResponse; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.utils.StringUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -43,7 +43,7 @@ public class AuthAlipayRequest extends AuthDefaultRequest { try { response = this.alipayClient.execute(request); } catch (Exception e) { - throw new AuthException("Unable to get token from alipay using code [" + authCallback.getAuth_code() + "]", e); + throw new AuthException(e); } if (!response.isSuccess()) { throw new AuthException(response.getSubMsg()); diff --git a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java index d23a784..92d97a3 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java @@ -26,14 +26,7 @@ public class AuthBaiduRequest extends AuthDefaultRequest { @Override protected AuthToken getAccessToken(AuthCallback authCallback) { HttpResponse response = doPostAuthorizationCode(authCallback.getCode()); - JSONObject accessTokenObject = JSONObject.parseObject(response.body()); - this.checkResponse(accessTokenObject); - return AuthToken.builder() - .accessToken(accessTokenObject.getString("access_token")) - .refreshToken(accessTokenObject.getString("refresh_token")) - .scope(accessTokenObject.getString("scope")) - .expireIn(accessTokenObject.getIntValue("expires_in")) - .build(); + return getAuthToken(response); } @Override @@ -58,12 +51,7 @@ public class AuthBaiduRequest extends AuthDefaultRequest { public AuthResponse revoke(AuthToken authToken) { HttpResponse response = doGetRevoke(authToken); JSONObject object = JSONObject.parseObject(response.body()); - if (object.containsKey("error_code")) { - return AuthResponse.builder() - .code(AuthResponseStatus.FAILURE.getCode()) - .msg(object.getString("error_msg")) - .build(); - } + this.checkResponse(object); // 返回1表示取消授权成功，否则失败 AuthResponseStatus status = object.getIntValue("result") == 1 ? AuthResponseStatus.SUCCESS : AuthResponseStatus.FAILURE; return AuthResponse.builder().code(status.getCode()).msg(status.getMsg()).build(); @@ -78,16 +66,9 @@ public class AuthBaiduRequest extends AuthDefaultRequest { .queryParam("client_secret", this.config.getClientSecret()) .build(); HttpResponse response = HttpRequest.get(refreshUrl).execute(); - JSONObject object = JSONObject.parseObject(response.body()); - this.checkResponse(object); return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) - .data(AuthToken.builder() - .accessToken(object.getString("access_token")) - .refreshToken(object.getString("refresh_token")) - .scope(object.getString("scope")) - .expireIn(object.getIntValue("expires_in")) - .build()) + .data(this.getAuthToken(response)) .build(); } @@ -107,9 +88,26 @@ public class AuthBaiduRequest extends AuthDefaultRequest { .build(); } + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ private void checkResponse(JSONObject object) { - if (object.containsKey("error")) { - throw new AuthException(object.getString("error_description")); + if (object.containsKey("error") || object.containsKey("error_code")) { + String msg = object.containsKey("error_description") ? object.getString("error_description") : object.getString("error_msg"); + throw new AuthException(msg); } } + + private AuthToken getAuthToken(HttpResponse response) { + JSONObject accessTokenObject = JSONObject.parseObject(response.body()); + this.checkResponse(accessTokenObject); + return AuthToken.builder() + .accessToken(accessTokenObject.getString("access_token")) + .refreshToken(accessTokenObject.getString("refresh_token")) + .scope(accessTokenObject.getString("scope")) + .expireIn(accessTokenObject.getIntValue("expires_in")) + .build(); + } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java b/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java index ea8d0fe..070d57b 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java @@ -28,9 +28,7 @@ public class AuthCodingRequest extends AuthDefaultRequest { protected AuthToken getAccessToken(AuthCallback authCallback) { HttpResponse response = doGetAuthorizationCode(authCallback.getCode()); JSONObject accessTokenObject = JSONObject.parseObject(response.body()); - if (accessTokenObject.getIntValue("code") != 0) { - throw new AuthException("Unable to get token from coding using code [" + authCallback.getCode() + "]: " + accessTokenObject); - } + this.checkResponse(accessTokenObject); return AuthToken.builder() .accessToken(accessTokenObject.getString("access_token")) .expireIn(accessTokenObject.getIntValue("expires_in")) @@ -42,9 +40,7 @@ public class AuthCodingRequest extends AuthDefaultRequest { protected AuthUser getUserInfo(AuthToken authToken) { HttpResponse response = doGetUserInfo(authToken); JSONObject object = JSONObject.parseObject(response.body()); - if (object.getIntValue("code") != 0) { - throw new AuthException(object.getString("msg")); - } + this.checkResponse(object); object = object.getJSONObject("data"); return AuthUser.builder() @@ -63,6 +59,17 @@ public class AuthCodingRequest extends AuthDefaultRequest { .build(); } + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.getIntValue("code") != 0) { + throw new AuthException(object.getString("msg")); + } + } + /** * 返回认证url，可自行跳转页面 * diff --git a/src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java b/src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java index b5dbcfb..9043f04 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthCsdnRequest.java @@ -4,11 +4,11 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; /** * CSDN登录 @@ -28,9 +28,7 @@ public class AuthCsdnRequest extends AuthDefaultRequest { protected AuthToken getAccessToken(AuthCallback authCallback) { HttpResponse response = doPostAuthorizationCode(authCallback.getCode()); JSONObject accessTokenObject = JSONObject.parseObject(response.body()); - if (accessTokenObject.containsKey("error_code")) { - throw new AuthException("Unable to get token from csdn using code [" + authCallback.getCode() + "]: " + accessTokenObject); - } + this.checkResponse(accessTokenObject); return AuthToken.builder().accessToken(accessTokenObject.getString("access_token")).build(); } @@ -38,9 +36,7 @@ public class AuthCsdnRequest extends AuthDefaultRequest { protected AuthUser getUserInfo(AuthToken authToken) { HttpResponse response = doGetUserInfo(authToken); JSONObject object = JSONObject.parseObject(response.body()); - if (object.containsKey("error_code")) { - throw new AuthException(object.getString("error")); - } + this.checkResponse(object); return AuthUser.builder() .uuid(object.getString("username")) .username(object.getString("username")) @@ -51,4 +47,15 @@ public class AuthCsdnRequest extends AuthDefaultRequest { .source(AuthSource.CSDN) .build(); } + + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.containsKey("error_code")) { + throw new AuthException(object.getString("error")); + } + } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java b/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java index a457136..9f022fe 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java @@ -3,6 +3,7 @@ package me.zhyd.oauth.request; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import lombok.Data; +import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.exception.AuthException; @@ -20,6 +21,7 @@ import me.zhyd.oauth.utils.UrlBuilder; * @since 1.8 */ @Data +@Slf4j public abstract class AuthDefaultRequest implements AuthRequest { protected AuthConfig config; protected AuthSource source; @@ -48,6 +50,7 @@ public abstract class AuthDefaultRequest implements AuthRequest { AuthUser user = this.getUserInfo(authToken); return AuthResponse.builder().code(AuthResponseStatus.SUCCESS.getCode()).data(user).build(); } catch (Exception e) { + log.error("Failed to login with oauth authorization.", e); return this.responseError(e); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java b/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java index 9155a82..9c46b4f 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java @@ -32,10 +32,8 @@ public class AuthDouyinRequest extends AuthDefaultRequest { @Override protected AuthUser getUserInfo(AuthToken authToken) { HttpResponse response = doGetUserInfo(authToken); - JSONObject object = JSONObject.parseObject(response.body()); - - JSONObject userInfoObject = this.checkResponse(object); - + JSONObject userInfoObject = JSONObject.parseObject(response.body()); + this.checkResponse(userInfoObject); return AuthUser.builder() .uuid(userInfoObject.getString("union_id")) .username(userInfoObject.getString("nickname")) @@ -52,7 +50,7 @@ public class AuthDouyinRequest extends AuthDefaultRequest { public AuthResponse refresh(AuthToken oldToken) { return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) - .data(refreshTokenUrl(oldToken.getRefreshToken())) + .data(getToken(refreshTokenUrl(oldToken.getRefreshToken()))) .build(); } @@ -60,16 +58,14 @@ public class AuthDouyinRequest extends AuthDefaultRequest { * 检查响应内容是否正确 * * @param object 请求响应内容 - * @return 实际请求数据的json对象 */ - private JSONObject checkResponse(JSONObject object) { + private void checkResponse(JSONObject object) { String message = object.getString("message"); JSONObject data = object.getJSONObject("data"); int errorCode = data.getIntValue("error_code"); if ("error".equals(message) || errorCode != 0) { throw new AuthException(errorCode, data.getString("description")); } - return data; } /** @@ -82,14 +78,13 @@ public class AuthDouyinRequest extends AuthDefaultRequest { HttpResponse response = HttpRequest.post(accessTokenUrl).execute(); String accessTokenStr = response.body(); JSONObject object = JSONObject.parseObject(accessTokenStr); - - JSONObject accessTokenObject = this.checkResponse(object); + this.checkResponse(object); return AuthToken.builder() - .accessToken(accessTokenObject.getString("access_token")) - .openId(accessTokenObject.getString("open_id")) - .expireIn(accessTokenObject.getIntValue("expires_in")) - .refreshToken(accessTokenObject.getString("refresh_token")) - .scope(accessTokenObject.getString("scope")) + .accessToken(object.getString("access_token")) + .openId(object.getString("open_id")) + .expireIn(object.getIntValue("expires_in")) + .refreshToken(object.getString("refresh_token")) + .scope(object.getString("scope")) .build(); } @@ -112,7 +107,7 @@ public class AuthDouyinRequest extends AuthDefaultRequest { /** * 返回获取accessToken的url * - * @param code + * @param code oauth的授权码 * @return 返回获取accessToken的url */ @Override @@ -128,7 +123,7 @@ public class AuthDouyinRequest extends AuthDefaultRequest { /** * 返回获取userInfo的url * - * @param authToken + * @param authToken oauth返回的token * @return 返回获取userInfo的url */ @Override @@ -142,7 +137,7 @@ public class AuthDouyinRequest extends AuthDefaultRequest { /** * 返回获取accessToken的url * - * @param refreshToken + * @param refreshToken oauth返回的refreshtoken * @return 返回获取accessToken的url */ @Override diff --git a/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java b/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java index 66cc036..771c894 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java @@ -4,11 +4,11 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.utils.UrlBuilder; /** @@ -28,11 +28,7 @@ public class AuthFacebookRequest extends AuthDefaultRequest { protected AuthToken getAccessToken(AuthCallback authCallback) { HttpResponse response = doPostAuthorizationCode(authCallback.getCode()); JSONObject accessTokenObject = JSONObject.parseObject(response.body()); - - if (accessTokenObject.containsKey("error")) { - throw new AuthException(accessTokenObject.getJSONObject("error").getString("message")); - } - + this.checkResponse(accessTokenObject); return AuthToken.builder() .accessToken(accessTokenObject.getString("access_token")) .expireIn(accessTokenObject.getIntValue("expires_in")) @@ -45,22 +41,12 @@ public class AuthFacebookRequest extends AuthDefaultRequest { HttpResponse response = doGetUserInfo(authToken); String userInfo = response.body(); JSONObject object = JSONObject.parseObject(userInfo); - if (object.containsKey("error")) { - throw new AuthException(object.getJSONObject("error").getString("message")); - } - String picture = null; - if (object.containsKey("picture")) { - JSONObject pictureObj = object.getJSONObject("picture"); - pictureObj = pictureObj.getJSONObject("data"); - if (null != pictureObj) { - picture = pictureObj.getString("url"); - } - } + this.checkResponse(object); return AuthUser.builder() .uuid(object.getString("id")) .username(object.getString("name")) .nickname(object.getString("name")) - .avatar(picture) + .avatar(getUserPicture(object)) .location(object.getString("locale")) .email(object.getString("email")) .gender(AuthUserGender.getRealGender(object.getString("gender"))) @@ -69,10 +55,22 @@ public class AuthFacebookRequest extends AuthDefaultRequest { .build(); } + private String getUserPicture(JSONObject object) { + String picture = null; + if (object.containsKey("picture")) { + JSONObject pictureObj = object.getJSONObject("picture"); + pictureObj = pictureObj.getJSONObject("data"); + if (null != pictureObj) { + picture = pictureObj.getString("url"); + } + } + return picture; + } + /** * 返回获取userInfo的url * - * @param authToken + * @param authToken 用户token * @return 返回获取userInfo的url */ @Override @@ -82,4 +80,15 @@ public class AuthFacebookRequest extends AuthDefaultRequest { .queryParam("fields", "id,name,birthday,gender,hometown,email,devices,picture.width(400)") .build(); } + + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.containsKey("error")) { + throw new AuthException(object.getJSONObject("error").getString("message")); + } + } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java index 7eee93d..0522003 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java @@ -4,11 +4,11 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; /** * Gitee登录 @@ -27,9 +27,7 @@ public class AuthGiteeRequest extends AuthDefaultRequest { protected AuthToken getAccessToken(AuthCallback authCallback) { HttpResponse response = doPostAuthorizationCode(authCallback.getCode()); JSONObject accessTokenObject = JSONObject.parseObject(response.body()); - if (accessTokenObject.containsKey("error")) { - throw new AuthException("Unable to get token from gitee using code [" + authCallback.getCode() + "]: " + accessTokenObject); - } + this.checkResponse(accessTokenObject); return AuthToken.builder() .accessToken(accessTokenObject.getString("access_token")) .refreshToken(accessTokenObject.getString("refresh_token")) @@ -44,6 +42,7 @@ public class AuthGiteeRequest extends AuthDefaultRequest { HttpResponse response = doGetUserInfo(authToken); String userInfo = response.body(); JSONObject object = JSONObject.parseObject(userInfo); + this.checkResponse(object); return AuthUser.builder() .uuid(object.getString("id")) .username(object.getString("login")) @@ -59,4 +58,15 @@ public class AuthGiteeRequest extends AuthDefaultRequest { .source(AuthSource.GITEE) .build(); } + + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.containsKey("error")) { + throw new AuthException(object.getString("error_description")); + } + } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java index b2b23fc..c843a8b 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java @@ -4,14 +4,11 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; -import me.zhyd.oauth.utils.GlobalAuthUtil; - -import java.util.Map; /** * Github登录 @@ -29,22 +26,20 @@ public class AuthGithubRequest extends AuthDefaultRequest { @Override protected AuthToken getAccessToken(AuthCallback authCallback) { HttpResponse response = doPostAuthorizationCode(authCallback.getCode()); - Map res = GlobalAuthUtil.parseStringToMap(response.body()); - if (res.containsKey("error")) { - throw new AuthException(res.get("error") + ":" + res.get("error_description")); - } + JSONObject accessTokenObject = JSONObject.parseObject(response.body()); + this.checkResponse(accessTokenObject); return AuthToken.builder() - .accessToken(res.get("access_token")) - .scope(res.get("scope")) - .tokenType(res.get("token_type")) + .accessToken(accessTokenObject.getString("access_token")) + .scope(accessTokenObject.getString("scope")) + .tokenType(accessTokenObject.getString("token_type")) .build(); } @Override protected AuthUser getUserInfo(AuthToken authToken) { HttpResponse response = doGetUserInfo(authToken); - String userInfo = response.body(); - JSONObject object = JSONObject.parseObject(userInfo); + JSONObject object = JSONObject.parseObject(response.body()); + this.checkResponse(object); return AuthUser.builder() .uuid(object.getString("id")) .username(object.getString("login")) @@ -60,4 +55,15 @@ public class AuthGithubRequest extends AuthDefaultRequest { .source(AuthSource.GITHUB) .build(); } + + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.containsKey("error")) { + throw new AuthException(object.getString("error_description")); + } + } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java index 77eae2b..a6a603a 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java @@ -4,11 +4,11 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.utils.UrlBuilder; /** @@ -28,12 +28,7 @@ public class AuthGoogleRequest extends AuthDefaultRequest { protected AuthToken getAccessToken(AuthCallback authCallback) { HttpResponse response = doPostAuthorizationCode(authCallback.getCode()); JSONObject accessTokenObject = JSONObject.parseObject(response.body()); - - if (accessTokenObject.containsKey("error") || accessTokenObject.containsKey("error_description")) { - throw new AuthException("get google access_token has error:[" + accessTokenObject.getString("error") + "], error_description:[" + accessTokenObject - .getString("error_description") + "]"); - } - + this.checkResponse(accessTokenObject); return AuthToken.builder() .accessToken(accessTokenObject.getString("access_token")) .expireIn(accessTokenObject.getIntValue("expires_in")) @@ -48,6 +43,7 @@ public class AuthGoogleRequest extends AuthDefaultRequest { HttpResponse response = doGetUserInfo(authToken); String userInfo = response.body(); JSONObject object = JSONObject.parseObject(userInfo); + this.checkResponse(object); return AuthUser.builder() .uuid(object.getString("sub")) .username(object.getString("name")) @@ -87,4 +83,15 @@ public class AuthGoogleRequest extends AuthDefaultRequest { protected String userInfoUrl(AuthToken authToken) { return UrlBuilder.fromBaseUrl(source.userInfo()).queryParam("id_token", authToken.getAccessToken()).build(); } + + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.containsKey("error") || object.containsKey("error_description")) { + throw new AuthException(object.getString("error_description")); + } + } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java b/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java index b019eb0..b552256 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java @@ -43,7 +43,32 @@ public class AuthLinkedinRequest extends AuthDefaultRequest { this.checkResponse(userInfoObject); - // 组装用户名 + String userName = getUserName(userInfoObject); + + // 获取用户头像 + String avatar = this.getAvatar(userInfoObject); + + // 获取用户邮箱地址 + String email = this.getUserEmail(accessToken); + return AuthUser.builder() + .uuid(userInfoObject.getString("id")) + .username(userName) + .nickname(userName) + .avatar(avatar) + .email(email) + .token(authToken) + .gender(AuthUserGender.UNKNOWN) + .source(AuthSource.LINKEDIN) + .build(); + } + + /** + * 获取用户的真实名 + * + * @param userInfoObject 用户json对象 + * @return 用户名 + */ + private String getUserName(JSONObject userInfoObject) { String firstName, lastName; // 获取firstName if (userInfoObject.containsKey("localizedFirstName")) { @@ -57,9 +82,16 @@ public class AuthLinkedinRequest extends AuthDefaultRequest { } else { lastName = getUserName(userInfoObject, "lastName"); } - String userName = firstName + " " + lastName; + return firstName + " " + lastName; + } - // 获取用户头像 + /** + * 获取用户的头像 + * + * @param userInfoObject 用户json对象 + * @return 用户的头像地址 + */ + private String getAvatar(JSONObject userInfoObject) { String avatar = null; JSONObject profilePictureObject = userInfoObject.getJSONObject("profilePicture"); if (profilePictureObject.containsKey("displayImage~")) { @@ -70,21 +102,15 @@ public class AuthLinkedinRequest extends AuthDefaultRequest { avatar = largestImageObj.getJSONArray("identifiers").getJSONObject(0).getString("identifier"); } } - - // 获取用户邮箱地址 - String email = this.getUserEmail(accessToken); - return AuthUser.builder() - .uuid(userInfoObject.getString("id")) - .username(userName) - .nickname(userName) - .avatar(avatar) - .email(email) - .token(authToken) - .gender(AuthUserGender.UNKNOWN) - .source(AuthSource.LINKEDIN) - .build(); + return avatar; } + /** + * 获取用户的email + * + * @param accessToken 用户授权后返回的token + * @return 用户的邮箱地址 + */ private String getUserEmail(String accessToken) { String email = null; HttpResponse emailResponse = HttpRequest.get("https://api.linkedin.com/v2/emailAddress?q=members&projection=(elements*(handle~))") @@ -92,8 +118,8 @@ public class AuthLinkedinRequest extends AuthDefaultRequest { .header("Connection", "Keep-Alive") .header("Authorization", "Bearer " + accessToken) .execute(); - System.out.println(emailResponse.body()); JSONObject emailObj = JSONObject.parseObject(emailResponse.body()); + this.checkResponse(emailObj); if (emailObj.containsKey("elements")) { email = emailObj.getJSONArray("elements") .getJSONObject(0) @@ -125,9 +151,14 @@ public class AuthLinkedinRequest extends AuthDefaultRequest { .build(); } - private void checkResponse(JSONObject userInfoObject) { - if (userInfoObject.containsKey("error")) { - throw new AuthException(userInfoObject.getString("error_description")); + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.containsKey("error")) { + throw new AuthException(object.getString("error_description")); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java index 08fe041..4b5e864 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java @@ -55,9 +55,14 @@ public class AuthMicrosoftRequest extends AuthDefaultRequest { .build(); } - private void checkResponse(JSONObject response) { - if (response.containsKey("error")) { - throw new AuthException(response.getString("error_description")); + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.containsKey("error")) { + throw new AuthException(object.getString("error_description")); } } @@ -69,6 +74,7 @@ public class AuthMicrosoftRequest extends AuthDefaultRequest { HttpResponse response = HttpRequest.get(userInfoUrl(authToken)).header("Authorization", jwt).execute(); String userInfo = response.body(); JSONObject object = JSONObject.parseObject(userInfo); + this.checkResponse(object); return AuthUser.builder() .uuid(object.getString("id")) .username(object.getString("userPrincipalName")) diff --git a/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java b/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java index 861d7a8..955a807 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthOschinaRequest.java @@ -4,11 +4,11 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.utils.UrlBuilder; /** @@ -28,9 +28,7 @@ public class AuthOschinaRequest extends AuthDefaultRequest { protected AuthToken getAccessToken(AuthCallback authCallback) { HttpResponse response = doPostAuthorizationCode(authCallback.getCode()); JSONObject accessTokenObject = JSONObject.parseObject(response.body()); - if (accessTokenObject.containsKey("error")) { - throw new AuthException("Unable to get token from oschina using code [" + authCallback.getCode() + "]: " + accessTokenObject); - } + this.checkResponse(accessTokenObject); return AuthToken.builder() .accessToken(accessTokenObject.getString("access_token")) .refreshToken(accessTokenObject.getString("refresh_token")) @@ -43,9 +41,7 @@ public class AuthOschinaRequest extends AuthDefaultRequest { protected AuthUser getUserInfo(AuthToken authToken) { HttpResponse response = doGetUserInfo(authToken); JSONObject object = JSONObject.parseObject(response.body()); - if (object.containsKey("error")) { - throw new AuthException(object.getString("error_description")); - } + this.checkResponse(object); return AuthUser.builder() .uuid(object.getString("id")) .username(object.getString("name")) @@ -91,4 +87,15 @@ public class AuthOschinaRequest extends AuthDefaultRequest { .queryParam("dataType", "json") .build(); } + + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.containsKey("error")) { + throw new AuthException(object.getString("error_description")); + } + } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthPinterestRequest.java b/src/main/java/me/zhyd/oauth/request/AuthPinterestRequest.java index 2774ceb..e86a247 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthPinterestRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthPinterestRequest.java @@ -4,11 +4,11 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.utils.UrlBuilder; import java.util.Objects; @@ -24,6 +24,8 @@ import static me.zhyd.oauth.config.AuthSource.PINTEREST; */ public class AuthPinterestRequest extends AuthDefaultRequest { + private static final String FAILURE = "failure"; + public AuthPinterestRequest(AuthConfig config) { super(config, PINTEREST); } @@ -32,10 +34,7 @@ public class AuthPinterestRequest extends AuthDefaultRequest { protected AuthToken getAccessToken(AuthCallback authCallback) { HttpResponse response = doPostAuthorizationCode(authCallback.getCode()); JSONObject accessTokenObject = JSONObject.parseObject(response.body()); - if (!response.isOk()) { - throw new AuthException("Unable to get token from Pinterest using code [" + authCallback.getCode() + "]: " + accessTokenObject); - } - + this.checkResponse(accessTokenObject); return AuthToken.builder() .accessToken(accessTokenObject.getString("access_token")) .tokenType(accessTokenObject.getString("token_type")) @@ -48,8 +47,9 @@ public class AuthPinterestRequest extends AuthDefaultRequest { .queryParam("fields", "id,username,first_name,last_name,bio,image") .build(); HttpResponse response = HttpRequest.post(userinfoUrl).execute(); - JSONObject userObj = JSONObject.parseObject(response.body()).getJSONObject("data"); - + JSONObject object = JSONObject.parseObject(response.body()); + this.checkResponse(object); + JSONObject userObj = object.getJSONObject("data"); return AuthUser.builder() .uuid(userObj.getString("id")) .avatar(getAvatarUrl(userObj)) @@ -82,4 +82,15 @@ public class AuthPinterestRequest extends AuthDefaultRequest { .build(); } + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (!object.containsKey("status") && FAILURE.equals(object.getString("status"))) { + throw new AuthException(object.getString("message")); + } + } + } diff --git a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java index cb1536c..7943ea3 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java @@ -6,11 +6,9 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; -import me.zhyd.oauth.exception.AuthException; -import me.zhyd.oauth.model.AuthCallback; -import me.zhyd.oauth.model.AuthToken; -import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.enums.AuthUserGender; +import me.zhyd.oauth.exception.AuthException; +import me.zhyd.oauth.model.*; import me.zhyd.oauth.utils.GlobalAuthUtil; import me.zhyd.oauth.utils.StringUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -33,14 +31,15 @@ public class AuthQqRequest extends AuthDefaultRequest { @Override protected AuthToken getAccessToken(AuthCallback authCallback) { HttpResponse response = doGetAuthorizationCode(authCallback.getCode()); - Map accessTokenObject = GlobalAuthUtil.parseStringToMap(response.body()); - if (!accessTokenObject.containsKey("access_token")) { - throw new AuthException("Unable to get token from qq using code [" + authCallback.getCode() + "]: " + accessTokenObject); - } - return AuthToken.builder() - .accessToken(accessTokenObject.get("access_token")) - .expireIn(Integer.valueOf(accessTokenObject.get("expires_in"))) - .refreshToken(accessTokenObject.get("refresh_token")) + return getAuthToken(response); + } + + @Override + public AuthResponse refresh(AuthToken authToken) { + HttpResponse response = HttpRequest.get(refreshTokenUrl(authToken.getRefreshToken())).execute(); + return AuthResponse.builder() + .code(AuthResponseStatus.SUCCESS.getCode()) + .data(getAuthToken(response)) .build(); } @@ -97,7 +96,7 @@ public class AuthQqRequest extends AuthDefaultRequest { /** * 返回获取userInfo的url * - * @param authToken + * @param authToken 用户授权token * @return 返回获取userInfo的url */ @Override @@ -108,4 +107,16 @@ public class AuthQqRequest extends AuthDefaultRequest { .queryParam("openid", authToken.getOpenId()) .build(); } + + private AuthToken getAuthToken(HttpResponse response) { + Map accessTokenObject = GlobalAuthUtil.parseStringToMap(response.body()); + if (!accessTokenObject.containsKey("access_token") || accessTokenObject.containsKey("code")) { + throw new AuthException(accessTokenObject.get("msg")); + } + return AuthToken.builder() + .accessToken(accessTokenObject.get("access_token")) + .expireIn(Integer.valueOf(accessTokenObject.get("expires_in"))) + .refreshToken(accessTokenObject.get("refresh_token")) + .build(); + } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java b/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java index 6fb94a2..c4d4af5 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java @@ -60,7 +60,7 @@ public class AuthRenrenRequest extends AuthDefaultRequest { private AuthToken getToken(String url) { HttpResponse response = HttpRequest.post(url).execute(); JSONObject jsonObject = JSONObject.parseObject(response.body()); - if (!response.isOk()) { + if (jsonObject.containsKey("error")) { throw new AuthException("Failed to get token from Renren: " + jsonObject); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthStackOverflowRequest.java b/src/main/java/me/zhyd/oauth/request/AuthStackOverflowRequest.java index 3ce285b..3784012 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthStackOverflowRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthStackOverflowRequest.java @@ -4,11 +4,11 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.utils.UrlBuilder; import static me.zhyd.oauth.config.AuthSource.STACK_OVERFLOW; @@ -35,9 +35,7 @@ public class AuthStackOverflowRequest extends AuthDefaultRequest { .form(parseQueryToMap(accessTokenUrl)) .execute(); JSONObject accessTokenObject = JSONObject.parseObject(response.body()); - if (!response.isOk()) { - throw new AuthException("Unable to get token from Stack Overflow using code [" + authCallback.getCode() + "]: " + accessTokenObject); - } + this.checkResponse(accessTokenObject); return AuthToken.builder() .accessToken(accessTokenObject.getString("access_token")) @@ -53,7 +51,9 @@ public class AuthStackOverflowRequest extends AuthDefaultRequest { .queryParam("key", this.config.getStackOverflowKey()) .build(); HttpResponse response = HttpRequest.get(userInfoUrl).execute(); - JSONObject userObj = JSONObject.parseObject(response.body()).getJSONArray("items").getJSONObject(0); + JSONObject object = JSONObject.parseObject(response.body()); + this.checkResponse(object); + JSONObject userObj = object.getJSONArray("items").getJSONObject(0); return AuthUser.builder() .uuid(userObj.getString("user_id")) @@ -77,4 +77,15 @@ public class AuthStackOverflowRequest extends AuthDefaultRequest { .queryParam("scope", "read_inbox") .build(); } + + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.containsKey("error")) { + throw new AuthException(object.getString("error_description")); + } + } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java b/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java index e5fc100..8a817c4 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthTencentCloudRequest.java @@ -4,11 +4,11 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.utils.UrlBuilder; /** @@ -28,10 +28,7 @@ public class AuthTencentCloudRequest extends AuthDefaultRequest { protected AuthToken getAccessToken(AuthCallback authCallback) { HttpResponse response = doGetAuthorizationCode(authCallback.getCode()); JSONObject accessTokenObject = JSONObject.parseObject(response.body()); - if (accessTokenObject.getIntValue("code") != 0) { - throw new AuthException("Unable to get token from tencent cloud using code [" + authCallback.getCode() + "]: " + accessTokenObject - .get("msg")); - } + this.checkResponse(accessTokenObject); return AuthToken.builder() .accessToken(accessTokenObject.getString("access_token")) .expireIn(accessTokenObject.getIntValue("expires_in")) @@ -43,9 +40,8 @@ public class AuthTencentCloudRequest extends AuthDefaultRequest { protected AuthUser getUserInfo(AuthToken authToken) { HttpResponse response = doGetUserInfo(authToken); JSONObject object = JSONObject.parseObject(response.body()); - if (object.getIntValue("code") != 0) { - throw new AuthException(object.getString("msg")); - } + this.checkResponse(object); + object = object.getJSONObject("data"); return AuthUser.builder() .uuid(object.getString("id")) @@ -63,6 +59,17 @@ public class AuthTencentCloudRequest extends AuthDefaultRequest { .build(); } + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.getIntValue("code") != 0) { + throw new AuthException(object.getString("msg")); + } + } + /** * 返回认证url，可自行跳转页面 * diff --git a/src/main/java/me/zhyd/oauth/request/AuthToutiaoRequest.java b/src/main/java/me/zhyd/oauth/request/AuthToutiaoRequest.java index a810aed..85ff25e 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthToutiaoRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthToutiaoRequest.java @@ -5,11 +5,11 @@ import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.enums.AuthToutiaoErrorCode; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.utils.UrlBuilder; /** @@ -30,10 +30,7 @@ public class AuthToutiaoRequest extends AuthDefaultRequest { HttpResponse response = doGetAuthorizationCode(authCallback.getCode()); JSONObject accessTokenObject = JSONObject.parseObject(response.body()); - if (accessTokenObject.containsKey("error_code")) { - throw new AuthException(AuthToutiaoErrorCode.getErrorCode(accessTokenObject.getIntValue("error_code")) - .getDesc()); - } + this.checkResponse(accessTokenObject); return AuthToken.builder() .accessToken(accessTokenObject.getString("access_token")) @@ -48,9 +45,7 @@ public class AuthToutiaoRequest extends AuthDefaultRequest { JSONObject userProfile = JSONObject.parseObject(userResponse.body()); - if (userProfile.containsKey("error_code")) { - throw new AuthException(AuthToutiaoErrorCode.getErrorCode(userProfile.getIntValue("error_code")).getDesc()); - } + this.checkResponse(userProfile); JSONObject user = userProfile.getJSONObject("data"); @@ -89,7 +84,7 @@ public class AuthToutiaoRequest extends AuthDefaultRequest { /** * 返回获取accessToken的url * - * @param code + * @param code 授权码 * @return 返回获取accessToken的url */ @Override @@ -105,7 +100,7 @@ public class AuthToutiaoRequest extends AuthDefaultRequest { /** * 返回获取userInfo的url * - * @param authToken + * @param authToken 用户授权后的token * @return 返回获取userInfo的url */ @Override @@ -115,4 +110,16 @@ public class AuthToutiaoRequest extends AuthDefaultRequest { .queryParam("access_token", authToken.getAccessToken()) .build(); } + + /** + * 检查响应内容是否正确 + * + * @param object 请求响应内容 + */ + private void checkResponse(JSONObject object) { + if (object.containsKey("error_code")) { + throw new AuthException(AuthToutiaoErrorCode.getErrorCode(object.getIntValue("error_code")) + .getDesc()); + } + } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java index a3c5a64..2d426c5 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatRequest.java @@ -118,7 +118,7 @@ public class AuthWeChatRequest extends AuthDefaultRequest { /** * 返回获取accessToken的url * - * @param code + * @param code 授权码 * @return 返回获取accessToken的url */ @Override @@ -134,7 +134,7 @@ public class AuthWeChatRequest extends AuthDefaultRequest { /** * 返回获取userInfo的url * - * @param authToken + * @param authToken 用户授权后的token * @return 返回获取userInfo的url */ @Override @@ -147,10 +147,10 @@ public class AuthWeChatRequest extends AuthDefaultRequest { } /** - * 返回获取accessToken的url + * 返回获取userInfo的url * - * @param refreshToken - * @return 返回获取accessToken的url + * @param refreshToken getAccessToken方法返回的refreshToken + * @return 返回获取userInfo的url */ @Override protected String refreshTokenUrl(String refreshToken) { diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java index 6f25ba1..a792573 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java @@ -5,11 +5,11 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONObject; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; +import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.enums.AuthUserGender; import me.zhyd.oauth.utils.IpUtils; import me.zhyd.oauth.utils.StringUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -34,8 +34,7 @@ public class AuthWeiboRequest extends AuthDefaultRequest { String accessTokenStr = response.body(); JSONObject accessTokenObject = JSONObject.parseObject(accessTokenStr); if (accessTokenObject.containsKey("error")) { - throw new AuthException("Unable to get token from weibo using code [" + authCallback.getCode() + "]:" + accessTokenObject - .getString("error_description")); + throw new AuthException(accessTokenObject.getString("error_description")); } return AuthToken.builder() .accessToken(accessTokenObject.getString("access_token")) diff --git a/src/test/java/me/zhyd/oauth/utils/CustomTest.java b/src/test/java/me/zhyd/oauth/utils/CustomTest.java new file mode 100644 index 0000000..eab7ddd --- /dev/null +++ b/src/test/java/me/zhyd/oauth/utils/CustomTest.java @@ -0,0 +1,63 @@ +package me.zhyd.oauth.utils; + +import org.junit.Test; + +/** + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0 + * @website https://www.zhyd.me + * @date 2019/7/19 15:52 + * @since 1.8 + */ +public class CustomTest { + + /** + * 1000000: 23135ms + * 100000: 3016ms + * 10000: 328ms + * 1000: 26ms + */ + @Test + public void test() { + long start = System.currentTimeMillis(); + for (int i = 0; i < 1000; i++) { + callMethod(); + } + long end = System.currentTimeMillis(); + System.out.println((end - start) + "ms"); + + } + + /** + * 1000000: 19058ms + * 100000: 2772ms + * 10000: 323ms + * 1000: 29ms + */ + @Test + public void test2() { + long end = System.currentTimeMillis(); + for (int i = 0; i < 1000; i++) { + callMethod2(); + } + long end2 = System.currentTimeMillis(); + System.out.println((end2 - end) + "ms"); + + } + + public String callMethod() { + StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); +// for (StackTraceElement stackTraceElement : stackTrace) { +// System.out.println(stackTraceElement.getMethodName()); +// } + return stackTrace[2].getMethodName(); + } + + public String callMethod2() { + StackTraceElement[] stackTrace = (new Throwable()).getStackTrace(); +// for (StackTraceElement stackTraceElement : stackTrace) { +// System.out.println(stackTraceElement.getMethodName()); +// } + return stackTrace[2].getMethodName(); + } +} diff --git a/src/test/java/me/zhyd/oauth/utils/UrlBuilderTest.java b/src/test/java/me/zhyd/oauth/utils/UrlBuilderTest.java index 763ee29..161031e 100644 --- a/src/test/java/me/zhyd/oauth/utils/UrlBuilderTest.java +++ b/src/test/java/me/zhyd/oauth/utils/UrlBuilderTest.java @@ -17,11 +17,12 @@ import org.junit.Test; public class UrlBuilderTest { @Test public void testUrlBuilder() { - AuthConfig config = new AuthConfig(); - config.setClientId("appid-110110110"); - config.setClientSecret("secret-110110110"); - config.setRedirectUri("https://xkcoding.com"); - config.setState(AuthState.create(AuthSource.WECHAT)); + AuthConfig config = AuthConfig.builder() + .clientId("appid-110110110") + .clientSecret("secret-110110110") + .redirectUri("https://xkcoding.com") + .state(AuthState.create(AuthSource.WECHAT)) + .build(); String build = UrlBuilder.fromBaseUrl(AuthSource.WECHAT.authorize()) .queryParam("appid", config.getClientId()) .queryParam("redirect_uri", config.getRedirectUri()) diff --git a/update.md b/update.md index a7813c0..ce8152e 100644 --- a/update.md +++ b/update.md @@ -6,6 +6,8 @@ 4. 优化百度授权流程，增加refresh token的方法 5. 优化`AuthConfig`、`AuthResponse`类，去掉不必要的lombonk注解，减少编译后的代码量 6. 使用lombok注解优化枚举类 +7. `AuthQqRequest`增加refresh方法 +8. 优化代码 ### 2019/07/18 -- GitLab