Merge pull request #26 from virtualidentityag/develop

Remove diakonie specs
Onlineberatung · Aug 12, 2022 · 0ec6f8a · 0ec6f8a
2 parents 2981d3a + f576881
commit 0ec6f8a
Show file tree

Hide file tree

Showing 40 changed files with 237 additions and 229 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   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>de.diakonie.onlineberatung</groupId>
+  <groupId>de.onlineberatung</groupId>
   <artifactId>keycloak-otp-config-spi</artifactId>
   <version>1.0-SNAPSHOT</version>
 

diff --git a/src/main/java/de/diakonie/onlineberatung/otp/OtpMailSender.java b/src/main/java/de/diakonie/onlineberatung/otp/OtpMailSender.java
diff --git a/src/main/java/de/diakonie/onlineberatung/otp/RandomDigitsCodeGenerator.java b/src/main/java/de/diakonie/onlineberatung/otp/RandomDigitsCodeGenerator.java
diff --git a/...ineberatung/RealmOtpResourceProvider.java → ...ineberatung/RealmOtpResourceProvider.java b/...ineberatung/RealmOtpResourceProvider.java → ...ineberatung/RealmOtpResourceProvider.java
@@ -1,22 +1,22 @@
-package de.diakonie.onlineberatung;
+package de.onlineberatung;
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 
-import de.diakonie.onlineberatung.authenticator.SessionAuthenticator;
-import de.diakonie.onlineberatung.credential.AppOtpCredentialService;
-import de.diakonie.onlineberatung.credential.CredentialContext;
-import de.diakonie.onlineberatung.credential.MailOtpCredentialService;
-import de.diakonie.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.Error;
-import de.diakonie.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.OtpInfoDTO;
-import de.diakonie.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.OtpSetupDTO;
-import de.diakonie.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.OtpType;
-import de.diakonie.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.Success;
-import de.diakonie.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.SuccessWithEmail;
-import de.diakonie.onlineberatung.mail.MailSendingException;
-import de.diakonie.onlineberatung.otp.Otp;
-import de.diakonie.onlineberatung.otp.OtpMailSender;
-import de.diakonie.onlineberatung.otp.OtpService;
+import de.onlineberatung.authenticator.SessionAuthenticator;
+import de.onlineberatung.credential.AppOtpCredentialService;
+import de.onlineberatung.credential.CredentialContext;
+import de.onlineberatung.credential.MailOtpCredentialService;
+import de.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.Error;
+import de.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.OtpInfoDTO;
+import de.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.OtpSetupDTO;
+import de.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.OtpType;
+import de.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.Success;
+import de.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.SuccessWithEmail;
+import de.onlineberatung.mail.MailSendingException;
+import de.onlineberatung.otp.Otp;
+import de.onlineberatung.otp.OtpMailSender;
+import de.onlineberatung.otp.OtpService;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -44,7 +44,7 @@ public class RealmOtpResourceProvider implements RealmResourceProvider {
   private static final String MISSING_CREDENTIAL_CONFIG = "no mail otp credentials configured";
   private static final String MISSING_USERNAME_ERROR_DESCRIPTION = "username not found";
   private static final String MISSING_EMAIL_ADDRESS_ERROR_DESCRIPTION = "email address of user not available";
-  private final static String FAILED_TO_SENT = "failed to send otp verification email";
+  private static final String FAILED_TO_SENT = "failed to send otp verification email";
 
   private final KeycloakSession session;
   private final SessionAuthenticator sessionAuthenticator;

diff --git a/...tung/RealmOtpResourceProviderFactory.java → ...tung/RealmOtpResourceProviderFactory.java b/...tung/RealmOtpResourceProviderFactory.java → ...tung/RealmOtpResourceProviderFactory.java
@@ -1,14 +1,14 @@
-package de.diakonie.onlineberatung;
+package de.onlineberatung;
 
-import static de.diakonie.onlineberatung.authenticator.OtpMailAuthenticatorFactory.OTP_CONFIG_ALIAS;
+import static de.onlineberatung.authenticator.OtpMailAuthenticatorFactory.OTP_CONFIG_ALIAS;
 
-import de.diakonie.onlineberatung.authenticator.BearerTokenSessionAuthenticator;
-import de.diakonie.onlineberatung.credential.AppOtpCredentialService;
-import de.diakonie.onlineberatung.credential.MailOtpCredentialProviderFactory;
-import de.diakonie.onlineberatung.credential.MailOtpCredentialService;
-import de.diakonie.onlineberatung.mail.DefaultMailSender;
-import de.diakonie.onlineberatung.otp.MemoryOtpService;
-import de.diakonie.onlineberatung.otp.RandomDigitsCodeGenerator;
+import de.onlineberatung.authenticator.BearerTokenSessionAuthenticator;
+import de.onlineberatung.credential.AppOtpCredentialService;
+import de.onlineberatung.credential.MailOtpCredentialProviderFactory;
+import de.onlineberatung.credential.MailOtpCredentialService;
+import de.onlineberatung.mail.DefaultMailSender;
+import de.onlineberatung.otp.MemoryOtpService;
+import de.onlineberatung.otp.RandomDigitsCodeGenerator;
 import java.time.Clock;
 import org.keycloak.Config.Scope;
 import org.keycloak.models.KeycloakSession;
@@ -55,4 +55,4 @@ public void close() {
   public String getId() {
     return ID;
   }
-}
+}
diff --git a/...ator/BearerTokenSessionAuthenticator.java → ...ator/BearerTokenSessionAuthenticator.java b/...ator/BearerTokenSessionAuthenticator.java → ...ator/BearerTokenSessionAuthenticator.java
@@ -1,4 +1,4 @@
-package de.diakonie.onlineberatung.authenticator;
+package de.onlineberatung.authenticator;
 
 import static java.util.Objects.isNull;
 

