Merge branch 'feature/forgot-username' of github.com:Evolveum/midpoin…

…t into feature/forgot-username * 'feature/forgot-username' of github.com:Evolveum/midpoint: small update for getting correlators identifier when no id is defined
Evolveum · Aug 3, 2023 · 0d7db7b · 0d7db7b
2 parents a907418 + 365c29b
commit 0d7db7b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageCorrelation.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageCorrelation.java
@@ -69,10 +69,10 @@ protected CorrelatorConfigDto load() {
                 String correlatorName = module.getCurrentCorrelatorIdentifier();
 
                 String archetypeOid = null;
-                        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-                        if (authentication instanceof MidpointAuthentication mpAuthentication) {
-                            archetypeOid = mpAuthentication.getArchetypeOid();
-                        }
+                Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+                if (authentication instanceof MidpointAuthentication mpAuthentication) {
+                    archetypeOid = mpAuthentication.getArchetypeOid();
+                }
 
                 return new CorrelatorConfigDto(correlatorName, archetypeOid, getCorrelationAttributePaths(correlatorName, archetypeOid));
             }

diff --git a/...dpoint/authentication/impl/module/authentication/CorrelationModuleAuthenticationImpl.java b/...dpoint/authentication/impl/module/authentication/CorrelationModuleAuthenticationImpl.java
@@ -14,7 +14,8 @@
 import com.evolveum.midpoint.model.api.correlator.CandidateOwnersMap;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AuthenticationSequenceModuleType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.CorrelationModuleConfigurationType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ModuleItemConfigurationType;
+
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.List;
 import java.util.Set;
@@ -48,6 +49,9 @@ public void setCorrelators(List<CorrelationModuleConfigurationType> correlators)
 
     @Override
     public String getCurrentCorrelatorIdentifier() {
+        if (isEmptyCorrelatorsList()) {
+            return null;    //todo what if correlator identifier isn't specified?
+        }
         return correlators.get(currentProcessingCorrelator).getCorrelatorIdentifier();
     }
 
@@ -59,6 +63,10 @@ public void setNextCorrelator() {
         currentProcessingCorrelator++;
     }
 
+    public boolean isEmptyCorrelatorsList() {
+        return CollectionUtils.isEmpty(correlators);
+    }
+
     public void addCandidateOwners(CandidateOwnersMap map) {
         candidateOwners.mergeWith(map);
     }