pom.xml

@@ -1,6 +1,6 @@
 <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>
-  <groupId>com.github.thomasdarimont.keycloak</groupId>
+  <groupId>net.micedre.keycloak</groupId>
   <artifactId>keycloak-mail-whitelisting</artifactId>
   <version>1.9-SNAPSHOT</version>
 
@@ -149,4 +149,4 @@
       </build>
     </profile>
   </profiles>
-</project>
+</project>

src/main/java/net/micedre/keycloak/registration/RegistrationProfileDomainValidation.java

@@ -1,5 +1,5 @@
-package com.github.thomasdarimont.keycloak.auth;
-//
+package net.micedre.keycloak.registration;
+
 import org.jboss.logging.Logger;
 import org.keycloak.authentication.FormAction;
 import org.keycloak.authentication.ValidationContext;
@@ -10,23 +10,16 @@ import org.keycloak.events.Errors;
 import org.keycloak.models.AuthenticatorConfigModel;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
-import org.keycloak.models.UserModel;
 import org.keycloak.models.utils.FormMessage;
 import org.keycloak.services.messages.Messages;
 import org.keycloak.services.validation.Validation;
+import org.keycloak.storage.adapter.AbstractUserAdapter;
 
 import jakarta.ws.rs.core.MultivaluedMap;
 import java.util.ArrayList;
 import java.util.List;
-//
-import org.keycloak.authentication.FormActionFactory;
-import org.keycloak.authentication.FormContext;
-import org.keycloak.authentication.forms.RegistrationUserCreation;
-import org.keycloak.events.Errors;
-import org.keycloak.forms.login.LoginFormsProvider;
-import org.keycloak.models.utils.FormMessage;
 
-public abstract class RegistrationProfileDomainValidation extends RegistrationUserCreation {
+public abstract class RegistrationProfileDomainValidation extends RegistrationProfile implements FormAction {
    protected static final Logger logger = Logger.getLogger(RegistrationProfileDomainValidation.class);
 
    protected static final String DEFAULT_DOMAIN_LIST = "example.org";
@@ -92,13 +85,15 @@ public abstract class RegistrationProfileDomainValidation extends RegistrationUs
       boolean emailDomainValid = isEmailValid(email, domainList);
 
       if (!emailDomainValid) {
-         super.success(context);
+         // add user to a "waiting" group
+         // show a message saying you need to be approved by admin
          KeycloakSession session = context.getSession();
          RealmModel realm = context.getRealm();
-         UserModel user = context.getUser();
+         AbstractUserAdapter user = new AbstractUserAdapter();
          user.addRequiredAction("USER_MUST_BE_APPROVED");
-         setRequiredActions(session, realm, user);
+         setRequiredActions(context.getSession(), context.getRealm(), user);
 
+         context.success();
       }
       if (errors.size() > 0) {
          context.error(eventError);

src/main/java/net/micedre/keycloak/registration/RegistrationProfileWithDomainBlock.java

@@ -1,4 +1,4 @@
-package com.github.thomasdarimont.keycloak.auth;
+package net.micedre.keycloak.registration;
 
 import org.keycloak.authentication.FormContext;
 import org.keycloak.forms.login.LoginFormsProvider;

src/main/java/net/micedre/keycloak/registration/RegistrationProfileWithMailDomainCheck.java

@@ -1,4 +1,4 @@
-package com.github.thomasdarimont.keycloak.auth;
+package net.micedre.keycloak.registration;
 
 import org.keycloak.authentication.FormContext;
 import org.keycloak.forms.login.LoginFormsProvider;
@@ -69,4 +69,4 @@ public class RegistrationProfileWithMailDomainCheck extends RegistrationProfileD
 
       return false;
    }
-}
+}

src/main/resources/META-INF/services/org.keycloak.authentication.FormActionFactory

@@ -1,3 +1,2 @@
-com.thomasdarimont.keycloak.auth.CustomRegistrationUserCreation
-com.thomasdarimont.keycloak.auth.RegistrationProfileWithDomainBlock
-com.thomasdarimont.keycloak.auth.RegistrationProfileWithMailDomainCheck
+net.micedre.keycloak.registration.RegistrationProfileWithMailDomainCheck
+net.micedre.keycloak.registration.RegistrationProfileWithDomainBlock