getting of SelfRegistrationType via util method instead of direct usi…

…ng of attribute in securityPolicy
Evolveum · Oct 4, 2021 · 0132bf0 · 0132bf0
1 parent caf77d1
commit 0132bf0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
@@ -10,6 +10,7 @@
 import com.evolveum.midpoint.model.api.authentication.ModuleWebSecurityConfiguration;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.schema.util.SecurityPolicyUtil;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.exception.CommonException;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -159,17 +160,20 @@ public boolean isVisible() {
                 return linkIsVisible;
             }
         });
-        if (securityPolicy != null && securityPolicy.getRegistration() != null && securityPolicy.getRegistration().getSelfRegistration() != null
-                && StringUtils.isNotBlank(securityPolicy.getRegistration().getSelfRegistration().getAdditionalAuthenticationName())) {
-            AuthenticationSequenceType sequence = SecurityUtils.getSequenceByName(securityPolicy.getRegistration().getSelfRegistration().getAdditionalAuthenticationName(),
-                    securityPolicy.getAuthentication());
-            if (sequence != null) {
-                registration.add(AttributeModifier.replace("href", new IModel<String>() {
-                    @Override
-                    public String getObject() {
-                        return "./" + ModuleWebSecurityConfiguration.DEFAULT_PREFIX_OF_MODULE + "/" + sequence.getChannel().getUrlSuffix();
-                    }
-                }));
+        if (securityPolicy != null) {
+            SelfRegistrationPolicyType selfRegistrationPolicy = SecurityPolicyUtil.getSelfRegistrationPolicy(securityPolicy);
+            if (selfRegistrationPolicy != null
+                    && StringUtils.isNotBlank(selfRegistrationPolicy.getAdditionalAuthenticationName())) {
+                AuthenticationSequenceType sequence = SecurityUtils.getSequenceByName(selfRegistrationPolicy.getAdditionalAuthenticationName(),
+                        securityPolicy.getAuthentication());
+                if (sequence != null) {
+                    registration.add(AttributeModifier.replace("href", new IModel<String>() {
+                        @Override
+                        public String getObject() {
+                            return "./" + ModuleWebSecurityConfiguration.DEFAULT_PREFIX_OF_MODULE + "/" + sequence.getChannel().getUrlSuffix();
+                        }
+                    }));
+                }
             }
         }
         form.add(registration);

diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
@@ -1480,9 +1480,9 @@ public String createRegistrationConfirmationLink(UserType userType) {
         SecurityPolicyType securityPolicy = resolveSecurityPolicy(userType.asPrismObject());
         if (securityPolicy != null && securityPolicy.getAuthentication() != null
                 && securityPolicy.getAuthentication().getSequence() != null && !securityPolicy.getAuthentication().getSequence().isEmpty()) {
-            if (securityPolicy.getRegistration() != null && securityPolicy.getRegistration().getSelfRegistration() != null
-                    && securityPolicy.getRegistration().getSelfRegistration().getAdditionalAuthenticationName() != null) {
-                String resetPasswordSequenceName = securityPolicy.getRegistration().getSelfRegistration().getAdditionalAuthenticationName();
+            SelfRegistrationPolicyType selfRegistrationPolicy = SecurityPolicyUtil.getSelfRegistrationPolicy(securityPolicy);
+            if (selfRegistrationPolicy != null && selfRegistrationPolicy.getAdditionalAuthenticationName() != null) {
+                String resetPasswordSequenceName = selfRegistrationPolicy.getAdditionalAuthenticationName();
                 String prefix = createPrefixLinkByAuthSequence(SchemaConstants.CHANNEL_SELF_REGISTRATION_URI, resetPasswordSequenceName, securityPolicy.getAuthentication().getSequence());
                 if (prefix != null) {
                     return createTokenConfirmationLink(prefix, userType);