support for focusIdentification for login

Evolveum · Aug 2, 2023 · 494ddaf · 494ddaf
1 parent 0df7d47
commit 494ddaf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 29 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.java
@@ -29,14 +29,11 @@
 import com.evolveum.midpoint.authentication.api.util.AuthUtil;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
 
-/**
- * @author mserbak
- * @author lskublik
- */
 @PageDescriptor(urls = {
         @Url(mountUrl = "/login", matchUrlForSecurity = "/login")
 }, permitAll = true, loginPage = true)
-public class PageLogin extends PageAbstractAuthenticationModule<CredentialModuleAuthentication> {
+//TODO ModuleAuthentication because it might be either credentials or ldap module authentication
+public class PageLogin extends PageAbstractAuthenticationModule<ModuleAuthentication> {
     @Serial private static final long serialVersionUID = 1L;
     private static final String ID_USERNAME = "username";
 

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/ObjectCollectionViewUtil.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/ObjectCollectionViewUtil.java
@@ -6,6 +6,8 @@
  */
 package com.evolveum.midpoint.gui.impl.util;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.jetbrains.annotations.NotNull;
@@ -17,9 +19,9 @@ public class ObjectCollectionViewUtil {
 
     public static @NotNull List<ObjectReferenceType> getArchetypeReferencesList(CompiledObjectCollectionView collectionView) {
         if (collectionView == null) {
-            return List.of();
+            return new ArrayList<>();
         }
         var archetypeRef = collectionView.getArchetypeRef();
-        return archetypeRef != null ? List.of(archetypeRef) : List.of();
+        return archetypeRef != null ? Arrays.asList(archetypeRef) : new ArrayList<>();
     }
 }
diff --git a/...n/java/com/evolveum/midpoint/authentication/impl/ldap/MidpointPrincipalContextMapper.java b/...n/java/com/evolveum/midpoint/authentication/impl/ldap/MidpointPrincipalContextMapper.java
@@ -6,41 +6,34 @@
  */
 package com.evolveum.midpoint.authentication.impl.ldap;
 
-import com.evolveum.midpoint.authentication.api.AuthenticationChannel;
-import com.evolveum.midpoint.authentication.api.config.AuthenticationEvaluator;
-import com.evolveum.midpoint.authentication.impl.provider.MidPointLdapAuthenticationProvider;
-import com.evolveum.midpoint.model.api.authentication.GuiProfiledPrincipalManager;
-import com.evolveum.midpoint.model.api.context.PasswordAuthenticationContext;
-import com.evolveum.midpoint.model.api.context.PreAuthenticationContext;
-import com.evolveum.midpoint.security.api.ConnectionEnvironment;
-import com.evolveum.midpoint.util.exception.*;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
+import java.util.Collection;
+import java.util.List;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DirContextOperations;
-import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.AuthenticationServiceException;
 import org.springframework.security.authentication.DisabledException;
-import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.ldap.userdetails.UserDetailsContextMapper;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
 
-import javax.naming.AuthenticationException;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import com.evolveum.midpoint.authentication.api.AuthenticationChannel;
+import com.evolveum.midpoint.authentication.api.config.AuthenticationEvaluator;
+import com.evolveum.midpoint.model.api.context.PasswordAuthenticationContext;
+import com.evolveum.midpoint.model.api.context.PreAuthenticationContext;
+import com.evolveum.midpoint.security.api.ConnectionEnvironment;
+import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
+import com.evolveum.midpoint.util.exception.SystemException;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 
 /**
  * @author skublik