correlation authetication module, cleanup

Evolveum · Jul 25, 2023 · 4fc1874 · 4fc1874
1 parent e57b3f8
commit 4fc1874
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 19 deletions.
diff --git a/...java/com/evolveum/midpoint/authentication/api/config/CorrelationModuleAuthentication.java b/...java/com/evolveum/midpoint/authentication/api/config/CorrelationModuleAuthentication.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2023 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+package com.evolveum.midpoint.authentication.api.config;
+
+public interface CorrelationModuleAuthentication extends ModuleAuthentication {
+
+}
diff --git a/...om/evolveum/midpoint/authentication/impl/factory/module/CorrelationModuleFactoryImpl.java b/...om/evolveum/midpoint/authentication/impl/factory/module/CorrelationModuleFactoryImpl.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.authentication.impl.factory.module;
 
-import com.evolveum.midpoint.authentication.impl.module.authentication.CorrelationModuleAuthentication;
+import com.evolveum.midpoint.authentication.impl.module.authentication.CorrelationModuleAuthenticationImpl;
 import com.evolveum.midpoint.authentication.impl.module.configurer.CorrelationModuleWebSecurityConfigurer;
 
 import com.evolveum.midpoint.authentication.impl.provider.CorrelationProvider;
@@ -15,7 +15,6 @@
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.authentication.api.AuthenticationChannel;
-import com.evolveum.midpoint.authentication.impl.module.authentication.FocusIdentificationModuleAuthentication;
 import com.evolveum.midpoint.authentication.impl.module.authentication.ModuleAuthenticationImpl;
 import com.evolveum.midpoint.authentication.impl.module.configuration.LoginFormModuleWebSecurityConfiguration;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -58,14 +57,12 @@ protected Class<? extends CredentialPolicyType> supportedClass() {
     @Override
     protected ModuleAuthenticationImpl createEmptyModuleAuthentication(AbstractAuthenticationModuleType moduleType,
             LoginFormModuleWebSecurityConfiguration configuration, AuthenticationSequenceModuleType sequenceModule) {
-        CorrelationModuleAuthentication moduleAuthentication = new CorrelationModuleAuthentication(sequenceModule);
+        CorrelationModuleAuthenticationImpl moduleAuthentication = new CorrelationModuleAuthenticationImpl(sequenceModule);
         moduleAuthentication.setPrefix(configuration.getPrefixOfModule());
-        moduleAuthentication.setCredentialName(((AbstractCredentialAuthenticationModuleType)moduleType).getCredentialName());
-        moduleAuthentication.setCredentialType(supportedClass());
         moduleAuthentication.setNameOfModule(configuration.getModuleIdentifier());
-//        if (moduleType instanceof FocusIdentificationAuthenticationModuleType) {
-//            moduleAuthentication.setModuleConfiguration(((FocusIdentificationAuthenticationModuleType) moduleType).getItem());
-//        }
+        if (moduleType instanceof CorrelationAuthenticationModuleType) {
+            moduleAuthentication.setCorrelatorIdentifier(((CorrelationAuthenticationModuleType) moduleType).getCorrelationRuleIdentifier());
+        }
         return moduleAuthentication;
     }
 

diff --git a/...tion/CorrelationModuleAuthentication.java → .../CorrelationModuleAuthenticationImpl.java b/...tion/CorrelationModuleAuthentication.java → .../CorrelationModuleAuthenticationImpl.java
@@ -6,34 +6,31 @@
  */
 package com.evolveum.midpoint.authentication.impl.module.authentication;
 
+import com.evolveum.midpoint.authentication.api.config.CorrelationModuleAuthentication;
 import com.evolveum.midpoint.authentication.api.util.AuthenticationModuleNameConstants;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AuthenticationSequenceModuleType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ModuleItemConfigurationType;
 
 import java.util.List;
 
-public class CorrelationModuleAuthentication extends CredentialModuleAuthenticationImpl {
+public class CorrelationModuleAuthenticationImpl extends ModuleAuthenticationImpl implements CorrelationModuleAuthentication {
 
-    private List<ModuleItemConfigurationType> moduleConfiguration;
+    private String correlatorIdentifier;
 
-    public CorrelationModuleAuthentication(AuthenticationSequenceModuleType sequenceModule) {
+    public CorrelationModuleAuthenticationImpl(AuthenticationSequenceModuleType sequenceModule) {
         super(AuthenticationModuleNameConstants.CORRELATION, sequenceModule);
         setSufficient(false);
     }
 
     public ModuleAuthenticationImpl clone() {
-        CorrelationModuleAuthentication module = new CorrelationModuleAuthentication(this.getSequenceModule());
+        CorrelationModuleAuthenticationImpl module = new CorrelationModuleAuthenticationImpl(this.getSequenceModule());
         module.setAuthentication(this.getAuthentication());
-        module.setModuleConfiguration(this.getModuleConfiguration());
+        module.setCorrelatorIdentifier(this.correlatorIdentifier);
         super.clone(module);
         return module;
     }
 
-    public void setModuleConfiguration(List<ModuleItemConfigurationType> moduleConfiguration) {
-        this.moduleConfiguration = moduleConfiguration;
-    }
-
-    public List<ModuleItemConfigurationType> getModuleConfiguration() {
-        return moduleConfiguration;
+    public void setCorrelatorIdentifier(String correlatorIdentifier) {
+        this.correlatorIdentifier = correlatorIdentifier;
     }
 }