From d645224071182a92599036ebdaa7fd655ed851be Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Sun, 5 Jul 2020 00:16:08 +0800 Subject: [PATCH] =?UTF-8?q?:fire:=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 --- .../oauth/enums/scope/AuthBaiduScope.java | 19 -------- .../oauth/enums/scope/AuthCodingScope.java | 19 -------- .../oauth/enums/scope/AuthFacebookScope.java | 19 -------- .../oauth/enums/scope/AuthGiteeScope.java | 19 -------- .../oauth/enums/scope/AuthGithubScope.java | 19 -------- .../oauth/enums/scope/AuthGitlabScope.java | 19 -------- .../oauth/enums/scope/AuthGoogleScope.java | 15 ------ .../oauth/enums/scope/AuthHuaweiScope.java | 19 -------- .../zhyd/oauth/enums/scope/AuthJdScope.java | 19 -------- .../oauth/enums/scope/AuthKujialeScope.java | 19 -------- .../oauth/enums/scope/AuthLinkedinScope.java | 19 -------- .../zhyd/oauth/enums/scope/AuthMiScope.java | 19 -------- .../oauth/enums/scope/AuthMicrosoftScope.java | 19 -------- .../oauth/enums/scope/AuthPinterestScope.java | 19 -------- .../zhyd/oauth/enums/scope/AuthQqScope.java | 19 -------- .../oauth/enums/scope/AuthRenrenScope.java | 19 -------- .../me/zhyd/oauth/enums/scope/AuthScope.java | 12 +++++ .../enums/scope/AuthStackoverflowScope.java | 19 -------- .../oauth/enums/scope/AuthWechatMpScope.java | 19 -------- .../oauth/enums/scope/AuthWeiboScope.java | 19 -------- .../zhyd/oauth/request/AuthBaiduRequest.java | 3 +- .../zhyd/oauth/request/AuthCodingRequest.java | 3 +- .../oauth/request/AuthDefaultRequest.java | 9 +--- .../oauth/request/AuthFacebookRequest.java | 3 +- .../zhyd/oauth/request/AuthGiteeRequest.java | 3 +- .../zhyd/oauth/request/AuthGithubRequest.java | 3 +- .../zhyd/oauth/request/AuthGitlabRequest.java | 3 +- .../zhyd/oauth/request/AuthGoogleRequest.java | 3 +- .../zhyd/oauth/request/AuthHuaweiRequest.java | 3 +- .../me/zhyd/oauth/request/AuthJdRequest.java | 3 +- .../oauth/request/AuthKujialeRequest.java | 3 +- .../oauth/request/AuthLinkedinRequest.java | 3 +- .../me/zhyd/oauth/request/AuthMiRequest.java | 3 +- .../oauth/request/AuthMicrosoftRequest.java | 3 +- .../oauth/request/AuthPinterestRequest.java | 3 +- .../me/zhyd/oauth/request/AuthQqRequest.java | 7 +-- .../zhyd/oauth/request/AuthRenrenRequest.java | 3 +- .../request/AuthStackOverflowRequest.java | 3 +- .../oauth/request/AuthWeChatMpRequest.java | 3 +- .../zhyd/oauth/request/AuthWeiboRequest.java | 7 +-- .../me/zhyd/oauth/utils/AuthScopeUtils.java | 46 +++++++++++++++++++ 41 files changed, 98 insertions(+), 391 deletions(-) create mode 100644 src/main/java/me/zhyd/oauth/utils/AuthScopeUtils.java diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthBaiduScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthBaiduScope.java index 1030a3e..6449f13 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthBaiduScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthBaiduScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * 边度平台 OAuth 授权范围 * @@ -32,18 +27,4 @@ public enum AuthBaiduScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthBaiduScope[] scopes = AuthBaiduScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthBaiduScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthBaiduScope.values()).map(AuthBaiduScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthCodingScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthCodingScope.java index e7cf424..c712caf 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthCodingScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthCodingScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * Coding平台 OAuth 授权范围 * @@ -33,18 +28,4 @@ public enum AuthCodingScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthCodingScope[] scopes = AuthCodingScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthCodingScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthCodingScope.values()).map(AuthCodingScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthFacebookScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthFacebookScope.java index 79f65f2..5edb1fb 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthFacebookScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthFacebookScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * Facebook 平台 OAuth 授权范围 * @@ -42,18 +37,4 @@ public enum AuthFacebookScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthFacebookScope[] scopes = AuthFacebookScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthFacebookScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthFacebookScope.values()).map(AuthFacebookScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthGiteeScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthGiteeScope.java index f63b1f4..843d687 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthGiteeScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthGiteeScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * Gitee 平台 OAuth 授权范围 * @@ -38,18 +33,4 @@ public enum AuthGiteeScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthGiteeScope[] scopes = AuthGiteeScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthGiteeScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthGiteeScope.values()).map(AuthGiteeScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthGithubScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthGithubScope.java index 9481008..d79cbda 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthGithubScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthGithubScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * 边度平台 OAuth 授权范围 * @@ -56,18 +51,4 @@ public enum AuthGithubScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthGithubScope[] scopes = AuthGithubScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthGithubScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthGithubScope.values()).map(AuthGithubScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthGitlabScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthGitlabScope.java index f071156..1b64763 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthGitlabScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthGitlabScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * Gitlab 平台 OAuth 授权范围 * @@ -39,18 +34,4 @@ public enum AuthGitlabScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthGitlabScope[] scopes = AuthGitlabScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthGitlabScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthGitlabScope.values()).map(AuthGitlabScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthGoogleScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthGoogleScope.java index 99e609e..1953737 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthGoogleScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthGoogleScope.java @@ -3,7 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -286,20 +285,6 @@ public enum AuthGoogleScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthGoogleScope[] scopes = AuthGoogleScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthGoogleScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthGoogleScope.values()).map(AuthGoogleScope::getScope).collect(Collectors.toList()); - } public static List getAdminDirectoryScopes() { return Arrays.stream(new AuthGoogleScope[]{ diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthHuaweiScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthHuaweiScope.java index d9dffa5..5c33f67 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthHuaweiScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthHuaweiScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * 华为平台 OAuth 授权范围 * @@ -48,18 +43,4 @@ public enum AuthHuaweiScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthHuaweiScope[] scopes = AuthHuaweiScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthHuaweiScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthHuaweiScope.values()).map(AuthHuaweiScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthJdScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthJdScope.java index d1840c2..02a429e 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthJdScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthJdScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * 京东平台 OAuth 授权范围 * @@ -28,18 +23,4 @@ public enum AuthJdScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthJdScope[] scopes = AuthJdScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthJdScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthJdScope.values()).map(AuthJdScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthKujialeScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthKujialeScope.java index f7cb38e..b78f9e7 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthKujialeScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthKujialeScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * 酷家乐平台 OAuth 授权范围 * @@ -30,18 +25,4 @@ public enum AuthKujialeScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthKujialeScope[] scopes = AuthKujialeScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthKujialeScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthKujialeScope.values()).map(AuthKujialeScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthLinkedinScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthLinkedinScope.java index 8b7068e..9609c00 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthLinkedinScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthLinkedinScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * 领英平台 OAuth 授权范围 * @@ -45,18 +40,4 @@ public enum AuthLinkedinScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthLinkedinScope[] scopes = AuthLinkedinScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthLinkedinScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthLinkedinScope.values()).map(AuthLinkedinScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthMiScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthMiScope.java index b8538a1..400a1bf 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthMiScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthMiScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * 小米平台 OAuth 授权范围 * @@ -30,18 +25,4 @@ public enum AuthMiScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthMiScope[] scopes = AuthMiScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthMiScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthMiScope.values()).map(AuthMiScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthMicrosoftScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthMicrosoftScope.java index a356b61..428196a 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthMicrosoftScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthMicrosoftScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * 微软平台 OAuth 授权范围 * @@ -69,18 +64,4 @@ public enum AuthMicrosoftScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthMicrosoftScope[] scopes = AuthMicrosoftScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthMicrosoftScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthMicrosoftScope.values()).map(AuthMicrosoftScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthPinterestScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthPinterestScope.java index ee105f3..006b790 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthPinterestScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthPinterestScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * Pinterest 平台 OAuth 授权范围 * @@ -32,18 +27,4 @@ public enum AuthPinterestScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthPinterestScope[] scopes = AuthPinterestScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthPinterestScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthPinterestScope.values()).map(AuthPinterestScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthQqScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthQqScope.java index a317a3b..c713aff 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthQqScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthQqScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * QQ 平台 OAuth 授权范围 * @@ -37,18 +32,4 @@ public enum AuthQqScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthQqScope[] scopes = AuthQqScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthQqScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthQqScope.values()).map(AuthQqScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthRenrenScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthRenrenScope.java index b3c3e2d..6bc5991 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthRenrenScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthRenrenScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * 人人平台 OAuth 授权范围 * @@ -57,18 +52,4 @@ public enum AuthRenrenScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthRenrenScope[] scopes = AuthRenrenScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthRenrenScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthRenrenScope.values()).map(AuthRenrenScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthScope.java index a52bfc4..15e4024 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthScope.java @@ -9,5 +9,17 @@ package me.zhyd.oauth.enums.scope; */ public interface AuthScope { + /** + * 获取字符串 {@code scope}，对应为各平台实际使用的 {@code scope} + * + * @return String + */ String getScope(); + + /** + * 判断当前 {@code scope} 是否为各平台默认启用的 + * + * @return boolean + */ + boolean isDefault(); } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthStackoverflowScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthStackoverflowScope.java index b9f54c2..5d3e7de 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthStackoverflowScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthStackoverflowScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * Stackoverflow 平台 OAuth 授权范围 * @@ -31,18 +26,4 @@ public enum AuthStackoverflowScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthStackoverflowScope[] scopes = AuthStackoverflowScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthStackoverflowScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthStackoverflowScope.values()).map(AuthStackoverflowScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthWechatMpScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthWechatMpScope.java index db0d606..7695c62 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthWechatMpScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthWechatMpScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * 微信公众平台 OAuth 授权范围 * @@ -28,18 +23,4 @@ public enum AuthWechatMpScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthWechatMpScope[] scopes = AuthWechatMpScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthWechatMpScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthWechatMpScope.values()).map(AuthWechatMpScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/enums/scope/AuthWeiboScope.java b/src/main/java/me/zhyd/oauth/enums/scope/AuthWeiboScope.java index 73451d6..6923998 100644 --- a/src/main/java/me/zhyd/oauth/enums/scope/AuthWeiboScope.java +++ b/src/main/java/me/zhyd/oauth/enums/scope/AuthWeiboScope.java @@ -3,11 +3,6 @@ package me.zhyd.oauth.enums.scope; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - /** * 微博平台 OAuth 授权范围 * @@ -36,18 +31,4 @@ public enum AuthWeiboScope implements AuthScope { private String description; private boolean isDefault; - public static List getDefaultScopes() { - AuthWeiboScope[] scopes = AuthWeiboScope.values(); - List defaultScopes = new ArrayList<>(); - for (AuthWeiboScope scope : scopes) { - if (scope.isDefault()) { - defaultScopes.add(scope); - } - } - return defaultScopes; - } - - public static List listScope() { - return Arrays.stream(AuthWeiboScope.values()).map(AuthWeiboScope::getScope).collect(Collectors.toList()); - } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java index 7e0cd21..30b9967 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthBaiduRequest.java @@ -12,6 +12,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.AuthScopeUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.StringUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -105,7 +106,7 @@ public class AuthBaiduRequest extends AuthDefaultRequest { public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("display", "popup") - .queryParam("scope", this.getScopes(" ", true, AuthBaiduScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(" ", true, AuthScopeUtils.getDefaultScopes(AuthBaiduScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java b/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java index 65c734b..03eb57a 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthCodingRequest.java @@ -10,6 +10,7 @@ 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.utils.AuthScopeUtils; import me.zhyd.oauth.utils.UrlBuilder; /** @@ -88,7 +89,7 @@ public class AuthCodingRequest extends AuthDefaultRequest { .queryParam("response_type", "code") .queryParam("client_id", config.getClientId()) .queryParam("redirect_uri", config.getRedirectUri()) - .queryParam("scope", this.getScopes(" ", true, AuthCodingScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(" ", true, AuthScopeUtils.getDefaultScopes(AuthCodingScope.values()))) .queryParam("state", getRealState(state)) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java b/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java index fb8ddd2..b765297 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java @@ -6,7 +6,6 @@ import me.zhyd.oauth.cache.AuthStateCache; import me.zhyd.oauth.config.AuthConfig; import me.zhyd.oauth.config.AuthSource; import me.zhyd.oauth.enums.AuthResponseStatus; -import me.zhyd.oauth.enums.scope.AuthScope; import me.zhyd.oauth.exception.AuthException; import me.zhyd.oauth.log.Log; import me.zhyd.oauth.model.AuthCallback; @@ -15,7 +14,6 @@ import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.utils.*; -import java.util.ArrayList; import java.util.List; /** @@ -277,16 +275,13 @@ public abstract class AuthDefaultRequest implements AuthRequest { * @return String * @since 1.16.7 */ - protected String getScopes(String separator, boolean encode, List defaultScopes) { + protected String getScopes(String separator, boolean encode, List defaultScopes) { List scopes = config.getScopes(); if (null == scopes || scopes.isEmpty()) { if (null == defaultScopes || defaultScopes.isEmpty()) { return ""; } - scopes = new ArrayList<>(); - for (AuthScope defaultScope : defaultScopes) { - scopes.add(defaultScope.getScope()); - } + scopes = defaultScopes; } if (null == separator) { // 默认为空格 diff --git a/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java b/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java index 675a316..e9897a8 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthFacebookRequest.java @@ -10,6 +10,7 @@ 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.utils.AuthScopeUtils; import me.zhyd.oauth.utils.UrlBuilder; /** @@ -106,7 +107,7 @@ public class AuthFacebookRequest extends AuthDefaultRequest { @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) - .queryParam("scope", this.getScopes(",", false, AuthFacebookScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(",", false, AuthScopeUtils.getDefaultScopes(AuthFacebookScope.values()))) .build(); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java index 0910293..735701c 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGiteeRequest.java @@ -10,6 +10,7 @@ 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.utils.AuthScopeUtils; import me.zhyd.oauth.utils.UrlBuilder; /** @@ -84,7 +85,7 @@ public class AuthGiteeRequest extends AuthDefaultRequest { @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) - .queryParam("scope", this.getScopes(" ", true, AuthGiteeScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(" ", true, AuthScopeUtils.getDefaultScopes(AuthGiteeScope.values()))) .build(); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java index a83c54a..ba8818d 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGithubRequest.java @@ -10,6 +10,7 @@ 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.utils.AuthScopeUtils; import me.zhyd.oauth.utils.GlobalAuthUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -84,7 +85,7 @@ public class AuthGithubRequest extends AuthDefaultRequest { @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) - .queryParam("scope", this.getScopes(" ", true, AuthGithubScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(" ", true, AuthScopeUtils.getDefaultScopes(AuthGithubScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGitlabRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGitlabRequest.java index 57e754e..a56a69d 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGitlabRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGitlabRequest.java @@ -10,6 +10,7 @@ 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.utils.AuthScopeUtils; import me.zhyd.oauth.utils.UrlBuilder; /** @@ -89,7 +90,7 @@ public class AuthGitlabRequest extends AuthDefaultRequest { @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) - .queryParam("scope", this.getScopes("+", false, AuthGitlabScope.getDefaultScopes())) + .queryParam("scope", this.getScopes("+", false, AuthScopeUtils.getDefaultScopes(AuthGitlabScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java b/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java index 666ad60..002f6cc 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthGoogleRequest.java @@ -11,6 +11,7 @@ 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.utils.AuthScopeUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -76,7 +77,7 @@ public class AuthGoogleRequest extends AuthDefaultRequest { public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("access_type", "offline") - .queryParam("scope", this.getScopes(" ", false, AuthGoogleScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(" ", false, AuthScopeUtils.getDefaultScopes(AuthGoogleScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java b/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java index 3817d6b..61ead0b 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthHuaweiRequest.java @@ -11,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.AuthScopeUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -132,7 +133,7 @@ public class AuthHuaweiRequest extends AuthDefaultRequest { public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("access_type", "offline") - .queryParam("scope", this.getScopes(" ", true, AuthHuaweiScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(" ", true, AuthScopeUtils.getDefaultScopes(AuthHuaweiScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java b/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java index 9116f42..7b38c71 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthJdRequest.java @@ -12,6 +12,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.AuthScopeUtils; import me.zhyd.oauth.utils.GlobalAuthUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -137,7 +138,7 @@ public class AuthJdRequest extends AuthDefaultRequest { .queryParam("app_key", config.getClientId()) .queryParam("response_type", "code") .queryParam("redirect_uri", config.getRedirectUri()) - .queryParam("scope", this.getScopes(" ", true, AuthJdScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(" ", true, AuthScopeUtils.getDefaultScopes(AuthJdScope.values()))) .queryParam("state", getRealState(state)) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java b/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java index 66a5740..2392e70 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthKujialeRequest.java @@ -11,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.AuthScopeUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -41,7 +42,7 @@ public class AuthKujialeRequest extends AuthDefaultRequest { @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) - .queryParam("scope", this.getScopes(",", false, AuthKujialeScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(",", false, AuthScopeUtils.getDefaultScopes(AuthKujialeScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java b/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java index d5a01d2..9773fec 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthLinkedinRequest.java @@ -14,6 +14,7 @@ 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.utils.AuthScopeUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -199,7 +200,7 @@ public class AuthLinkedinRequest extends AuthDefaultRequest { @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) - .queryParam("scope", this.getScopes(" ", false, AuthLinkedinScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(" ", false, AuthScopeUtils.getDefaultScopes(AuthLinkedinScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java index 4d2c64c..6abe1e1 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthMiRequest.java @@ -14,6 +14,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.AuthScopeUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -127,7 +128,7 @@ public class AuthMiRequest extends AuthDefaultRequest { public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("skip_confirm", "false") - .queryParam("scope", this.getScopes(" ", true, AuthMiScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(" ", true, AuthScopeUtils.getDefaultScopes(AuthMiScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java b/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java index 11bf9b4..6f6f530 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthMicrosoftRequest.java @@ -14,6 +14,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.AuthScopeUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -125,7 +126,7 @@ public class AuthMicrosoftRequest extends AuthDefaultRequest { public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) .queryParam("response_mode", "query") - .queryParam("scope", this.getScopes(" ", true, AuthMicrosoftScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(" ", true, AuthScopeUtils.getDefaultScopes(AuthMicrosoftScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthPinterestRequest.java b/src/main/java/me/zhyd/oauth/request/AuthPinterestRequest.java index 722e9f5..75928df 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthPinterestRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthPinterestRequest.java @@ -9,6 +9,7 @@ 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.utils.AuthScopeUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -85,7 +86,7 @@ public class AuthPinterestRequest extends AuthDefaultRequest { @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) - .queryParam("scope", this.getScopes(",", false, AuthPinterestScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(",", false, AuthScopeUtils.getDefaultScopes(AuthPinterestScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java index a835f76..0882c64 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthQqRequest.java @@ -12,10 +12,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.GlobalAuthUtils; -import me.zhyd.oauth.utils.HttpUtils; -import me.zhyd.oauth.utils.StringUtils; -import me.zhyd.oauth.utils.UrlBuilder; +import me.zhyd.oauth.utils.*; import java.util.Map; @@ -130,7 +127,7 @@ public class AuthQqRequest extends AuthDefaultRequest { @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) - .queryParam("scope", this.getScopes(",", false, AuthQqScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(",", false, AuthScopeUtils.getDefaultScopes(AuthQqScope.values()))) .build(); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java b/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java index a923ee0..f2a337f 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthRenrenRequest.java @@ -12,6 +12,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.AuthScopeUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -123,7 +124,7 @@ public class AuthRenrenRequest extends AuthDefaultRequest { @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) - .queryParam("scope", this.getScopes(",", false, AuthRenrenScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(",", false, AuthScopeUtils.getDefaultScopes(AuthRenrenScope.values()))) .build(); } } diff --git a/src/main/java/me/zhyd/oauth/request/AuthStackOverflowRequest.java b/src/main/java/me/zhyd/oauth/request/AuthStackOverflowRequest.java index 750c7bd..e8f8c3e 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthStackOverflowRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthStackOverflowRequest.java @@ -12,6 +12,7 @@ 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.utils.AuthScopeUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -87,7 +88,7 @@ public class AuthStackOverflowRequest extends AuthDefaultRequest { @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) - .queryParam("scope", this.getScopes(",", false, AuthStackoverflowScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(",", false, AuthScopeUtils.getDefaultScopes(AuthStackoverflowScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java index af4adb1..d03f6ad 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeChatMpRequest.java @@ -12,6 +12,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.AuthScopeUtils; import me.zhyd.oauth.utils.GlobalAuthUtils; import me.zhyd.oauth.utils.HttpUtils; import me.zhyd.oauth.utils.UrlBuilder; @@ -124,7 +125,7 @@ public class AuthWeChatMpRequest extends AuthDefaultRequest { .queryParam("redirect_uri", GlobalAuthUtils.urlEncode(config.getRedirectUri())) .queryParam("response_type", "code") .queryParam("state", getRealState(state).concat("#wechat_redirect")) - .queryParam("scope", this.getScopes(",", false, AuthWechatMpScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(",", false, AuthScopeUtils.getDefaultScopes(AuthWechatMpScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java index fd6917a..313a844 100644 --- a/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java +++ b/src/main/java/me/zhyd/oauth/request/AuthWeiboRequest.java @@ -13,10 +13,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.IpUtils; -import me.zhyd.oauth.utils.StringUtils; -import me.zhyd.oauth.utils.UrlBuilder; +import me.zhyd.oauth.utils.*; /** @@ -97,7 +94,7 @@ public class AuthWeiboRequest extends AuthDefaultRequest { @Override public String authorize(String state) { return UrlBuilder.fromBaseUrl(super.authorize(state)) - .queryParam("scope", this.getScopes(",", false, AuthWeiboScope.getDefaultScopes())) + .queryParam("scope", this.getScopes(",", false, AuthScopeUtils.getDefaultScopes(AuthWeiboScope.values()))) .build(); } diff --git a/src/main/java/me/zhyd/oauth/utils/AuthScopeUtils.java b/src/main/java/me/zhyd/oauth/utils/AuthScopeUtils.java new file mode 100644 index 0000000..2be62ec --- /dev/null +++ b/src/main/java/me/zhyd/oauth/utils/AuthScopeUtils.java @@ -0,0 +1,46 @@ +package me.zhyd.oauth.utils; + +import me.zhyd.oauth.enums.scope.AuthScope; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * Scope 工具类，提供对 scope 类的统一操作 + * + * @author yadong.zhang (yadong.zhang0415(a)gmail.com) + * @version 1.0.0 + * @since 1.15.7 + */ +public class AuthScopeUtils { + + /** + * 获取 {@link me.zhyd.oauth.enums.scope.AuthScope} 数组中所有的被标记为 {@code default} 的 scope + * + * @param scopes scopes + * @return List + */ + public static List getDefaultScopes(AuthScope[] scopes) { + if (null == scopes || scopes.length == 0) { + return null; + } + return Arrays.stream(scopes) + .filter((AuthScope::isDefault)) + .map(AuthScope::getScope) + .collect(Collectors.toList()); + } + + /** + * 从 {@link me.zhyd.oauth.enums.scope.AuthScope} 数组中获取实际的 scope 字符串 + * + * @param scopes 可变参数，支持传任意 {@link me.zhyd.oauth.enums.scope.AuthScope} + * @return List + */ + public static List getScopes(AuthScope... scopes) { + if (null == scopes || scopes.length == 0) { + return null; + } + return Arrays.stream(scopes).map(AuthScope::getScope).collect(Collectors.toList()); + } +} -- GitLab