Merge pull request #70 from vivekko/master

Added compatibility with keycloak 22
cooperlyt · Sep 6, 2023 · 51dd7a5 · 51dd7a5
2 parents 4203119 + 5676797
commit 51dd7a5
Show file tree

Hide file tree

Showing 19 changed files with 64 additions and 40 deletions.
diff --git a/keycloak-phone-provider/pom.xml b/keycloak-phone-provider/pom.xml
@@ -13,6 +13,30 @@
     <artifactId>keycloak-phone-provider</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>3.12.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-jpa</artifactId>

diff --git a/keycloak-phone-provider/src/main/java/cc/coopersoft/keycloak/phone/Utils.java b/keycloak-phone-provider/src/main/java/cc/coopersoft/keycloak/phone/Utils.java
@@ -16,7 +16,7 @@
 import org.keycloak.services.validation.Validation;
 import org.keycloak.util.JsonSerialization;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.*;
 import java.util.function.Predicate;

diff --git a/...rsoft/keycloak/phone/authentication/authenticators/browser/PhoneUsernamePasswordForm.java b/...rsoft/keycloak/phone/authentication/authenticators/browser/PhoneUsernamePasswordForm.java
@@ -27,8 +27,8 @@
 import org.keycloak.services.messages.Messages;
 import org.keycloak.services.validation.Validation;
 
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
 
 import java.util.List;
 

diff --git a/...opersoft/keycloak/phone/authentication/authenticators/browser/SmsOtpMfaAuthenticator.java b/...opersoft/keycloak/phone/authentication/authenticators/browser/SmsOtpMfaAuthenticator.java
@@ -22,10 +22,10 @@
 import org.keycloak.services.validation.Validation;
 import org.keycloak.util.JsonSerialization;
 
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Optional;

