From 45e1195974528bc5fd5a8983c8930f699ce6fa52 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Sat, 4 Jul 2020 11:05:19 +0800 Subject: [PATCH] =?UTF-8?q?:hankey:=20=E6=94=B9=E8=BF=9B=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhyd/oauth/request/AuthBaiduRequest.java | 6 +---- .../oauth/request/AuthFacebookRequest.java | 3 +-- .../zhyd/oauth/request/AuthGiteeRequest.java | 3 +-- .../zhyd/oauth/request/AuthGithubRequest.java | 3 +-- .../zhyd/oauth/request/AuthGoogleRequest.java | 7 ++---- .../zhyd/oauth/request/AuthHuaweiRequest.java | 23 +------------------ .../oauth/request/AuthKujialeRequest.java | 3 +-- .../oauth/request/AuthLinkedinRequest.java | 6 +---- .../oauth/request/AuthMeituanRequest.java | 8 ++----- .../me/zhyd/oauth/request/AuthMiRequest.java | 8 ++----- .../oauth/request/AuthMicrosoftRequest.java | 6 +---- 11 files changed, 14 insertions(+), 62 deletions(-) diff --git a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java index 6c6b204..7e0cd21 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java @@ -103,13 +103,9 @@ public class AuthBaiduRequest extends AuthDefaultRequest { */ @Override public String authorize(String state) { - return UrlBuilder.fromBaseUrl(source.authorize()) - .queryParam("response_type", "code") - .queryParam("client_id", config.getClientId()) - .queryParam("redirect_uri", config.getRedirectUri()) + return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("display", "popup") .queryParam("scope", this.getScopes(" ", true, AuthBaiduScope.getDefaultScopes())) - .queryParam("state", getRealState(state)) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java b/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java index 6981b2f..675a316 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java @@ -105,8 +105,7 @@ public class AuthFacebookRequest extends AuthDefaultRequest { */ @Override public String authorize(String state) { - String authorizeUrl = super.authorize(state); - return UrlBuilder.fromBaseUrl(authorizeUrl) + return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("scope", this.getScopes(",", false, AuthFacebookScope.getDefaultScopes())) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java index 53be8ce..0910293 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java @@ -83,8 +83,7 @@ public class AuthGiteeRequest extends AuthDefaultRequest { */ @Override public String authorize(String state) { - String authorizeUrl = super.authorize(state); - return UrlBuilder.fromBaseUrl(authorizeUrl) + return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("scope", this.getScopes(" ", true, AuthGiteeScope.getDefaultScopes())) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java index d153274..a83c54a 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java @@ -83,8 +83,7 @@ public class AuthGithubRequest extends AuthDefaultRequest { */ @Override public String authorize(String state) { - String authorizeUrl = super.authorize(state); - return UrlBuilder.fromBaseUrl(authorizeUrl) + return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("scope", this.getScopes(" ", true, AuthGithubScope.getDefaultScopes())) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java index abeda00..666ad60 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java @@ -74,12 +74,9 @@ public class AuthGoogleRequest extends AuthDefaultRequest { */ @Override public String authorize(String state) { - return UrlBuilder.fromBaseUrl(source.authorize()) - .queryParam("response_type", "code") - .queryParam("client_id", config.getClientId()) + return UrlBuilder.fromBaseUrl(super.authorize(state)) + .queryParam("access_type", "offline") .queryParam("scope", this.getScopes(" ", false, AuthGoogleScope.getDefaultScopes())) - .queryParam("redirect_uri", config.getRedirectUri()) - .queryParam("state", getRealState(state)) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java b/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java index f6ca729..3817d6b 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java @@ -130,30 +130,9 @@ public class AuthHuaweiRequest extends AuthDefaultRequest { */ @Override public String authorize(String state) { - return UrlBuilder.fromBaseUrl(source.authorize()) - .queryParam("response_type", "code") - .queryParam("client_id", config.getClientId()) - .queryParam("redirect_uri", config.getRedirectUri()) + return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("access_type", "offline") .queryParam("scope", this.getScopes(" ", true, AuthHuaweiScope.getDefaultScopes())) - .queryParam("state", getRealState(state)) - .build(); - } - - /** - * 返回获取accessToken的url - * - * @param code 授权码 - * @return 返回获取accessToken的url - */ - @Override - protected String accessTokenUrl(String code) { - return UrlBuilder.fromBaseUrl(source.accessToken()) - .queryParam("grant_type", "authorization_code") - .queryParam("code", code) - .queryParam("client_id", config.getClientId()) - .queryParam("client_secret", config.getClientSecret()) - .queryParam("redirect_uri", config.getRedirectUri()) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java index beaebda..66a5740 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java @@ -40,8 +40,7 @@ public class AuthKujialeRequest extends AuthDefaultRequest { */ @Override public String authorize(String state) { - String authorizeUrl = super.authorize(state); - return UrlBuilder.fromBaseUrl(authorizeUrl) + return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("scope", this.getScopes(",", false, AuthKujialeScope.getDefaultScopes())) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java b/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java index a4e9068..d5a01d2 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java @@ -198,12 +198,8 @@ public class AuthLinkedinRequest extends AuthDefaultRequest { */ @Override public String authorize(String state) { - return UrlBuilder.fromBaseUrl(source.authorize()) - .queryParam("response_type", "code") - .queryParam("client_id", config.getClientId()) - .queryParam("redirect_uri", config.getRedirectUri()) + return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("scope", this.getScopes(" ", false, AuthLinkedinScope.getDefaultScopes())) - .queryParam("state", getRealState(state)) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthMeituanRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMeituanRequest.java index bdbbc4d..a171840 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthMeituanRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthMeituanRequest.java @@ -1,7 +1,6 @@ package me.zhyd.oauth.request; import com.alibaba.fastjson.JSONObject; -import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.cache.AuthStateCache; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthDefaultSource; @@ -12,6 +11,7 @@ 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.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; import java.util.HashMap; @@ -108,11 +108,7 @@ public class AuthMeituanRequest extends AuthDefaultRequest { @Override public String authorize(String state) { - return UrlBuilder.fromBaseUrl(source.authorize()) - .queryParam("response_type", "code") - .queryParam("app_id", config.getClientId()) - .queryParam("redirect_uri", config.getRedirectUri()) - .queryParam("state", getRealState(state)) + return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("scope", "") .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java index 9744cab..4d2c64c 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java @@ -125,13 +125,9 @@ public class AuthMiRequest extends AuthDefaultRequest { */ @Override public String authorize(String state) { - return UrlBuilder.fromBaseUrl(source.authorize()) - .queryParam("response_type", "code") - .queryParam("client_id", config.getClientId()) - .queryParam("redirect_uri", config.getRedirectUri()) - .queryParam("scope", this.getScopes(" ", true, AuthMiScope.getDefaultScopes())) + return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("skip_confirm", "false") - .queryParam("state", getRealState(state)) + .queryParam("scope", this.getScopes(" ", true, AuthMiScope.getDefaultScopes())) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java index f95d33c..11bf9b4 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java @@ -123,13 +123,9 @@ public class AuthMicrosoftRequest extends AuthDefaultRequest { */ @Override public String authorize(String state) { - return UrlBuilder.fromBaseUrl(source.authorize()) - .queryParam("response_type", "code") - .queryParam("client_id", config.getClientId()) - .queryParam("redirect_uri", config.getRedirectUri()) + return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("response_mode", "query") .queryParam("scope", this.getScopes(" ", true, AuthMicrosoftScope.getDefaultScopes())) - .queryParam("state", getRealState(state)) .build(); } -- GitLab