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 f93985da..f932caf5 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 @@ -36,7 +36,7 @@ public enum IdentityProviderCategory implements BaseEnum { * 社交 */ social("social", "社交", Lists.newArrayList( - IdentityProviderType.QQ, + IdentityProviderType.QQ_OAUTH, 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 08d7cb3b..412bc31a 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 @@ -73,7 +73,7 @@ public final class IdentityProviderType { /** * QQ认证 */ - public static final IdentityProviderType QQ = new IdentityProviderType( + public static final IdentityProviderType QQ_OAUTH = new IdentityProviderType( "qq_oauth", "QQ认证", "通过QQ进行身份认证"); /** diff --git a/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2AuthorizationRequestRedirectFilter.java b/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2AuthorizationRequestRedirectFilter.java index 5aab8905..d22137d3 100644 --- a/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2AuthorizationRequestRedirectFilter.java +++ b/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2AuthorizationRequestRedirectFilter.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.QQ; +import static cn.topiam.employee.authentication.common.IdentityProviderType.QQ_OAUTH; import static cn.topiam.employee.authentication.common.constant.AuthenticationConstants.PROVIDER_CODE; import static cn.topiam.employee.authentication.qq.constant.QqAuthenticationConstants.URL_AUTHORIZE; import static cn.topiam.employee.authentication.qq.filter.QqOAuth2LoginAuthenticationFilter.getLoginUrl; @@ -70,7 +70,8 @@ public class QqOAuth2AuthorizationRequestRedirectFilter extends OncePerRequestFi * AntPathRequestMatcher */ public static final AntPathRequestMatcher QQ_REQUEST_MATCHER = new AntPathRequestMatcher( - QQ.getAuthorizationPathPrefix() + "/" + "{" + PROVIDER_CODE + "}", HttpMethod.GET.name()); + QQ_OAUTH.getAuthorizationPathPrefix() + "/" + "{" + PROVIDER_CODE + "}", + HttpMethod.GET.name()); /** * 重定向策略 diff --git a/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2LoginAuthenticationFilter.java b/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2LoginAuthenticationFilter.java index 210d8c90..b43c85de 100644 --- a/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2LoginAuthenticationFilter.java +++ b/eiam-authentication/eiam-authentication-qq/src/main/java/cn/topiam/employee/authentication/qq/filter/QqOAuth2LoginAuthenticationFilter.java @@ -54,7 +54,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import static com.nimbusds.oauth2.sdk.GrantType.AUTHORIZATION_CODE; -import static cn.topiam.employee.authentication.common.IdentityProviderType.QQ; +import static cn.topiam.employee.authentication.common.IdentityProviderType.QQ_OAUTH; import static cn.topiam.employee.authentication.common.constant.AuthenticationConstants.*; import static cn.topiam.employee.authentication.qq.constant.QqAuthenticationConstants.URL_GET_ACCESS_TOKEN; import static cn.topiam.employee.authentication.qq.constant.QqAuthenticationConstants.URL_GET_OPEN_ID; @@ -68,9 +68,8 @@ import static cn.topiam.employee.authentication.qq.constant.QqAuthenticationCons @SuppressWarnings({ "AlibabaClassNamingShouldBeCamel", "DuplicatedCode" }) public class QqOAuth2LoginAuthenticationFilter extends AbstractIdpAuthenticationProcessingFilter { final String ERROR_CODE = "error"; - public final static String DEFAULT_FILTER_PROCESSES_URI = QQ.getLoginPathPrefix() - + "/" + "{" - + PROVIDER_CODE + "}"; + public final static String DEFAULT_FILTER_PROCESSES_URI = QQ_OAUTH + .getLoginPathPrefix() + "/" + "{" + PROVIDER_CODE + "}"; public static final AntPathRequestMatcher REQUEST_MATCHER = new AntPathRequestMatcher( DEFAULT_FILTER_PROCESSES_URI, HttpMethod.GET.name()); @@ -156,14 +155,14 @@ public class QqOAuth2LoginAuthenticationFilter extends AbstractIdpAuthentication } // 返回 String openId = result.getString(OidcScopes.OPENID); - IdpUserDetails idpUserDetails = IdpUserDetails.builder().openId(openId).providerType(QQ) - .providerCode(providerCode).providerId(providerId).build(); + IdpUserDetails idpUserDetails = IdpUserDetails.builder().openId(openId) + .providerType(QQ_OAUTH).providerCode(providerCode).providerId(providerId).build(); return attemptAuthentication(request, response, idpUserDetails); } public static String getLoginUrl(String providerId) { - String url = ServerHelp.getPortalPublicBaseUrl() + "/" + QQ.getLoginPathPrefix() + "/" + String url = ServerHelp.getPortalPublicBaseUrl() + "/" + QQ_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 7970218b..724f6a2c 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 @@ -256,7 +256,7 @@ public interface IdentityProviderConverter { } else if (type.equals(WECHAT_WORK_QR.value())) { identityProviderConfig = config.to(WeChatWorkIdpScanCodeConfig.class); //QQ认证 - } else if (type.equals(QQ.value())) { + } else if (type.equals(QQ_OAUTH.value())) { identityProviderConfig = config.to(QqIdpOauthConfig.class); //飞书认证 } else if (type.equals(FEISHU_OAUTH.value())) { @@ -304,8 +304,8 @@ public interface IdentityProviderConverter { if (WECHAT_WORK_QR.value().equals(type)) { return WECHAT_WORK_QR; } - if (QQ.value().equals(type)) { - return QQ; + if (QQ_OAUTH.value().equals(type)) { + return QQ_OAUTH; } if (LDAP.value().equals(type)) { return LDAP;