diff --git a/...eycloak/phone/authentication/authenticators/directgrant/BaseDirectGrantAuthenticator.java b/...eycloak/phone/authentication/authenticators/directgrant/BaseDirectGrantAuthenticator.java
@@ -10,8 +10,8 @@
 import org.keycloak.models.UserModel;
 import org.keycloak.representations.idm.OAuth2ErrorRepresentation;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.Optional;
 
 public abstract class BaseDirectGrantAuthenticator implements Authenticator {

diff --git a/...soft/keycloak/phone/authentication/authenticators/resetcred/ResetCredentialWithPhone.java b/...soft/keycloak/phone/authentication/authenticators/resetcred/ResetCredentialWithPhone.java
@@ -23,8 +23,8 @@
 import org.keycloak.services.messages.Messages;
 import org.keycloak.services.validation.Validation;
 
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
 
 import java.util.List;
 

diff --git a/...java/cc/coopersoft/keycloak/phone/authentication/forms/RegistrationPhoneUserCreation.java b/...java/cc/coopersoft/keycloak/phone/authentication/forms/RegistrationPhoneUserCreation.java
@@ -24,7 +24,7 @@
 import org.keycloak.userprofile.UserProfileProvider;
 import org.keycloak.userprofile.ValidationException;
 
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/.../cc/coopersoft/keycloak/phone/authentication/forms/RegistrationPhoneVerificationCode.java b/.../cc/coopersoft/keycloak/phone/authentication/forms/RegistrationPhoneVerificationCode.java
@@ -27,7 +27,7 @@
 import org.keycloak.provider.ProviderConfigurationBuilder;
 import org.keycloak.services.validation.Validation;
 
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/.../coopersoft/keycloak/phone/authentication/requiredactions/ConfigSmsOtpRequiredAction.java b/.../coopersoft/keycloak/phone/authentication/requiredactions/ConfigSmsOtpRequiredAction.java
@@ -15,9 +15,9 @@
 import org.keycloak.credential.CredentialModel;
 import org.keycloak.credential.CredentialProvider;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.core.Response;
 import java.util.Optional;
 
 import static cc.coopersoft.keycloak.phone.authentication.authenticators.browser.PhoneUsernamePasswordForm.VERIFIED_PHONE_NUMBER;

diff --git a/...ersoft/keycloak/phone/authentication/requiredactions/UpdatePhoneNumberRequiredAction.java b/...ersoft/keycloak/phone/authentication/requiredactions/UpdatePhoneNumberRequiredAction.java
@@ -9,9 +9,10 @@
 import org.keycloak.authentication.RequiredActionContext;
 import org.keycloak.authentication.RequiredActionProvider;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.ForbiddenException;
+
+import jakarta.ws.rs.core.Response;
 
 public class UpdatePhoneNumberRequiredAction implements RequiredActionProvider {
 

diff --git a/...ovider/src/main/java/cc/coopersoft/keycloak/phone/credential/PhoneOtpCredentialModel.java b/...ovider/src/main/java/cc/coopersoft/keycloak/phone/credential/PhoneOtpCredentialModel.java
@@ -10,7 +10,7 @@
 import org.keycloak.models.credential.dto.OTPSecretData;
 import org.keycloak.util.JsonSerialization;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.Date;
 import java.util.Optional;

diff --git a/...ak-phone-provider/src/main/java/cc/coopersoft/keycloak/phone/providers/jpa/TokenCode.java b/...ak-phone-provider/src/main/java/cc/coopersoft/keycloak/phone/providers/jpa/TokenCode.java
@@ -2,7 +2,7 @@
 
 import lombok.Data;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 
 @Entity

diff --git a/...phone-provider/src/main/java/cc/coopersoft/keycloak/phone/providers/rest/SmsResource.java b/...phone-provider/src/main/java/cc/coopersoft/keycloak/phone/providers/rest/SmsResource.java
@@ -3,7 +3,7 @@
 import cc.coopersoft.keycloak.phone.providers.constants.TokenCodeType;
 import org.keycloak.models.KeycloakSession;
 
-import javax.ws.rs.Path;
+import jakarta.ws.rs.Path;
 
 public class SmsResource {
 

diff --git a/...provider/src/main/java/cc/coopersoft/keycloak/phone/providers/rest/TokenCodeResource.java b/...provider/src/main/java/cc/coopersoft/keycloak/phone/providers/rest/TokenCodeResource.java
@@ -9,12 +9,12 @@
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.services.validation.Validation;
 
-import javax.validation.constraints.NotBlank;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
 
 public class TokenCodeResource {
 

diff --git a/...r/src/main/java/cc/coopersoft/keycloak/phone/providers/rest/VerificationCodeResource.java b/...r/src/main/java/cc/coopersoft/keycloak/phone/providers/rest/VerificationCodeResource.java
@@ -9,10 +9,10 @@
 import org.keycloak.services.managers.AppAuthManager;
 import org.keycloak.services.managers.AuthenticationManager.AuthResult;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 
 public class VerificationCodeResource extends TokenCodeResource {
 

diff --git a/...r/src/main/java/cc/coopersoft/keycloak/phone/providers/spi/impl/DefaultPhoneProvider.java b/...r/src/main/java/cc/coopersoft/keycloak/phone/providers/spi/impl/DefaultPhoneProvider.java
@@ -12,8 +12,8 @@
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.services.validation.Validation;
 
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.ServiceUnavailableException;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.ServiceUnavailableException;
 import java.time.Instant;
 import java.util.Optional;
 

diff --git a/...cc/coopersoft/keycloak/phone/providers/spi/impl/DefaultPhoneVerificationCodeProvider.java b/...cc/coopersoft/keycloak/phone/providers/spi/impl/DefaultPhoneVerificationCodeProvider.java
@@ -20,11 +20,11 @@
 import org.keycloak.services.validation.Validation;
 import org.keycloak.util.JsonSerialization;
 
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.TemporalType;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.ForbiddenException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.TemporalType;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.ForbiddenException;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.Date;

diff --git a/...der/src/main/resources/META-INF/services/org.keycloak.authentication.AuthenticatorFactory b/...der/src/main/resources/META-INF/services/org.keycloak.authentication.AuthenticatorFactory
@@ -1,8 +1,7 @@
-cc.coopersoft.keycloak.phone.authentication.authenticators.browser.SmsOtpMfaAuthenticatorFactory
 cc.coopersoft.keycloak.phone.authentication.authenticators.browser.PhoneUsernamePasswordForm
 cc.coopersoft.keycloak.phone.authentication.authenticators.resetcred.ResetCredentialWithPhone
 cc.coopersoft.keycloak.phone.authentication.authenticators.resetcred.ResetCredentialEmailWithPhone
 cc.coopersoft.keycloak.phone.authentication.authenticators.directgrant.AuthenticationCodeAuthenticatorFactory
 cc.coopersoft.keycloak.phone.authentication.authenticators.directgrant.PhoneNumberAuthenticatorFactory
 cc.coopersoft.keycloak.phone.authentication.authenticators.directgrant.EverybodyPhoneAuthenticatorFactory
-cc.coopersoft.keycloak.phone.authentication.authenticators.conditional.ConditionalPhoneProvidedFactory
+cc.coopersoft.keycloak.phone.authentication.authenticators.conditional.ConditionalPhoneProvidedFactory
diff --git a/pom.xml b/pom.xml
@@ -46,7 +46,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <java.version>17</java.version>
-        <version.keycloak>21.0.2</version.keycloak>
+        <version.keycloak>22.0.1</version.keycloak>
     </properties>
 
     <modules>