♻️ 优化代码
This commit is contained in:
@@ -9,8 +9,6 @@ import me.zhyd.oauth.enums.AuthBaiduErrorCode;
|
||||
import me.zhyd.oauth.exception.AuthException;
|
||||
import me.zhyd.oauth.model.*;
|
||||
import me.zhyd.oauth.url.BaiduUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthRevokeEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
/**
|
||||
@@ -28,10 +26,7 @@ public class AuthBaiduRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.post(accessTokenUrl).execute();
|
||||
JSONObject accessTokenObject = JSONObject.parseObject(response.body());
|
||||
AuthBaiduErrorCode errorCode = AuthBaiduErrorCode.getErrorCode(accessTokenObject.getString("error"));
|
||||
@@ -71,9 +66,7 @@ public class AuthBaiduRequest extends BaseAuthRequest {
|
||||
@Override
|
||||
public AuthResponse revoke(AuthToken authToken) {
|
||||
String accessToken = authToken.getAccessToken();
|
||||
HttpResponse response = HttpRequest.get(this.urlBuilder.getRevokeUrl(AuthRevokeEntity.builder()
|
||||
.accessToken(accessToken)
|
||||
.build())).execute();
|
||||
HttpResponse response = HttpRequest.get(this.urlBuilder.getRevokeUrl(accessToken)).execute();
|
||||
String userInfo = response.body();
|
||||
JSONObject object = JSONObject.parseObject(userInfo);
|
||||
if (object.containsKey("error_code")) {
|
||||
|
||||
@@ -11,7 +11,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.CodingUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
/**
|
||||
@@ -29,10 +28,7 @@ public class AuthCodingRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.get(accessTokenUrl).execute();
|
||||
JSONObject accessTokenObject = JSONObject.parseObject(response.body());
|
||||
if (accessTokenObject.getIntValue("code") != 0) {
|
||||
|
||||
@@ -11,7 +11,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.CsdnUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
/**
|
||||
@@ -30,10 +29,7 @@ public class AuthCsdnRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.post(accessTokenUrl).execute();
|
||||
JSONObject accessTokenObject = JSONObject.parseObject(response.body());
|
||||
if (accessTokenObject.containsKey("error_code")) {
|
||||
|
||||
@@ -8,8 +8,6 @@ import me.zhyd.oauth.config.AuthSource;
|
||||
import me.zhyd.oauth.exception.AuthException;
|
||||
import me.zhyd.oauth.model.*;
|
||||
import me.zhyd.oauth.url.DouyinUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthRefreshTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
|
||||
@@ -28,10 +26,7 @@ public class AuthDouyinRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
return this.getToken(accessTokenUrl);
|
||||
}
|
||||
|
||||
@@ -62,10 +57,7 @@ public class AuthDouyinRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
public AuthResponse refresh(AuthToken oldToken) {
|
||||
String refreshTokenUrl = this.urlBuilder.getRefreshUrl(AuthRefreshTokenEntity.builder()
|
||||
.config(config)
|
||||
.refreshToken(oldToken.getRefreshToken())
|
||||
.build());
|
||||
String refreshTokenUrl = this.urlBuilder.getRefreshUrl(oldToken.getRefreshToken());
|
||||
return AuthResponse.builder()
|
||||
.code(ResponseStatus.SUCCESS.getCode())
|
||||
.data(this.getToken(refreshTokenUrl))
|
||||
|
||||
@@ -11,7 +11,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.FacebookUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
/**
|
||||
@@ -29,10 +28,7 @@ public class AuthFacebookRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.post(accessTokenUrl).execute();
|
||||
JSONObject accessTokenObject = JSONObject.parseObject(response.body());
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.GiteeUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
/**
|
||||
@@ -29,10 +28,7 @@ public class AuthGiteeRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.post(accessTokenUrl).execute();
|
||||
JSONObject accessTokenObject = JSONObject.parseObject(response.body());
|
||||
if (accessTokenObject.containsKey("error")) {
|
||||
|
||||
@@ -11,7 +11,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.GithubUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
import me.zhyd.oauth.utils.GlobalAuthUtil;
|
||||
|
||||
@@ -32,10 +31,7 @@ public class AuthGithubRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.post(accessTokenUrl).execute();
|
||||
Map<String, String> res = GlobalAuthUtil.parseStringToMap(response.body());
|
||||
if (res.containsKey("error")) {
|
||||
|
||||
@@ -11,7 +11,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.GoogleUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
/**
|
||||
@@ -29,10 +28,7 @@ public class AuthGoogleRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.post(accessTokenUrl).execute();
|
||||
JSONObject accessTokenObject = JSONObject.parseObject(response.body());
|
||||
|
||||
|
||||
@@ -9,8 +9,6 @@ import me.zhyd.oauth.config.AuthSource;
|
||||
import me.zhyd.oauth.exception.AuthException;
|
||||
import me.zhyd.oauth.model.*;
|
||||
import me.zhyd.oauth.url.LinkedinUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthRefreshTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
import me.zhyd.oauth.utils.StringUtils;
|
||||
|
||||
@@ -30,10 +28,7 @@ public class AuthLinkedinRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
return this.getToken(accessTokenUrl);
|
||||
}
|
||||
|
||||
@@ -123,10 +118,7 @@ public class AuthLinkedinRequest extends BaseAuthRequest {
|
||||
if (StringUtils.isEmpty(oldToken.getRefreshToken())) {
|
||||
throw new AuthException(ResponseStatus.UNSUPPORTED);
|
||||
}
|
||||
String refreshTokenUrl = this.urlBuilder.getRefreshUrl(AuthRefreshTokenEntity.builder()
|
||||
.config(config)
|
||||
.refreshToken(oldToken.getRefreshToken())
|
||||
.build());
|
||||
String refreshTokenUrl = this.urlBuilder.getRefreshUrl(oldToken.getRefreshToken());
|
||||
return AuthResponse.builder()
|
||||
.code(ResponseStatus.SUCCESS.getCode())
|
||||
.data(this.getToken(refreshTokenUrl))
|
||||
|
||||
@@ -9,8 +9,6 @@ import me.zhyd.oauth.config.AuthSource;
|
||||
import me.zhyd.oauth.exception.AuthException;
|
||||
import me.zhyd.oauth.model.*;
|
||||
import me.zhyd.oauth.url.MiUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthRefreshTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
import java.text.MessageFormat;
|
||||
@@ -31,10 +29,7 @@ public class AuthMiRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
return getToken(accessTokenUrl);
|
||||
}
|
||||
|
||||
@@ -108,10 +103,7 @@ public class AuthMiRequest extends BaseAuthRequest {
|
||||
*/
|
||||
@Override
|
||||
public AuthResponse refresh(AuthToken authToken) {
|
||||
String miRefreshUrl = this.urlBuilder.getRefreshUrl(AuthRefreshTokenEntity.builder()
|
||||
.config(config)
|
||||
.refreshToken(authToken.getRefreshToken())
|
||||
.build());
|
||||
String miRefreshUrl = this.urlBuilder.getRefreshUrl(authToken.getRefreshToken());
|
||||
|
||||
return AuthResponse.builder().code(ResponseStatus.SUCCESS.getCode()).data(getToken(miRefreshUrl)).build();
|
||||
}
|
||||
|
||||
@@ -9,8 +9,6 @@ import me.zhyd.oauth.config.AuthSource;
|
||||
import me.zhyd.oauth.exception.AuthException;
|
||||
import me.zhyd.oauth.model.*;
|
||||
import me.zhyd.oauth.url.MicrosoftUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthRefreshTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
import java.util.HashMap;
|
||||
@@ -30,10 +28,7 @@ public class AuthMicrosoftRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
|
||||
return getToken(accessTokenUrl);
|
||||
}
|
||||
@@ -102,10 +97,7 @@ public class AuthMicrosoftRequest extends BaseAuthRequest {
|
||||
*/
|
||||
@Override
|
||||
public AuthResponse refresh(AuthToken authToken) {
|
||||
String refreshTokenUrl = this.urlBuilder.getRefreshUrl(AuthRefreshTokenEntity.builder()
|
||||
.config(config)
|
||||
.refreshToken(authToken.getRefreshToken())
|
||||
.build());
|
||||
String refreshTokenUrl = this.urlBuilder.getRefreshUrl(authToken.getRefreshToken());
|
||||
|
||||
return AuthResponse.builder().code(ResponseStatus.SUCCESS.getCode()).data(getToken(refreshTokenUrl)).build();
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.OschinaUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
/**
|
||||
@@ -29,10 +28,7 @@ public class AuthOschinaRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.post(accessTokenUrl).execute();
|
||||
JSONObject accessTokenObject = JSONObject.parseObject(response.body());
|
||||
if (accessTokenObject.containsKey("error")) {
|
||||
|
||||
@@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.QqUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
import me.zhyd.oauth.utils.GlobalAuthUtil;
|
||||
import me.zhyd.oauth.utils.StringUtils;
|
||||
@@ -34,10 +33,7 @@ public class AuthQqRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.get(accessTokenUrl).execute();
|
||||
Map<String, String> accessTokenObject = GlobalAuthUtil.parseStringToMap(response.body());
|
||||
if (!accessTokenObject.containsKey("access_token")) {
|
||||
|
||||
@@ -11,7 +11,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.TaobaoUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.utils.GlobalAuthUtil;
|
||||
|
||||
/**
|
||||
@@ -35,10 +34,7 @@ public class AuthTaobaoRequest extends BaseAuthRequest {
|
||||
@Override
|
||||
protected AuthUser getUserInfo(AuthToken authToken) {
|
||||
String accessCode = authToken.getAccessCode();
|
||||
HttpResponse response = HttpRequest.post(this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(accessCode)
|
||||
.build())).execute();
|
||||
HttpResponse response = HttpRequest.post(this.urlBuilder.getAccessTokenUrl(accessCode)).execute();
|
||||
JSONObject accessTokenObject = JSONObject.parseObject(response.body());
|
||||
if (accessTokenObject.containsKey("error")) {
|
||||
throw new AuthException(ResponseStatus.FAILURE + ":" + accessTokenObject.getString("error_description"));
|
||||
|
||||
@@ -11,7 +11,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.TencentCloudUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
/**
|
||||
@@ -29,10 +28,7 @@ public class AuthTencentCloudRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.get(accessTokenUrl).execute();
|
||||
JSONObject accessTokenObject = JSONObject.parseObject(response.body());
|
||||
if (accessTokenObject.getIntValue("code") != 0) {
|
||||
|
||||
@@ -12,7 +12,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.ToutiaoUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
/**
|
||||
@@ -30,10 +29,7 @@ public class AuthToutiaoRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.get(accessTokenUrl).execute();
|
||||
JSONObject accessTokenObject = JSONObject.parseObject(response.body());
|
||||
|
||||
|
||||
@@ -8,8 +8,6 @@ import me.zhyd.oauth.config.AuthSource;
|
||||
import me.zhyd.oauth.exception.AuthException;
|
||||
import me.zhyd.oauth.model.*;
|
||||
import me.zhyd.oauth.url.WechatUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthRefreshTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
|
||||
/**
|
||||
@@ -32,10 +30,7 @@ public class AuthWeChatRequest extends BaseAuthRequest {
|
||||
*/
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
return this.getToken(accessTokenUrl);
|
||||
}
|
||||
|
||||
@@ -67,10 +62,7 @@ public class AuthWeChatRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
public AuthResponse refresh(AuthToken oldToken) {
|
||||
String refreshTokenUrl = this.urlBuilder.getRefreshUrl(AuthRefreshTokenEntity.builder()
|
||||
.config(config)
|
||||
.refreshToken(oldToken.getRefreshToken())
|
||||
.build());
|
||||
String refreshTokenUrl = this.urlBuilder.getRefreshUrl(oldToken.getRefreshToken());
|
||||
return AuthResponse.builder()
|
||||
.code(ResponseStatus.SUCCESS.getCode())
|
||||
.data(this.getToken(refreshTokenUrl))
|
||||
|
||||
@@ -11,7 +11,6 @@ import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.model.AuthUserGender;
|
||||
import me.zhyd.oauth.url.WeiboUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAccessTokenEntity;
|
||||
import me.zhyd.oauth.url.entity.AuthUserInfoEntity;
|
||||
import me.zhyd.oauth.utils.IpUtils;
|
||||
import me.zhyd.oauth.utils.StringUtils;
|
||||
@@ -32,10 +31,7 @@ public class AuthWeiboRequest extends BaseAuthRequest {
|
||||
|
||||
@Override
|
||||
protected AuthToken getAccessToken(AuthCallback authCallback) {
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(AuthAccessTokenEntity.builder()
|
||||
.config(config)
|
||||
.code(authCallback.getCode())
|
||||
.build());
|
||||
String accessTokenUrl = this.urlBuilder.getAccessTokenUrl(authCallback.getCode());
|
||||
HttpResponse response = HttpRequest.post(accessTokenUrl).execute();
|
||||
String accessTokenStr = response.body();
|
||||
JSONObject accessTokenObject = JSONObject.parseObject(accessTokenStr);
|
||||
|
||||
@@ -9,7 +9,6 @@ import me.zhyd.oauth.model.AuthResponse;
|
||||
import me.zhyd.oauth.model.AuthToken;
|
||||
import me.zhyd.oauth.model.AuthUser;
|
||||
import me.zhyd.oauth.url.AbstractUrlBuilder;
|
||||
import me.zhyd.oauth.url.entity.AuthAuthorizeEntity;
|
||||
import me.zhyd.oauth.utils.AuthChecker;
|
||||
|
||||
/**
|
||||
@@ -36,6 +35,7 @@ public abstract class BaseAuthRequest implements AuthRequest {
|
||||
public BaseAuthRequest(AuthConfig config, AuthSource source, AbstractUrlBuilder urlBuilder) {
|
||||
this(config, source);
|
||||
this.urlBuilder = urlBuilder;
|
||||
this.urlBuilder.setAuthConfig(config);
|
||||
}
|
||||
|
||||
protected abstract AuthToken getAccessToken(AuthCallback authCallback);
|
||||
@@ -71,8 +71,6 @@ public abstract class BaseAuthRequest implements AuthRequest {
|
||||
*/
|
||||
@Override
|
||||
public String authorize() {
|
||||
return this.urlBuilder.getAuthorizeUrl(AuthAuthorizeEntity.builder()
|
||||
.config(config)
|
||||
.build());
|
||||
return this.urlBuilder.getAuthorizeUrl();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user