From 500a79b3e6566e63ceb3aef9e34377503574c957 Mon Sep 17 00:00:00 2001 From: luoqiz Date: Sat, 14 Dec 2024 18:57:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7justauth=201.16.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- .../xkcoding/justauth/AuthRequestFactory.java | 45 +++++++-- ...itional-spring-configuration-metadata.json | 96 +++++++++++++++++-- 3 files changed, 126 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 69a0a38..e5b925b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.xkcoding.justauth justauth-spring-boot-starter - 1.4.0 + 1.4.1-SNAPSHOT justauth-spring-boot-starter https://github.com/xkcoding/justauth-spring-boot-starter @@ -72,7 +72,7 @@ 2.1.8.RELEASE - 1.16.1 + 1.16.7 5.6.5 diff --git a/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java b/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java index fd75376..1bdd60a 100644 --- a/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java +++ b/src/main/java/com/xkcoding/justauth/AuthRequestFactory.java @@ -186,6 +186,8 @@ public class AuthRequestFactory { return new AuthGiteeRequest(config, authStateCache); case DINGTALK: return new AuthDingTalkRequest(config, authStateCache); + case DINGTALK_V2: + return new AuthDingTalkV2Request(config, authStateCache); case DINGTALK_ACCOUNT: return new AuthDingTalkAccountRequest(config, authStateCache); case BAIDU: @@ -204,10 +206,6 @@ public class AuthRequestFactory { return new AuthWeChatOpenRequest(config, authStateCache); case WECHAT_MP: return new AuthWeChatMpRequest(config, authStateCache); - case WECHAT_ENTERPRISE: - return new AuthWeChatEnterpriseQrcodeRequest(config, authStateCache); - case WECHAT_ENTERPRISE_WEB: - return new AuthWeChatEnterpriseWebRequest(config, authStateCache); case TAOBAO: return new AuthTaobaoRequest(config, authStateCache); case GOOGLE: @@ -220,6 +218,9 @@ public class AuthRequestFactory { return new AuthLinkedinRequest(config, authStateCache); case MICROSOFT: return new AuthMicrosoftRequest(config, authStateCache); + case MICROSOFT_CN: + return new AuthMicrosoftCnRequest(config, authStateCache); + case MI: return new AuthMiRequest(config, authStateCache); case TOUTIAO: @@ -234,15 +235,25 @@ public class AuthRequestFactory { return new AuthStackOverflowRequest(config, authStateCache); case HUAWEI: return new AuthHuaweiRequest(config, authStateCache); - case GITLAB: - return new AuthGitlabRequest(config, authStateCache); + case HUAWEI_V3: + return new AuthHuaweiV3Request(config, authStateCache); + case WECHAT_ENTERPRISE: + return new AuthWeChatEnterpriseQrcodeRequest(config, authStateCache); + case WECHAT_ENTERPRISE_V2: + return new AuthWeChatEnterpriseQrcodeV2Request(config, authStateCache); + case WECHAT_ENTERPRISE_QRCODE_THIRD: + return new AuthWeChatEnterpriseThirdQrcodeRequest(config, authStateCache); + case WECHAT_ENTERPRISE_WEB: + return new AuthWeChatEnterpriseWebRequest(config, authStateCache); case KUJIALE: return new AuthKujialeRequest(config, authStateCache); - case ELEME: - return new AuthElemeRequest(config, authStateCache); + case GITLAB: + return new AuthGitlabRequest(config, authStateCache); case MEITUAN: return new AuthMeituanRequest(config, authStateCache); - case TWITTER: + case ELEME: + return new AuthElemeRequest(config, authStateCache); + case TWITTER: return new AuthTwitterRequest(config, authStateCache); case FEISHU: return new AuthFeishuRequest(config, authStateCache); @@ -260,6 +271,22 @@ public class AuthRequestFactory { return new AuthLineRequest(config, authStateCache); case OKTA: return new AuthOktaRequest(config, authStateCache); + case PROGINN: + return new AuthProginnRequest(config,authStateCache); + case AFDIAN: + return new AuthAfDianRequest(config,authStateCache); + case APPLE: + return new AuthAppleRequest(config,authStateCache); + case FIGMA: + return new AuthFigmaRequest(config,authStateCache); + case WECHAT_MINI_PROGRAM: + config.setIgnoreCheckRedirectUri(true); + config.setIgnoreCheckState(true); + return new AuthWechatMiniProgramRequest(config, authStateCache); + case QQ_MINI_PROGRAM: + config.setIgnoreCheckRedirectUri(true); + config.setIgnoreCheckState(true); + return new AuthQQMiniProgramRequest(config, authStateCache); default: return null; } diff --git a/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/src/main/resources/META-INF/additional-spring-configuration-metadata.json index ff467cb..e79a477 100644 --- a/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -19,6 +19,14 @@ "value": "DINGTALK", "description": "DINGTALK." }, + { + "value": "DINGTALK_V2", + "description": "DINGTALK_V2." + }, + { + "value": "DINGTALK_ACCOUNT", + "description": "DINGTALK_ACCOUNT." + }, { "value": "BAIDU", "description": "BAIDU." @@ -43,6 +51,14 @@ "value": "QQ", "description": "QQ." }, + { + "value": "WECHAT_OPEN", + "description": "WeChat open platform." + }, + { + "value": "WECHAT_MP", + "description": "WeChat Official Platform." + }, { "value": "TAOBAO", "description": "TAOBAO." @@ -67,6 +83,10 @@ "value": "MICROSOFT", "description": "MICROSOFT." }, + { + "value": "MICROSOFT_CN", + "description": "MICROSOFT_CN." + }, { "value": "MI", "description": "MI." @@ -96,16 +116,24 @@ "description": "HUAWEI." }, { - "value": "WECHAT_OPEN", - "description": "WeChat open platform." + "value": "HUAWEI_V3", + "description": "HUAWEI_V3." }, { "value": "WECHAT_ENTERPRISE", "description": "WeChat enterprise platform." }, { - "value": "WECHAT_MP", - "description": "WeChat Official Platform." + "value": "WECHAT_ENTERPRISE_V2", + "description": "WeChat enterprise platform v2." + }, + { + "value": "WECHAT_ENTERPRISE_QRCODE_THIRD", + "description": "WeChat enterprise qrcode third." + }, + { + "value": "WECHAT_ENTERPRISE_WEB", + "description": "WeChat enterprise web." }, { "value": "KUJIALE", @@ -123,17 +151,69 @@ "value": "ELEME", "description": "ELEME." }, - { - "value": "GITLAB", - "description": "GITLAB." - }, { "value": "TWITTER", "description": "TWITTER." }, + { + "value": "FEISHU", + "description": "FEISHU." + }, + { + "value": "GITLAB", + "description": "GITLAB." + }, + { + "value": "JD", + "description": "JD." + }, { "value": "ALIYUN", "description": "ALIYUN." + }, + { + "value": "XMLY", + "description": "XMLY." + }, + { + "value": "AMAZON", + "description": "AMAZON." + }, + { + "value": "SLACK", + "description": "SLACK." + }, + { + "value": "LINE", + "description": "LINE." + }, + { + "value": "OKTA", + "description": "OKTA." + }, + { + "value": "PROGINN", + "description": "PROGINN." + }, + { + "value": "AFDIAN", + "description": "AFDIAN." + }, + { + "value": "APPLE", + "description": "APPLE." + }, + { + "value": "FIGMA", + "description": "FIGMA." + }, + { + "value": "WECHAT_MINI_PROGRAM", + "description": "WECHAT_MINI_PROGRAM." + }, + { + "value": "QQ_MINI_PROGRAM", + "description": "QQ_MINI_PROGRAM." } ] },