diff --git a/pom.xml b/pom.xml index a192687..8d848ec 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 1.6 false 1.0.5 - 1.18.20 + 1.18.30 4.13.2 1.2.83 4.17.5.ALL diff --git a/src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java b/src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java index 525e008..ecebe16 100644 --- a/src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java +++ b/src/main/java/me/zhyd/oauth/config/AuthDefaultSource.java @@ -1321,6 +1321,33 @@ public enum AuthDefaultSource implements AuthSource { public Class getTargetClass() { return AuthAppleRequest.class; } + }, + + FIGMA{ + @Override + public String authorize() { + return "https://www.figma.com/oauth"; + } + + @Override + public String accessToken() { + return "https://www.figma.com/api/oauth/token"; + } + + @Override + public String userInfo() { + return "https://api.figma.com/v1/me"; + } + + @Override + public String refresh() { + return "https://www.figma.com/api/oauth/refresh"; + } + + @Override + public Class getTargetClass() { + return null; + } } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthFigmaScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthFigmaScope.java new file mode 100644 index 0000000..462a9a1 --- /dev/null +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthFigmaScope.java @@ -0,0 +1,29 @@ +package me.zhyd.oauth.enums.scope; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * Figma OAuth 授权范围 + * ... + * + * @author xiangqian + * @since 1.16.6 + */ +@Getter +@AllArgsConstructor +public enum AuthFigmaScope implements AuthScope { + + FILE_CONTENT("files:read", "Read files, projects, users, versions, comments, components & styles, and webhooks", true), + VARIABLES("file_variables:read,file_variables:write", "Read and write to variables in Figma file. Note: this is only available to members in Enterprise organizations", false), + COMMENTS("file_comments:write", "Post and delete comments and comment reactions in files", false), + DEV_RESOURCES("file_dev_resources:read,file_dev_resources:write", "Read and write to dev resources in files", false), + LIBRARY_ANALYTICS("library_analytics:read", "Read your design system analytics", false), + WEBHOOKS("webhooks:write", "Create and manage webhooks", false); + + private final String scope; + private final String description; + private final boolean isDefault; + + +} diff --git a/src/main/java/me/zhyd/oauth/request/AbstractAuthMicrosoftRequest.java b/src/main/java/me/zhyd/oauth/request/AbstractAuthMicrosoftRequest.java index cfd25b1..d8f0200 100644 --- a/src/main/java/me/zhyd/oauth/request/AbstractAuthMicrosoftRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AbstractAuthMicrosoftRequest.java @@ -111,8 +111,8 @@ public abstract class AbstractAuthMicrosoftRequest extends AuthDefaultRequest { * @return AuthResponse */ @Override - public AuthResponse refresh(AuthToken authToken) { - return AuthResponse.builder() + public AuthResponse refresh(AuthToken authToken) { + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(getToken(refreshTokenUrl(authToken.getRefreshToken()))) .build(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java index 98acc0e..04aa0bc 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthAlipayRequest.java @@ -175,7 +175,7 @@ public class AuthAlipayRequest extends AuthDefaultRequest { * @return AuthResponse */ @Override - public AuthResponse refresh(AuthToken authToken) { + public AuthResponse refresh(AuthToken authToken) { AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest(); request.setGrantType("refresh_token"); request.setRefreshToken(authToken.getRefreshToken()); @@ -188,7 +188,7 @@ public class AuthAlipayRequest extends AuthDefaultRequest { if (!response.isSuccess()) { throw new AuthException(response.getSubMsg()); } - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(AuthToken.builder() .accessToken(response.getAccessToken()) diff --git a/src/main/java/me/zhyd/oauth/request/AuthAmazonRequest.java b/src/main/java/me/zhyd/oauth/request/AuthAmazonRequest.java index 99652cb..78a6004 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthAmazonRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthAmazonRequest.java @@ -94,13 +94,13 @@ public class AuthAmazonRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken authToken) { + public AuthResponse refresh(AuthToken authToken) { Map form = new HashMap<>(7); form.put("grant_type", "refresh_token"); form.put("refresh_token", authToken.getRefreshToken()); form.put("client_id", config.getClientId()); form.put("client_secret", config.getClientSecret()); - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(getToken(form, this.source.refresh())) .build(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java index 99be903..6f9851c 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java @@ -81,7 +81,7 @@ public class AuthBaiduRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken authToken) { + public AuthResponse refresh(AuthToken authToken) { String refreshUrl = UrlBuilder.fromBaseUrl(this.source.refresh()) .queryParam("grant_type", "refresh_token") .queryParam("refresh_token", authToken.getRefreshToken()) @@ -89,7 +89,7 @@ public class AuthBaiduRequest extends AuthDefaultRequest { .queryParam("client_secret", this.config.getClientSecret()) .build(); String response = new HttpUtils(config.getHttpConfig()).get(refreshUrl).getBody(); - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(this.getAuthToken(response)) .build(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java b/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java index 26384c4..10168aa 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java @@ -70,7 +70,7 @@ public abstract class AuthDefaultRequest implements AuthRequest { * @return AuthResponse */ @Override - public AuthResponse login(AuthCallback authCallback) { + public AuthResponse login(AuthCallback authCallback) { try { checkCode(authCallback); if (!config.isIgnoreCheckState()) { @@ -79,7 +79,7 @@ public abstract class AuthDefaultRequest implements AuthRequest { AuthToken authToken = this.getAccessToken(authCallback); AuthUser user = this.getUserInfo(authToken); - return AuthResponse.builder().code(AuthResponseStatus.SUCCESS.getCode()).data(user).build(); + 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); @@ -96,7 +96,7 @@ public abstract class AuthDefaultRequest implements AuthRequest { * @param e 具体的异常 * @return AuthResponse */ - AuthResponse responseError(Exception e) { + AuthResponse responseError(Exception e) { int errorCode = AuthResponseStatus.FAILURE.getCode(); String errorMsg = e.getMessage(); if (e instanceof AuthException) { @@ -106,7 +106,7 @@ public abstract class AuthDefaultRequest implements AuthRequest { errorMsg = authException.getErrorMsg(); } } - return AuthResponse.builder().code(errorCode).msg(errorMsg).build(); + return AuthResponse.builder().code(errorCode).msg(errorMsg).build(); } /** diff --git a/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java b/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java index fcd7485..c157150 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthDouyinRequest.java @@ -59,8 +59,8 @@ public class AuthDouyinRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken oldToken) { - return AuthResponse.builder() + public AuthResponse refresh(AuthToken oldToken) { + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(getToken(refreshTokenUrl(oldToken.getRefreshToken()))) .build(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthElemeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthElemeRequest.java index 7011011..3c87fd9 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthElemeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthElemeRequest.java @@ -117,7 +117,7 @@ public class AuthElemeRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken oldToken) { + public AuthResponse refresh(AuthToken oldToken) { Map form = new HashMap<>(4); form.put("refresh_token", oldToken.getRefreshToken()); form.put("grant_type", "refresh_token"); @@ -129,7 +129,7 @@ public class AuthElemeRequest extends AuthDefaultRequest { this.checkResponse(object); - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(AuthToken.builder() .accessToken(object.getString("access_token")) diff --git a/src/main/java/me/zhyd/oauth/request/AuthFeishuRequest.java b/src/main/java/me/zhyd/oauth/request/AuthFeishuRequest.java index 88f5b50..31b6283 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthFeishuRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthFeishuRequest.java @@ -98,12 +98,12 @@ public class AuthFeishuRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken authToken) { + public AuthResponse refresh(AuthToken authToken) { JSONObject requestObject = new JSONObject(); requestObject.put("app_access_token", this.getAppAccessToken()); requestObject.put("grant_type", "refresh_token"); requestObject.put("refresh_token", authToken.getRefreshToken()); - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(getToken(requestObject, this.source.refresh())) .build(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthFigmaRequest.java b/src/main/java/me/zhyd/oauth/request/AuthFigmaRequest.java new file mode 100644 index 0000000..c5f0efa --- /dev/null +++ b/src/main/java/me/zhyd/oauth/request/AuthFigmaRequest.java @@ -0,0 +1,118 @@ +package me.zhyd.oauth.request; + +import com.alibaba.fastjson.JSONObject; +import com.xkcoding.http.support.HttpHeader; +import me.zhyd.oauth.cache.AuthStateCache; +import me.zhyd.oauth.config.AuthConfig; +import me.zhyd.oauth.config.AuthDefaultSource; +import me.zhyd.oauth.enums.AuthResponseStatus; +import me.zhyd.oauth.enums.scope.AuthFigmaScope; +import me.zhyd.oauth.exception.AuthException; +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.*; + +/** + * Figma登录 + * @author xiangqian + * @since 1.16.6 + */ +public class AuthFigmaRequest extends AuthDefaultRequest { + public AuthFigmaRequest(AuthConfig config) { + super(config, AuthDefaultSource.FIGMA); + } + + public AuthFigmaRequest(AuthConfig config, AuthStateCache authStateCache) { + super(config, AuthDefaultSource.FIGMA, authStateCache); + } + + @Override + public String authorize(String state) { + return UrlBuilder.fromBaseUrl(super.authorize(state)) + .queryParam("scope", this.getScopes(",", true, AuthScopeUtils.getDefaultScopes(AuthFigmaScope.values()))) + .build(); + } + + @Override + protected AuthToken getAccessToken(AuthCallback authCallback) { + HttpHeader header = new HttpHeader() + .add("content-type", "application/x-www-form-urlencoded") + .add("Authorization", "Basic " + Base64Utils.encode(config.getClientId().concat(":").concat(config.getClientSecret()))); + + String response = new HttpUtils(config.getHttpConfig()).post(super.accessTokenUrl(authCallback.getCode()), null, header, true).getBody(); + JSONObject accessTokenObject = JSONObject.parseObject(response); + + this.checkResponse(accessTokenObject); + + return AuthToken.builder() + .accessToken(accessTokenObject.getString("access_token")) + .refreshToken(accessTokenObject.getString("refresh_token")) + .scope(accessTokenObject.getString("scope")) + .userId(accessTokenObject.getString("user_id")) + .expireIn(accessTokenObject.getIntValue("expires_in")) + .build(); + } + + @Override + public AuthResponse refresh(AuthToken authToken) { + HttpHeader header = new HttpHeader().add("content-type", "application/x-www-form-urlencoded"); + String response = new HttpUtils(config.getHttpConfig()).post(this.refreshTokenUrl(authToken.getRefreshToken()), null, header, false).getBody(); + JSONObject dataObj = JSONObject.parseObject(response); + + this.checkResponse(dataObj); + + return AuthResponse.builder() + .code(AuthResponseStatus.SUCCESS.getCode()) + .data(AuthToken.builder() + .accessToken(dataObj.getString("access_token")) + .openId(dataObj.getString("open_id")) + .expireIn(dataObj.getIntValue("expires_in")) + .refreshToken(dataObj.getString("refresh_token")) + .scope(dataObj.getString("scope")) + .build()) + .build(); + + } + + @Override + protected String refreshTokenUrl(String refreshToken) { + return UrlBuilder.fromBaseUrl(source.refresh()) + .queryParam("client_id", config.getClientId()) + .queryParam("client_secret", config.getClientSecret()) + .queryParam("refresh_token", refreshToken) + .build(); + } + + @Override + protected AuthUser getUserInfo(AuthToken authToken) { + HttpHeader header = new HttpHeader().add("Authorization", "Bearer " + authToken.getAccessToken()); + String response = new HttpUtils(config.getHttpConfig()).get(super.userInfoUrl(authToken), null, header, false).getBody(); + JSONObject dataObj = JSONObject.parseObject(response); + + this.checkResponse(dataObj); + + return AuthUser.builder() + .rawUserInfo(dataObj) + .uuid(dataObj.getString("id")) + .username(dataObj.getString("handle")) + .avatar(dataObj.getString("img_url")) + .email(dataObj.getString("email")) + .token(authToken) + .source(source.toString()) + .build(); + } + + + /** + * 校验响应结果 + * + * @param object 接口返回的结果 + */ + private void checkResponse(JSONObject object) { + if (object.containsKey("error")) { + throw new AuthException(object.getString("error") + ":" + object.getString("message")); + } + } +} diff --git a/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java b/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java index e2e9067..7c41407 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java @@ -99,7 +99,7 @@ public class AuthHuaweiRequest extends AuthDefaultRequest { * @return AuthResponse */ @Override - public AuthResponse refresh(AuthToken authToken) { + public AuthResponse refresh(AuthToken authToken) { Map form = new HashMap<>(7); form.put("client_id", config.getClientId()); form.put("client_secret", config.getClientSecret()); @@ -107,7 +107,7 @@ public class AuthHuaweiRequest extends AuthDefaultRequest { form.put("grant_type", "refresh_token"); String response = new HttpUtils(config.getHttpConfig()).post(source.refresh(), form, false).getBody(); - return AuthResponse.builder().code(SUCCESS.getCode()).data(getAuthToken(response)).build(); + return AuthResponse.builder().code(SUCCESS.getCode()).data(getAuthToken(response)).build(); } private AuthToken getAuthToken(String response) { diff --git a/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java b/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java index bb54375..4769ea8 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java @@ -103,7 +103,7 @@ public class AuthJdRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken oldToken) { + public AuthResponse refresh(AuthToken oldToken) { Map params = new HashMap<>(7); params.put("app_key", config.getClientId()); params.put("app_secret", config.getClientSecret()); @@ -114,7 +114,7 @@ public class AuthJdRequest extends AuthDefaultRequest { this.checkResponse(object); - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(AuthToken.builder() .accessToken(object.getString("access_token")) diff --git a/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java index aac5ec1..44a8f09 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java @@ -109,8 +109,8 @@ public class AuthKujialeRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken authToken) { + public AuthResponse refresh(AuthToken authToken) { String response = new HttpUtils(config.getHttpConfig()).post(refreshTokenUrl(authToken.getRefreshToken())).getBody(); - return AuthResponse.builder().code(AuthResponseStatus.SUCCESS.getCode()).data(getAuthToken(response)).build(); + return AuthResponse.builder().code(AuthResponseStatus.SUCCESS.getCode()).data(getAuthToken(response)).build(); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthLineRequest.java b/src/main/java/me/zhyd/oauth/request/AuthLineRequest.java index 18db7a8..13d2fe3 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthLineRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthLineRequest.java @@ -88,7 +88,7 @@ public class AuthLineRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken oldToken) { + public AuthResponse refresh(AuthToken oldToken) { Map params = new HashMap<>(); params.put("grant_type", "refresh_token"); params.put("refresh_token", oldToken.getRefreshToken()); @@ -96,7 +96,7 @@ public class AuthLineRequest extends AuthDefaultRequest { params.put("client_secret", config.getClientSecret()); String response = new HttpUtils(config.getHttpConfig()).post(source.accessToken(), params, false).getBody(); JSONObject accessTokenObject = JSONObject.parseObject(response); - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(AuthToken.builder() .accessToken(accessTokenObject.getString("access_token")) diff --git a/src/main/java/me/zhyd/oauth/request/AuthMeituanRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMeituanRequest.java index 63b64b4..5a12936 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthMeituanRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthMeituanRequest.java @@ -78,7 +78,7 @@ public class AuthMeituanRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken oldToken) { + public AuthResponse refresh(AuthToken oldToken) { Map form = new HashMap<>(7); form.put("app_id", config.getClientId()); form.put("secret", config.getClientSecret()); @@ -90,7 +90,7 @@ public class AuthMeituanRequest extends AuthDefaultRequest { this.checkResponse(object); - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(AuthToken.builder() .accessToken(object.getString("access_token")) diff --git a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java index 7d473ca..380816e 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java @@ -110,8 +110,8 @@ public class AuthMiRequest extends AuthDefaultRequest { * @return AuthResponse */ @Override - public AuthResponse refresh(AuthToken authToken) { - return AuthResponse.builder() + public AuthResponse refresh(AuthToken authToken) { + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(getToken(refreshTokenUrl(authToken.getRefreshToken()))) .build(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthOktaRequest.java b/src/main/java/me/zhyd/oauth/request/AuthOktaRequest.java index 5f35430..5fa7b45 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthOktaRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthOktaRequest.java @@ -64,15 +64,15 @@ public class AuthOktaRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken authToken) { + public AuthResponse refresh(AuthToken authToken) { if (null == authToken.getRefreshToken()) { - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.ILLEGAL_TOKEN.getCode()) .msg(AuthResponseStatus.ILLEGAL_TOKEN.getMsg()) .build(); } String refreshUrl = refreshTokenUrl(authToken.getRefreshToken()); - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(this.getAuthToken(refreshUrl)) .build(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java index c750695..c6db06d 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java @@ -39,9 +39,9 @@ public class AuthQqRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken authToken) { + public AuthResponse refresh(AuthToken authToken) { String response = new HttpUtils(config.getHttpConfig()).get(refreshTokenUrl(authToken.getRefreshToken())).getBody(); - return AuthResponse.builder().code(AuthResponseStatus.SUCCESS.getCode()).data(getAuthToken(response)).build(); + return AuthResponse.builder().code(AuthResponseStatus.SUCCESS.getCode()).data(getAuthToken(response)).build(); } @Override diff --git a/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java b/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java index 2de6cc5..ada0e75 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java @@ -60,8 +60,8 @@ public class AuthRenrenRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken authToken) { - return AuthResponse.builder() + public AuthResponse refresh(AuthToken authToken) { + return AuthResponse.builder() .code(SUCCESS.getCode()) .data(getToken(this.refreshTokenUrl(authToken.getRefreshToken()))) .build(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthRequest.java b/src/main/java/me/zhyd/oauth/request/AuthRequest.java index e4bd718..bbe4937 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthRequest.java @@ -5,6 +5,7 @@ import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthToken; +import me.zhyd.oauth.model.AuthUser; /** * JustAuth {@code Request}公共接口，所有平台的{@code Request}都需要实现该接口 @@ -49,7 +50,7 @@ public interface AuthRequest { * @param authCallback 用于接收回调参数的实体 * @return 返回登录成功后的用户信息 */ - default AuthResponse login(AuthCallback authCallback) { + default AuthResponse login(AuthCallback authCallback) { throw new AuthException(AuthResponseStatus.NOT_IMPLEMENTED); } @@ -69,7 +70,7 @@ public interface AuthRequest { * @param authToken 登录成功后返回的Token信息 * @return AuthResponse */ - default AuthResponse refresh(AuthToken authToken) { + default AuthResponse refresh(AuthToken authToken) { throw new AuthException(AuthResponseStatus.NOT_IMPLEMENTED); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java b/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java index f1df52b..eea7b15 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthTaobaoRequest.java @@ -79,11 +79,11 @@ public class AuthTaobaoRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken oldToken) { + public AuthResponse refresh(AuthToken oldToken) { String tokenUrl = refreshTokenUrl(oldToken.getRefreshToken()); String response = new HttpUtils(config.getHttpConfig()).post(tokenUrl).getBody(); JSONObject accessTokenObject = JSONObject.parseObject(response); - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(this.getAuthToken(accessTokenObject)) .build(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthTeambitionRequest.java b/src/main/java/me/zhyd/oauth/request/AuthTeambitionRequest.java index d529379..308a178 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthTeambitionRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthTeambitionRequest.java @@ -87,7 +87,7 @@ public class AuthTeambitionRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken oldToken) { + public AuthResponse refresh(AuthToken oldToken) { String uid = oldToken.getUid(); String refreshToken = oldToken.getRefreshToken(); @@ -99,7 +99,7 @@ public class AuthTeambitionRequest extends AuthDefaultRequest { this.checkResponse(refreshTokenObject); - return AuthResponse.builder() + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(AuthToken.builder() .accessToken(refreshTokenObject.getString("access_token")) diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseThirdQrcodeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseThirdQrcodeRequest.java index 57973f8..79d0e18 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseThirdQrcodeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatEnterpriseThirdQrcodeRequest.java @@ -41,14 +41,14 @@ public class AuthWeChatEnterpriseThirdQrcodeRequest extends AbstractAuthWeChatEn } @Override - public AuthResponse login(AuthCallback authCallback) { + public AuthResponse login(AuthCallback authCallback) { try { if (!config.isIgnoreCheckState()) { AuthChecker.checkState(authCallback.getState(), source, authStateCache); } AuthToken authToken = this.getAccessToken(authCallback); AuthUser user = this.getUserInfo(authToken); - return AuthResponse.builder().code(AuthResponseStatus.SUCCESS.getCode()).data(user).build(); + 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/AuthWeChatMpRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java index 8ade04c..0502f28 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java @@ -79,8 +79,8 @@ public class AuthWeChatMpRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken oldToken) { - return AuthResponse.builder() + public AuthResponse refresh(AuthToken oldToken) { + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(this.getToken(refreshTokenUrl(oldToken.getRefreshToken()))) .build(); diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatOpenRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatOpenRequest.java index 7198887..44f724f 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeChatOpenRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatOpenRequest.java @@ -69,8 +69,8 @@ public class AuthWeChatOpenRequest extends AuthDefaultRequest { } @Override - public AuthResponse refresh(AuthToken oldToken) { - return AuthResponse.builder() + public AuthResponse refresh(AuthToken oldToken) { + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(this.getToken(refreshTokenUrl(oldToken.getRefreshToken()))) .build(); diff --git a/src/test/java/me/zhyd/oauth/request/AuthExtendRequest.java b/src/test/java/me/zhyd/oauth/request/AuthExtendRequest.java index 7eb0184..6030f2c 100644 --- a/src/test/java/me/zhyd/oauth/request/AuthExtendRequest.java +++ b/src/test/java/me/zhyd/oauth/request/AuthExtendRequest.java @@ -87,8 +87,8 @@ public class AuthExtendRequest extends AuthDefaultRequest { * @return AuthResponse */ @Override - public AuthResponse refresh(AuthToken authToken) { - return AuthResponse.builder() + public AuthResponse refresh(AuthToken authToken) { + return AuthResponse.builder() .code(AuthResponseStatus.SUCCESS.getCode()) .data(AuthToken.builder() .openId("openId") diff --git a/src/test/java/me/zhyd/oauth/request/AuthExtendRequestTest.java b/src/test/java/me/zhyd/oauth/request/AuthExtendRequestTest.java index 765881d..c961cf1 100644 --- a/src/test/java/me/zhyd/oauth/request/AuthExtendRequestTest.java +++ b/src/test/java/me/zhyd/oauth/request/AuthExtendRequestTest.java @@ -45,10 +45,10 @@ public class AuthExtendRequestTest { .code("code") .state(state) .build(); - AuthResponse response = request.login(callback); + AuthResponse response = request.login(callback); Assert.assertNotNull(response); - AuthUser user = (AuthUser) response.getData(); + AuthUser user = response.getData(); Assert.assertNotNull(user); System.out.println(JSON.toJSONString(user)); } @@ -74,7 +74,7 @@ public class AuthExtendRequestTest { .redirectUri("http://redirectUri") .build()); - AuthResponse response = request.refresh(AuthToken.builder().build()); + AuthResponse response = request.refresh(AuthToken.builder().build()); Assert.assertNotNull(response); System.out.println(JSON.toJSONString(response.getData()));