ConditionalPhoneProvided Negate output set default value

cooperlyt · Aug 9, 2024 · 83afe06 · 83afe06
1 parent e565da9
commit 83afe06
Show file tree

Hide file tree

Showing 20 changed files with 444 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Keycloak (Quarkus 21.x.x)  Phone Provider
+# Keycloak (Quarkus 25.x.x)  Phone Provider - Bate
 ![Build Status](https://github.com/cooperlyt/keycloak-phone-provider/actions/workflows/compile-and-liveness-check.yml/badge.svg)
 ![ci](https://github.com/cooperlyt/keycloak-phone-provider/actions/workflows/ci-keycloak20.yml/badge.svg)
 ![ci](https://github.com/cooperlyt/keycloak-phone-provider/actions/workflows/ci-keycloak21.yml/badge.svg)
@@ -23,6 +23,7 @@ Currently, there are implementations for:
 + TotalVoice
 + Twilio,
 + YunTongXun SMS
++ WeiXin App grant
 
 More services can be added with ease due to the modularity of the code.  In fact, nothing would stop you from implementing a
 sender of TTS calls or WhatsApp messages.
@@ -276,6 +277,20 @@ Set Bind `Reset credentials with phone` to `Reset credentials flow`
 + `Update Phone Number` update user's phone number on next login.
 + `Configure OTP over SMS` update OTP Credential's phone number on next login.
 
+## ** WeiXin APP Grant
+
+Under `Authentication` > `Flows`:
++ Copy the `Direct Grant` flow to `Direct grant weixin app ` flow
++ Click on `Actions` > `Add step` on the `WX APP auth` line and move to first
++ Delete or disable other
+
+Under `Clients` > `$YOUR_CLIENT` > `Advanced` > `Authentication Flow Overrides`
+Set Direct Grant Flow to `Direct grant weixin app`
+
+
++ `POST /realms/{realmName}/protocol/openid-connect/token`
+  `Content-Type: application/x-www-form-urlencoded`
+  `grant_type=password&code=$CODE&client_id=$CLIENT_ID&client_secret=$CLIENT_SECRECT`
 
 
 **Phone one key login**

diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
 
   keycloak:
-    image: coopersoft/keycloak:21.0.1_phone-2.2.2
+    image: coopersoft/keycloak:25.0.2_phone-2.4.1-snapshot
     #    restart: always
     ports:
       - 8080:8080

diff --git a/keycloak-phone-provider.resources/pom.xml b/keycloak-phone-provider.resources/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>cc.coopersoft</groupId>
     <artifactId>keycloak-phone-provider-parent</artifactId>
-    <version>2.3.4-snapshot</version>
+    <version>2.4.1-snapshot</version>
   </parent>
 
   <artifactId>keycloak-phone-provider.resources</artifactId>

diff --git a/keycloak-phone-provider/pom.xml b/keycloak-phone-provider/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>cc.coopersoft</groupId>
         <artifactId>keycloak-phone-provider-parent</artifactId>
-        <version>2.3.4-snapshot</version>
+        <version>2.4.1-snapshot</version>
     </parent>
 
     <artifactId>keycloak-phone-provider</artifactId>

diff --git a/...one/authentication/authenticators/directgrant/AuthenticationCodeAuthenticatorFactory.java b/...one/authentication/authenticators/directgrant/AuthenticationCodeAuthenticatorFactory.java
@@ -39,7 +39,7 @@ public Authenticator create(KeycloakSession session) {
         return new AuthenticationCodeAuthenticator(session);
     }
 
-    private static AuthenticationExecutionModel.Requirement[] REQUIREMENT_CHOICES = {
+    private static final AuthenticationExecutionModel.Requirement[] REQUIREMENT_CHOICES = {
             AuthenticationExecutionModel.Requirement.REQUIRED,
             // AuthenticationExecutionModel.Requirement.DISABLED
     };

diff --git a/keycloak-sms-provider-aliyun/pom.xml b/keycloak-sms-provider-aliyun/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>keycloak-phone-provider-parent</artifactId>
     <groupId>cc.coopersoft</groupId>
-    <version>2.3.4-snapshot</version>
+    <version>2.4.1-snapshot</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>cc.coopersoft</groupId>
       <artifactId>keycloak-phone-provider</artifactId>
-      <version>2.3.4-snapshot</version>
+      <version>2.4.1-snapshot</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/keycloak-sms-provider-aws-sns/pom.xml b/keycloak-sms-provider-aws-sns/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>cc.coopersoft</groupId>
     <artifactId>keycloak-phone-provider-parent</artifactId>
-    <version>2.3.4-snapshot</version>
+    <version>2.4.1-snapshot</version>
   </parent>
 
   <artifactId>keycloak-sms-provider-aws-sns</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>cc.coopersoft</groupId>
       <artifactId>keycloak-phone-provider</artifactId>
-      <version>2.3.4-snapshot</version>
+      <version>2.4.1-snapshot</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/keycloak-sms-provider-bulksms/pom.xml b/keycloak-sms-provider-bulksms/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>cc.coopersoft</groupId>
     <artifactId>keycloak-phone-provider-parent</artifactId>
-    <version>2.3.4-snapshot</version>
+    <version>2.4.1-snapshot</version>
   </parent>
 
   <artifactId>keycloak-sms-provider-bulksms</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>cc.coopersoft</groupId>
       <artifactId>keycloak-phone-provider</artifactId>
-      <version>2.3.4-snapshot</version>
+      <version>2.4.1-snapshot</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/keycloak-sms-provider-cloopen/pom.xml b/keycloak-sms-provider-cloopen/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.coopersoft</groupId>
         <artifactId>keycloak-phone-provider-parent</artifactId>
-        <version>2.3.4-snapshot</version>
+        <version>2.4.1-snapshot</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>cc.coopersoft</groupId>
             <artifactId>keycloak-phone-provider</artifactId>
-            <version>2.3.4-snapshot</version>
+            <version>2.4.1-snapshot</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/keycloak-sms-provider-dummy/pom.xml b/keycloak-sms-provider-dummy/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>cc.coopersoft</groupId>
     <artifactId>keycloak-phone-provider-parent</artifactId>
-    <version>2.3.4-snapshot</version>
+    <version>2.4.1-snapshot</version>
   </parent>
 
   <artifactId>keycloak-sms-provider-dummy</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>cc.coopersoft</groupId>
       <artifactId>keycloak-phone-provider</artifactId>
-      <version>2.3.4-snapshot</version>
+      <version>2.4.1-snapshot</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/keycloak-sms-provider-tencent/pom.xml b/keycloak-sms-provider-tencent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>keycloak-phone-provider-parent</artifactId>
     <groupId>cc.coopersoft</groupId>
-    <version>2.3.4-snapshot</version>
+    <version>2.4.1-snapshot</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>cc.coopersoft</groupId>
       <artifactId>keycloak-phone-provider</artifactId>
-      <version>2.3.4-snapshot</version>
+      <version>2.4.1-snapshot</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/keycloak-sms-provider-totalvoice/pom.xml b/keycloak-sms-provider-totalvoice/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>cc.coopersoft</groupId>
     <artifactId>keycloak-phone-provider-parent</artifactId>
-    <version>2.3.4-snapshot</version>
+    <version>2.4.1-snapshot</version>
   </parent>
 
   <artifactId>keycloak-sms-provider-totalvoice</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>cc.coopersoft</groupId>
       <artifactId>keycloak-phone-provider</artifactId>
-      <version>2.3.4-snapshot</version>
+      <version>2.4.1-snapshot</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/keycloak-sms-provider-twilio/pom.xml b/keycloak-sms-provider-twilio/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>cc.coopersoft</groupId>
     <artifactId>keycloak-phone-provider-parent</artifactId>
-    <version>2.3.4-snapshot</version>
+    <version>2.4.1-snapshot</version>
   </parent>
 
   <artifactId>keycloak-sms-provider-twilio</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>cc.coopersoft</groupId>
       <artifactId>keycloak-phone-provider</artifactId>
-      <version>2.3.4-snapshot</version>
+      <version>2.4.1-snapshot</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/keycloak-sms-provider-twofactorapi/pom.xml b/keycloak-sms-provider-twofactorapi/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>cc.coopersoft</groupId>
     <artifactId>keycloak-phone-provider-parent</artifactId>
-    <version>2.3.4-snapshot</version>
+    <version>2.4.1-snapshot</version>
   </parent>
 
   <artifactId>keycloak-sms-provider-twofactorapi</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>cc.coopersoft</groupId>
       <artifactId>keycloak-phone-provider</artifactId>
-      <version>2.3.4-snapshot</version>
+      <version>2.4.1-snapshot</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/keycloak-sms-provider-yunxin/pom.xml b/keycloak-sms-provider-yunxin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>keycloak-phone-provider-parent</artifactId>
     <groupId>cc.coopersoft</groupId>
-    <version>2.3.4-snapshot</version>
+    <version>2.4.1-snapshot</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>cc.coopersoft</groupId>
       <artifactId>keycloak-phone-provider</artifactId>
-      <version>2.3.4-snapshot</version>
+      <version>2.4.1-snapshot</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/keycloak-wx-provider-app/pom.xml b/keycloak-wx-provider-app/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cc.coopersoft</groupId>
+        <artifactId>keycloak-phone-provider-parent</artifactId>
+        <version>2.4.1-snapshot</version>
+    </parent>
+
+    <artifactId>keycloak-wx-provider-app</artifactId>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.12.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <finalName>${project.build.finalName}</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}</artifactId>
+                                    <version>${project.version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>../target/providers</outputDirectory>
+                            <stripClassifier>true</stripClassifier>
+                            <stripVersion>true</stripVersion>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>