self registration a bit of cleanup

Evolveum · Aug 3, 2023 · 89acc0e · 89acc0e
1 parent 120f2fc
commit 89acc0e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageRegistrationBase.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageRegistrationBase.java
@@ -55,9 +55,6 @@ public class PageRegistrationBase extends PageAdminLTE {
     private static final String ID_DESCRIPTION = "formDescription";
     private static final String ID_BACK = "back";
 
-    @SpringBean(name = "nonceAuthenticationEvaluator")
-    private AuthenticationEvaluator<NonceAuthenticationContext, UsernamePasswordAuthenticationToken> authenticationEvaluator;
-
     private SelfRegistrationDto selfRegistrationDto;
     private SelfRegistrationDto postAuthenticationDto;
 
@@ -196,8 +193,4 @@ public SelfRegistrationDto getPostAuthenticationConfiguration() {
 
     }
 
-    public AuthenticationEvaluator<NonceAuthenticationContext, UsernamePasswordAuthenticationToken> getAuthenticationEvaluator() {
-        return authenticationEvaluator;
-    }
-
 }
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageRegistrationFinish.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageRegistrationFinish.java
@@ -59,14 +59,12 @@ public class PageRegistrationFinish extends PageRegistrationBase {
 
     private static final String ID_LABEL_SUCCESS = "successLabel";
     private static final String ID_LABEL_ERROR = "errorLabel";
-    private static final String ID_LINK_LOGIN = "linkToLogin";
     private static final String ID_SUCCESS_PANEL = "successPanel";
     private static final String ID_ERROR_PANEL = "errorPanel";
 
     private static final String OPERATION_ASSIGN_DEFAULT_ROLES = DOT_CLASS + "assignDefaultRoles";
     private static final String OPERATION_ASSIGN_ADDITIONAL_ROLE = DOT_CLASS + "assignAdditionalRole";
     private static final String OPERATION_FINISH_REGISTRATION = DOT_CLASS + "finishRegistration";
-    private static final String OPERATION_CHECK_CREDENTIALS = DOT_CLASS + "checkCredentials";
     private static final String OPERATION_REMOVE_NONCE_AND_SET_LIFECYCLE_STATE = DOT_CLASS + "removeNonceAndSetLifecycleState";
 
     private static final long serialVersionUID = 1L;

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
@@ -469,7 +469,6 @@ public abstract class SchemaConstants {
     //GUI constants which are also used in the notifiers
     public static final String WORK_ITEM_URL_PREFIX = "/admin/workItem?pathParameter=";
     public static final String CASE_URL_PREFIX = "/admin/caseNew/";
-    public static final String REGISTRATION_CONFIRMATION_PREFIX = "/confirm/registration";  //todo remove in the future, seems to be an old implementation for self registration
     public static final String REGISTRATION_PREFIX = "/registration";
     public static final String PASSWORD_RESET_CONFIRMATION_PREFIX = "/confirm/reset";
     public static final String ACCOUNT_ACTIVATION_PREFIX = "/activate/accounts";

diff --git a/.../evolveum/midpoint/authentication/impl/channel/SelfRegistrationAuthenticationChannel.java b/.../evolveum/midpoint/authentication/impl/channel/SelfRegistrationAuthenticationChannel.java
@@ -49,12 +49,11 @@ public boolean isSupportActivationByChannel() {
 
     @Override
     public Collection<Authorization> resolveAuthorities(Collection<Authorization> authorities) {
-        ArrayList<Authorization> newAuthorities = new ArrayList<>();
+        ArrayList<Authorization> newAuthorities = new ArrayList<>(authorities);
         AuthorizationType authorizationBean = new AuthorizationType();
         authorizationBean.getAction().add(AuthorizationConstants.AUTZ_UI_SELF_REGISTRATION_FINISH_URL);
         Authorization selfServiceCredentialsAuthz = new Authorization(authorizationBean);
         newAuthorities.add(selfServiceCredentialsAuthz);
-        authorities.addAll(newAuthorities);
-        return authorities;
+        return newAuthorities;
     }
 }