diff --git a/...enticator/OtpAppAuthenticatorFactory.java → ...enticator/OtpAppAuthenticatorFactory.java b/...enticator/OtpAppAuthenticatorFactory.java → ...enticator/OtpAppAuthenticatorFactory.java
@@ -1,4 +1,4 @@
-package de.diakonie.onlineberatung.authenticator;
+package de.onlineberatung.authenticator;
 
 import static java.util.Arrays.asList;
 
@@ -73,14 +73,17 @@ public Authenticator create(KeycloakSession session) {
 
   @Override
   public void init(Config.Scope config) {
+    // unused
   }
 
   @Override
   public void postInit(KeycloakSessionFactory factory) {
+    // unused
   }
 
   @Override
   public void close() {
+    // unused
   }
 
 

diff --git a/...g/authenticator/OtpMailAuthenticator.java → ...g/authenticator/OtpMailAuthenticator.java b/...g/authenticator/OtpMailAuthenticator.java → ...g/authenticator/OtpMailAuthenticator.java
@@ -1,17 +1,18 @@
-package de.diakonie.onlineberatung.authenticator;
+package de.onlineberatung.authenticator;
 
-import static de.diakonie.onlineberatung.authenticator.OtpParameterAuthenticator.extractDecodedOtpParam;
-import static de.diakonie.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.OtpType.EMAIL;
+import static de.onlineberatung.authenticator.OtpParameterAuthenticator.extractDecodedOtpParam;
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 
-import de.diakonie.onlineberatung.credential.CredentialContext;
-import de.diakonie.onlineberatung.credential.MailOtpCredentialModel;
-import de.diakonie.onlineberatung.credential.MailOtpCredentialService;
-import de.diakonie.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.Challenge;
-import de.diakonie.onlineberatung.mail.MailSendingException;
-import de.diakonie.onlineberatung.otp.OtpMailSender;
-import de.diakonie.onlineberatung.otp.OtpService;
+import de.onlineberatung.credential.CredentialContext;
+import de.onlineberatung.credential.MailOtpCredentialModel;
+import de.onlineberatung.credential.MailOtpCredentialService;
+import de.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.Challenge;
+import de.onlineberatung.mail.MailSendingException;
+import de.onlineberatung.otp.OtpMailSender;
+import de.onlineberatung.otp.OtpService;
+import de.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.OtpType;
+import java.util.Collections;
 import java.util.List;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -74,7 +75,7 @@ public boolean requiresUser() {
 
   @Override
   public void setRequiredActions(KeycloakSession session, RealmModel realm, UserModel user) {
-
+    // unused
   }
 
   private void sendOtpMail(MailOtpCredentialModel credentialModel, CredentialContext credContext,
@@ -93,7 +94,7 @@ private void sendOtpMail(MailOtpCredentialModel credentialModel, CredentialConte
     try {
       mailSender.sendOtpCode(otp, credContext);
       var challengeResponse = new Challenge().error(INVALID_GRANT_ERROR)
-          .errorDescription("Missing totp").otpType(EMAIL);
+          .errorDescription("Missing totp").otpType(OtpType.EMAIL);
       context.failure(AuthenticationFlowError.INVALID_CREDENTIALS,
           Response.status(Status.BAD_REQUEST).entity(challengeResponse)
               .type(MediaType.APPLICATION_JSON_TYPE).build());
@@ -177,7 +178,7 @@ public String getHelpText() {
 
   @Override
   public List<ProviderConfigProperty> getConfigProperties() {
-    return null;
+    return Collections.emptyList();
   }
 
   @Override

diff --git a/...nticator/OtpMailAuthenticatorFactory.java → ...nticator/OtpMailAuthenticatorFactory.java b/...nticator/OtpMailAuthenticatorFactory.java → ...nticator/OtpMailAuthenticatorFactory.java
@@ -1,12 +1,12 @@
-package de.diakonie.onlineberatung.authenticator;
+package de.onlineberatung.authenticator;
 
 import static java.util.Arrays.asList;
 
-import de.diakonie.onlineberatung.credential.MailOtpCredentialProviderFactory;
-import de.diakonie.onlineberatung.credential.MailOtpCredentialService;
-import de.diakonie.onlineberatung.mail.DefaultMailSender;
-import de.diakonie.onlineberatung.otp.MemoryOtpService;
-import de.diakonie.onlineberatung.otp.RandomDigitsCodeGenerator;
+import de.onlineberatung.credential.MailOtpCredentialProviderFactory;
+import de.onlineberatung.credential.MailOtpCredentialService;
+import de.onlineberatung.mail.DefaultMailSender;
+import de.onlineberatung.otp.MemoryOtpService;
+import de.onlineberatung.otp.RandomDigitsCodeGenerator;
 import java.time.Clock;
 import java.util.List;
 import org.keycloak.Config;
@@ -89,14 +89,17 @@ public Authenticator create(KeycloakSession session) {
 
   @Override
   public void init(Config.Scope config) {
+    // unused
   }
 
   @Override
   public void postInit(KeycloakSessionFactory factory) {
+    // unused
   }
 
   @Override
   public void close() {
+    // unused
   }
 
 }
diff --git a/...henticator/OtpParameterAuthenticator.java → ...henticator/OtpParameterAuthenticator.java b/...henticator/OtpParameterAuthenticator.java → ...henticator/OtpParameterAuthenticator.java
@@ -1,9 +1,9 @@
-package de.diakonie.onlineberatung.authenticator;
+package de.onlineberatung.authenticator;
 
-import static de.diakonie.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.OtpType.APP;
 import static java.util.Objects.isNull;
 
-import de.diakonie.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.Challenge;
+import de.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.Challenge;
+import de.onlineberatung.keycloak_otp_config_spi.keycloakextension.generated.web.model.OtpType;
 import java.util.Collections;
 import java.util.List;
 import javax.ws.rs.core.MediaType;
@@ -24,7 +24,7 @@ public class OtpParameterAuthenticator extends AbstractDirectGrantAuthenticator
 
   public static final String ID = "otp-parameter-authenticator";
 
-  final AuthenticationExecutionModel.Requirement[] REQUIREMENT_CHOICES = {
+  static final AuthenticationExecutionModel.Requirement[] REQUIREMENT_CHOICES = {
       AuthenticationExecutionModel.Requirement.REQUIRED};
 
   @Override
@@ -38,7 +38,7 @@ public void authenticate(AuthenticationFlowContext context) {
 
     if (otpOfRequest == null) {
       Challenge challengeResponse = new Challenge().error("invalid_grant")
-          .errorDescription("Missing totp").otpType(APP);
+          .errorDescription("Missing totp").otpType(OtpType.APP);
       context.failure(AuthenticationFlowError.INVALID_CREDENTIALS,
           Response.status(Status.BAD_REQUEST).entity(challengeResponse)
               .type(MediaType.APPLICATION_JSON_TYPE).build());
@@ -106,4 +106,4 @@ static String extractDecodedOtpParam(AuthenticationFlowContext context) {
     otpParam = (isNull(otpParam)) ? inputData.getFirst("totp") : otpParam;
     return otpParam;
   }
-}
+}
diff --git a/...g/authenticator/SessionAuthenticator.java → ...g/authenticator/SessionAuthenticator.java b/...g/authenticator/SessionAuthenticator.java → ...g/authenticator/SessionAuthenticator.java
@@ -1,4 +1,4 @@
-package de.diakonie.onlineberatung.authenticator;
+package de.onlineberatung.authenticator;
 
 import org.keycloak.models.KeycloakSession;
 

diff --git a/...g/credential/AppOtpCredentialService.java → ...g/credential/AppOtpCredentialService.java b/...g/credential/AppOtpCredentialService.java → ...g/credential/AppOtpCredentialService.java
@@ -1,4 +1,4 @@
-package de.diakonie.onlineberatung.credential;
+package de.onlineberatung.credential;
 
 import org.keycloak.models.credential.OTPCredentialModel;
 import org.keycloak.models.utils.CredentialValidation;
@@ -47,4 +47,4 @@ public void deleteCredentials(CredentialContext context) {
         credentialModel -> CredentialHelper.deleteOTPCredential(context.getSession(),
             context.getRealm(), context.getUser(), credentialModel.getId()));
   }
-}
+}
diff --git a/...eratung/credential/CredentialContext.java → ...eratung/credential/CredentialContext.java b/...eratung/credential/CredentialContext.java → ...eratung/credential/CredentialContext.java
@@ -1,4 +1,4 @@
-package de.diakonie.onlineberatung.credential;
+package de.onlineberatung.credential;
 
 import java.util.Objects;
 import org.keycloak.authentication.AuthenticationFlowContext;

diff --git a/...ung/credential/MailOtpCredentialData.java → ...ung/credential/MailOtpCredentialData.java b/...ung/credential/MailOtpCredentialData.java → ...ung/credential/MailOtpCredentialData.java
@@ -1,4 +1,4 @@
-package de.diakonie.onlineberatung.credential;
+package de.onlineberatung.credential;
 
 public class MailOtpCredentialData {
 

diff --git a/...ng/credential/MailOtpCredentialModel.java → ...ng/credential/MailOtpCredentialModel.java b/...ng/credential/MailOtpCredentialModel.java → ...ng/credential/MailOtpCredentialModel.java
@@ -1,8 +1,8 @@
-package de.diakonie.onlineberatung.credential;
+package de.onlineberatung.credential;
 
 import static org.keycloak.util.JsonSerialization.writeValueAsString;
 
-import de.diakonie.onlineberatung.otp.Otp;
+import de.onlineberatung.otp.Otp;
 import java.io.IOException;
 import java.time.Clock;
 import org.jetbrains.annotations.NotNull;

diff --git a/...credential/MailOtpCredentialProvider.java → ...credential/MailOtpCredentialProvider.java b/...credential/MailOtpCredentialProvider.java → ...credential/MailOtpCredentialProvider.java
@@ -1,7 +1,6 @@
-package de.diakonie.onlineberatung.credential;
+package de.onlineberatung.credential;
 
-import de.diakonie.onlineberatung.RealmOtpResourceProvider;
-import de.diakonie.onlineberatung.authenticator.OtpMailAuthenticator;
+import de.onlineberatung.authenticator.OtpMailAuthenticator;
 import java.time.Clock;
 import org.jboss.logging.Logger;
 import org.keycloak.credential.CredentialInput;
@@ -19,7 +18,7 @@
 public class MailOtpCredentialProvider implements CredentialProvider<MailOtpCredentialModel>,
     CredentialInputValidator {
 
-  private static final Logger logger = Logger.getLogger(RealmOtpResourceProvider.class);
+  private static final Logger logger = Logger.getLogger(MailOtpCredentialProvider.class);
 
   private final KeycloakSession session;
   private final Clock clock;

diff --git a/...ial/MailOtpCredentialProviderFactory.java → ...ial/MailOtpCredentialProviderFactory.java b/...ial/MailOtpCredentialProviderFactory.java → ...ial/MailOtpCredentialProviderFactory.java
@@ -1,4 +1,4 @@
-package de.diakonie.onlineberatung.credential;
+package de.onlineberatung.credential;
 
 import java.time.Clock;
 import org.keycloak.credential.CredentialProviderFactory;

diff --git a/.../credential/MailOtpCredentialService.java → .../credential/MailOtpCredentialService.java b/.../credential/MailOtpCredentialService.java → .../credential/MailOtpCredentialService.java
@@ -1,9 +1,9 @@
-package de.diakonie.onlineberatung.credential;
+package de.onlineberatung.credential;
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 
-import de.diakonie.onlineberatung.otp.Otp;
+import de.onlineberatung.otp.Otp;
 import java.time.Clock;
 
 public class MailOtpCredentialService {

diff --git a/...eratung/credential/MailOtpSecretData.java → ...eratung/credential/MailOtpSecretData.java b/...eratung/credential/MailOtpSecretData.java → ...eratung/credential/MailOtpSecretData.java
@@ -1,4 +1,4 @@
-package de.diakonie.onlineberatung.credential;
+package de.onlineberatung.credential;
 
 public class MailOtpSecretData {
 

diff --git a/...ung/log/LoggingEventListenerProvider.java → ...ung/log/LoggingEventListenerProvider.java b/...ung/log/LoggingEventListenerProvider.java → ...ung/log/LoggingEventListenerProvider.java
@@ -1,4 +1,4 @@
-package de.diakonie.onlineberatung.log;
+package de.onlineberatung.log;
 
 import java.util.Map;
 import javax.ws.rs.core.Cookie;
@@ -145,6 +145,7 @@ private void logAdminEvent(AdminEvent adminEvent, boolean includeRepresentation)
 
   @Override
   public void close() {
+    // unused
   }
 
   private void setKeycloakContext(StringBuilder sb) {
@@ -173,4 +174,4 @@ private void setKeycloakContext(StringBuilder sb) {
     sb.append("]");
   }
 
-}
+}