Merge pull request #28 from luoqiz/master

feat: 发布1.4.1

.github/workflows/deploy-snapshot.yml

@@ -1,65 +0,0 @@
-name: Deploy
-
-on: 
-  push:
-    branches: [ dev ]
-    paths:
-      - src/**
-      - pom.xml
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.2.0
-      - name: Set up Java and Maven
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-      - name: Cache m2 package
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - run: mvn test
-
-  deploy-snapshot:
-    needs: test
-    if: ${{ success() }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.2.0
-      - name: Set up Java and Maven
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-          server-id: ossrh
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-      - name: Cache m2 package
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: setting snapshot version
-        run: |
-          import xml.etree.ElementTree as ET
-          tree = ET.parse("pom.xml")
-          version = tree.find("{http://maven.apache.org/POM/4.0.0}version")
-          print(version.text + "-SNAPSHOT")
-          if version.text.endswith("-SNAPSHOT") == False:
-            tree.find("{http://maven.apache.org/POM/4.0.0}version").text = version.text + "-SNAPSHOT"
-            ET.register_namespace("", "http://maven.apache.org/POM/4.0.0")
-            tree.write("pom.xml", "utf-8", True)
-        shell: python
-      - name: deploy snapshot to ossrh repository
-        run: mvn -B deploy -P snapshot -DskipTests
-        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

.github/workflows/test-pr.yml

@@ -1,26 +0,0 @@
-name: test pull_request
-
-on: 
-  pull_request:
-    paths:
-      - src/**
-      - pom.xml
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.2.0
-      - name: Set up Java and Maven
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-      - name: Cache m2 package
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - run: mvn test

pom.xml

@@ -23,7 +23,7 @@
 
   <groupId>com.xkcoding.justauth</groupId>
   <artifactId>justauth-spring-boot-starter</artifactId>
-  <version>1.4.0</version>
+  <version>1.4.1</version>
 
   <name>justauth-spring-boot-starter</name>
   <url>https://github.com/xkcoding/justauth-spring-boot-starter</url>
@@ -72,8 +72,8 @@
     <!--SpringBoot版本-->
     <spring-boot.version>2.1.8.RELEASE</spring-boot.version>
     <!--JustAuth版本-->
-    <justauth.version>1.16.1</justauth.version>
+    <justauth.version>1.16.7</justauth.version>
-    <hutool.version>5.6.5</hutool.version>
+    <hutool.version>5.8.35</hutool.version>
   </properties>
 
   <dependencies>
@@ -215,15 +215,6 @@
   </repositories>
 
   <profiles>
-    <profile>
-      <id>snapshot</id>
-      <distributionManagement>
-        <snapshotRepository>
-          <id>ossrh</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
     <profile>
       <id>release</id>
       <build>
@@ -245,9 +236,14 @@
         </plugins>
       </build>
       <distributionManagement>
-        <repository>
+        <snapshotRepository>
           <id>oss</id>
           <name>Oss Release Repository</name>
+          <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </snapshotRepository>
+        <repository>
+          <id>oss</id>
+          <name>Oss Snapshot Repository</name>
           <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
       </distributionManagement>

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:
+            case HUAWEI_V3:
-                return new AuthGitlabRequest(config, authStateCache);
+                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:
+            case GITLAB:
-                return new AuthElemeRequest(config, authStateCache);
+                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;
         }

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",
+          "value": "HUAWEI_V3",
-          "description": "WeChat open platform."
+          "description": "HUAWEI_V3."
         },
         {
           "value": "WECHAT_ENTERPRISE",
           "description": "WeChat enterprise platform."
         },
         {
-          "value": "WECHAT_MP",
+          "value": "WECHAT_ENTERPRISE_V2",
-          "description": "WeChat Official Platform."
+          "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."
         }
       ]
     },

src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration