From a61f6fe1001d61ec95fdb3631c234190ffaf5248 Mon Sep 17 00:00:00 2001 From: smallbun <2689170096@qq.com> Date: Sat, 19 Aug 2023 13:49:19 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/IdentityProviderCategory.java | 11 +++++------ .../authentication/common/IdentityProviderType.java | 2 +- ...thubOAuth2AuthorizationRequestRedirectFilter.java | 4 ++-- .../GithubOAuth2LoginAuthenticationFilter.java | 12 ++++++------ .../converter/authn/IdentityProviderConverter.java | 6 +++--- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/eiam-authentication/eiam-authentication-core/src/main/java/cn/topiam/employee/authentication/common/IdentityProviderCategory.java b/eiam-authentication/eiam-authentication-core/src/main/java/cn/topiam/employee/authentication/common/IdentityProviderCategory.java index e47bb37a..f93985da 100644 --- a/eiam-authentication/eiam-authentication-core/src/main/java/cn/topiam/employee/authentication/common/IdentityProviderCategory.java +++ b/eiam-authentication/eiam-authentication-core/src/main/java/cn/topiam/employee/authentication/common/IdentityProviderCategory.java @@ -35,12 +35,11 @@ public enum IdentityProviderCategory implements BaseEnum { /** * 社交 */ - social("social", "社交", - Lists.newArrayList( - IdentityProviderType.QQ, - IdentityProviderType.WECHAT_QR, - IdentityProviderType.GITHUB, - IdentityProviderType.GITHUB)), + social("social", "社交", Lists.newArrayList( + IdentityProviderType.QQ, + IdentityProviderType.WECHAT_QR, + IdentityProviderType.GITEE_OAUTH, + IdentityProviderType.GITHUB_OAUTH)), /** * 企业 */ diff --git a/eiam-authentication/eiam-authentication-core/src/main/java/cn/topiam/employee/authentication/common/IdentityProviderType.java b/eiam-authentication/eiam-authentication-core/src/main/java/cn/topiam/employee/authentication/common/IdentityProviderType.java index bf51d49d..08d7cb3b 100644 --- a/eiam-authentication/eiam-authentication-core/src/main/java/cn/topiam/employee/authentication/common/IdentityProviderType.java +++ b/eiam-authentication/eiam-authentication-core/src/main/java/cn/topiam/employee/authentication/common/IdentityProviderType.java @@ -103,7 +103,7 @@ public final class IdentityProviderType { /** * GITHUB认证 */ - public static final IdentityProviderType GITHUB = new IdentityProviderType( + public static final IdentityProviderType GITHUB_OAUTH = new IdentityProviderType( "github_oauth", "GITHUB认证", "通过GITHUB进行身份认证"); private final String value; diff --git a/eiam-authentication/eiam-authentication-github/src/main/java/cn/topiam/employee/authentication/github/filter/GithubOAuth2AuthorizationRequestRedirectFilter.java b/eiam-authentication/eiam-authentication-github/src/main/java/cn/topiam/employee/authentication/github/filter/GithubOAuth2AuthorizationRequestRedirectFilter.java index e0d0b604..a50e3d21 100644 --- a/eiam-authentication/eiam-authentication-github/src/main/java/cn/topiam/employee/authentication/github/filter/GithubOAuth2AuthorizationRequestRedirectFilter.java +++ b/eiam-authentication/eiam-authentication-github/src/main/java/cn/topiam/employee/authentication/github/filter/GithubOAuth2AuthorizationRequestRedirectFilter.java @@ -49,7 +49,7 @@ import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import static cn.topiam.employee.authentication.common.IdentityProviderType.GITHUB; +import static cn.topiam.employee.authentication.common.IdentityProviderType.GITHUB_OAUTH; import static cn.topiam.employee.authentication.common.constant.AuthenticationConstants.PROVIDER_CODE; import static cn.topiam.employee.authentication.github.constant.GithubAuthenticationConstants.URL_AUTHORIZE; import static cn.topiam.employee.authentication.github.filter.GithubOAuth2LoginAuthenticationFilter.getLoginUrl; @@ -70,7 +70,7 @@ public class GithubOAuth2AuthorizationRequestRedirectFilter extends OncePerReque * AntPathRequestMatcher */ public static final AntPathRequestMatcher GITHUB_REQUEST_MATCHER = new AntPathRequestMatcher( - GITHUB.getAuthorizationPathPrefix() + "/" + "{" + PROVIDER_CODE + "}", + GITHUB_OAUTH.getAuthorizationPathPrefix() + "/" + "{" + PROVIDER_CODE + "}", HttpMethod.GET.name()); /** diff --git a/eiam-authentication/eiam-authentication-github/src/main/java/cn/topiam/employee/authentication/github/filter/GithubOAuth2LoginAuthenticationFilter.java b/eiam-authentication/eiam-authentication-github/src/main/java/cn/topiam/employee/authentication/github/filter/GithubOAuth2LoginAuthenticationFilter.java index 6820f9aa..ef9f0b74 100644 --- a/eiam-authentication/eiam-authentication-github/src/main/java/cn/topiam/employee/authentication/github/filter/GithubOAuth2LoginAuthenticationFilter.java +++ b/eiam-authentication/eiam-authentication-github/src/main/java/cn/topiam/employee/authentication/github/filter/GithubOAuth2LoginAuthenticationFilter.java @@ -52,7 +52,7 @@ import cn.topiam.employee.support.util.HttpUrlUtils; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import static cn.topiam.employee.authentication.common.IdentityProviderType.GITHUB; +import static cn.topiam.employee.authentication.common.IdentityProviderType.GITHUB_OAUTH; import static cn.topiam.employee.authentication.common.constant.AuthenticationConstants.*; import static cn.topiam.employee.authentication.github.constant.GithubAuthenticationConstants.*; @@ -66,7 +66,7 @@ import static cn.topiam.employee.authentication.github.constant.GithubAuthentica public class GithubOAuth2LoginAuthenticationFilter extends AbstractIdpAuthenticationProcessingFilter { final String ERROR_CODE = "error"; - public final static String DEFAULT_FILTER_PROCESSES_URI = GITHUB + public final static String DEFAULT_FILTER_PROCESSES_URI = GITHUB_OAUTH .getLoginPathPrefix() + "/" + "{" + PROVIDER_CODE + "}"; public static final AntPathRequestMatcher REQUEST_MATCHER = new AntPathRequestMatcher( DEFAULT_FILTER_PROCESSES_URI, HttpMethod.GET.name()); @@ -150,8 +150,8 @@ public class GithubOAuth2LoginAuthenticationFilter extends } // 返回 String id = result.getString("id"); - IdpUserDetails idpUserDetails = IdpUserDetails.builder().openId(id).providerType(GITHUB) - .providerCode(providerCode).providerId(providerId).build(); + IdpUserDetails idpUserDetails = IdpUserDetails.builder().openId(id) + .providerType(GITHUB_OAUTH).providerCode(providerCode).providerId(providerId).build(); return attemptAuthentication(request, response, idpUserDetails); } @@ -172,8 +172,8 @@ public class GithubOAuth2LoginAuthenticationFilter extends } public static String getLoginUrl(String providerId) { - String url = ServerHelp.getPortalPublicBaseUrl() + "/" + GITHUB.getLoginPathPrefix() + "/" - + providerId; + String url = ServerHelp.getPortalPublicBaseUrl() + "/" + GITHUB_OAUTH.getLoginPathPrefix() + + "/" + providerId; return HttpUrlUtils.format(url); } diff --git a/eiam-console/src/main/java/cn/topiam/employee/console/converter/authn/IdentityProviderConverter.java b/eiam-console/src/main/java/cn/topiam/employee/console/converter/authn/IdentityProviderConverter.java index 40d0e3f1..7970218b 100644 --- a/eiam-console/src/main/java/cn/topiam/employee/console/converter/authn/IdentityProviderConverter.java +++ b/eiam-console/src/main/java/cn/topiam/employee/console/converter/authn/IdentityProviderConverter.java @@ -262,7 +262,7 @@ public interface IdentityProviderConverter { } else if (type.equals(FEISHU_OAUTH.value())) { identityProviderConfig = config.to(FeiShuIdpScanCodeConfig.class); //GITHUB认证 - } else if (type.equals(GITHUB.value())) { + } else if (type.equals(GITHUB_OAUTH.value())) { identityProviderConfig = config.to(GithubIdpOauthConfig.class); } //Gitee @@ -319,8 +319,8 @@ public interface IdentityProviderConverter { if (WECHAT_WEB_PAGE.value().equals(type)) { return WECHAT_WEB_PAGE; } - if (GITHUB.value().equals(type)) { - return GITHUB; + if (GITHUB_OAUTH.value().equals(type)) { + return GITHUB_OAUTH; } if (GITEE_OAUTH.value().equals(type)) { return GITEE_OAUTH;