From fa9da02bbc29e862bc943ab5addd728ce6d4ab5c Mon Sep 17 00:00:00 2001 From: Thisara-Welmilla Date: Sat, 25 Jan 2025 10:28:53 +0530 Subject: [PATCH 1/5] Fix custom authentication management issues. --- .../application/UpdateAuthenticationSequence.java | 9 --------- .../v1/core/ServerAuthenticatorManagementService.java | 6 ++++-- .../configs/v1/core/ServerConfigManagementService.java | 10 ---------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java index bd76572d87..c8eba5e28f 100644 --- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java +++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java @@ -22,7 +22,6 @@ import org.wso2.carbon.identity.api.server.application.management.v1.core.functions.UpdateFunction; import org.wso2.carbon.identity.api.server.application.management.v1.core.functions.Utils; import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants; -import org.wso2.carbon.identity.application.common.ApplicationAuthenticatorService; import org.wso2.carbon.identity.application.common.model.AuthenticationStep; import org.wso2.carbon.identity.application.common.model.FederatedAuthenticatorConfig; import org.wso2.carbon.identity.application.common.model.IdentityProvider; @@ -32,7 +31,6 @@ import org.wso2.carbon.identity.application.common.model.ServiceProvider; import org.wso2.carbon.identity.application.common.model.script.AuthenticationScriptConfig; import org.wso2.carbon.identity.application.mgt.ApplicationConstants; -import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import java.util.ArrayList; import java.util.Collections; @@ -162,18 +160,11 @@ private AuthenticationStep buildAuthenticationStep(AuthenticationStepModel stepM LocalAuthenticatorConfig localAuthOption = new LocalAuthenticatorConfig(); localAuthOption.setEnabled(true); localAuthOption.setName(option.getAuthenticator()); - DefinedByType definedByType = ApplicationAuthenticatorService.getInstance() - .getLocalAuthenticatorByName(option.getAuthenticator()).getDefinedByType(); - localAuthOption.setDefinedByType(definedByType); localAuthOptions.add(localAuthOption); } else { FederatedAuthenticatorConfig federatedAuthConfig = new FederatedAuthenticatorConfig(); federatedAuthConfig.setEnabled(true); federatedAuthConfig.setName(option.getAuthenticator()); - DefinedByType definedByType = ApplicationAuthenticatorService.getInstance() - .getFederatedAuthenticatorByName(option.getAuthenticator()).getDefinedByType(); - federatedAuthConfig.setDefinedByType(definedByType); - IdentityProvider federatedIdp = new IdentityProvider(); federatedIdp.setIdentityProviderName(option.getIdp()); federatedIdp.setFederatedAuthenticatorConfigs(new FederatedAuthenticatorConfig[]{federatedAuthConfig}); diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java index fe7b4b2961..d07d51a6de 100644 --- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java +++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java @@ -521,9 +521,11 @@ private void addIdp(IdentityProvider identityProvider, List authe authenticator and should always be classified as a SYSTEM type. Otherwise, it can be classified as either SYSTEM or USER, depending on the 'definedBy' type of the federated authenticator. */ if (identityProvider.getFederatedAuthenticatorConfigs().length == 1) { - DefinedByType definedByType = - identityProvider.getFederatedAuthenticatorConfigs()[0].getDefinedByType(); + FederatedAuthenticatorConfig federatedAuthenticatorConfig = identityProvider + .getFederatedAuthenticatorConfig(identityProvider.getFederatedAuthenticatorConfigs()[0].getName()); + DefinedByType definedByType = federatedAuthenticatorConfig.getDefinedByType(); authenticator.definedBy(Authenticator.DefinedByEnum.valueOf(definedByType.toString())); + authenticator.setTags(Arrays.asList(federatedAuthenticatorConfig.getTags())); } else { authenticator.definedBy(Authenticator.DefinedByEnum.SYSTEM); } diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java index 87026faa9f..c465f47ae4 100644 --- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java +++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java @@ -38,7 +38,6 @@ import org.wso2.carbon.identity.api.server.configs.v1.function.CORSConfigurationToCORSConfig; import org.wso2.carbon.identity.api.server.configs.v1.function.DCRConnectorUtil; import org.wso2.carbon.identity.api.server.configs.v1.function.JWTConnectorUtil; -import org.wso2.carbon.identity.api.server.configs.v1.model.AuthenticationType; import org.wso2.carbon.identity.api.server.configs.v1.model.Authenticator; import org.wso2.carbon.identity.api.server.configs.v1.model.AuthenticatorListItem; import org.wso2.carbon.identity.api.server.configs.v1.model.AuthenticatorProperty; @@ -110,7 +109,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Locale; @@ -844,15 +842,7 @@ private UserDefinedLocalAuthenticatorConfig castToUserDefinedConfig(LocalAuthent private void resolveEndpointConfiguration(Authenticator authenticator, UserDefinedLocalAuthenticatorConfig config) { UserDefinedAuthenticatorEndpointConfig endpointConfig = config.getEndpointConfig(); - - AuthenticationType authenticationType = new AuthenticationType(); - authenticationType.setType(AuthenticationType.TypeEnum.fromValue( - endpointConfig.getAuthenticatorEndpointAuthenticationType())); - authenticationType.setProperties(new HashMap<>( - endpointConfig.getAuthenticatorEndpointAuthenticationProperties())); - Endpoint endpoint = new Endpoint(); - endpoint.setAuthentication(authenticationType); endpoint.setUri(endpointConfig.getAuthenticatorEndpointUri()); authenticator.addEndpointItem(endpoint); } From baa880b8964e60023d61d92e3c3c9f85c87ae363 Mon Sep 17 00:00:00 2001 From: Thisara-Welmilla Date: Sun, 26 Jan 2025 18:11:52 +0530 Subject: [PATCH 2/5] Bump carbon.identity.framework.version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5eab9ae808..6be98756ff 100644 --- a/pom.xml +++ b/pom.xml @@ -833,7 +833,7 @@ 1.4 1.2.4 1.11.27 - 7.7.130 + 7.7.141 3.0.5 1.12.0 **/gen/**/* From c92c7502b415305742441cd658690dcb443eaab0 Mon Sep 17 00:00:00 2001 From: Thisara-Welmilla Date: Sun, 26 Jan 2025 18:33:31 +0530 Subject: [PATCH 3/5] Improve authenticator type resolving. --- .../UpdateAuthenticationSequence.java | 24 +++++++++++++++++++ .../ServerAuthenticatorManagementService.java | 24 ++++++++++++++----- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java index c8eba5e28f..ca3099a76c 100644 --- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java +++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java @@ -19,9 +19,11 @@ import org.apache.commons.lang.StringUtils; import org.wso2.carbon.identity.api.server.application.management.v1.AuthenticationSequence; import org.wso2.carbon.identity.api.server.application.management.v1.AuthenticationStepModel; +import org.wso2.carbon.identity.api.server.application.management.v1.Authenticator; import org.wso2.carbon.identity.api.server.application.management.v1.core.functions.UpdateFunction; import org.wso2.carbon.identity.api.server.application.management.v1.core.functions.Utils; import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants; +import org.wso2.carbon.identity.application.common.ApplicationAuthenticatorService; import org.wso2.carbon.identity.application.common.model.AuthenticationStep; import org.wso2.carbon.identity.application.common.model.FederatedAuthenticatorConfig; import org.wso2.carbon.identity.application.common.model.IdentityProvider; @@ -31,6 +33,7 @@ import org.wso2.carbon.identity.application.common.model.ServiceProvider; import org.wso2.carbon.identity.application.common.model.script.AuthenticationScriptConfig; import org.wso2.carbon.identity.application.mgt.ApplicationConstants; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import java.util.ArrayList; import java.util.Collections; @@ -159,12 +162,14 @@ private AuthenticationStep buildAuthenticationStep(AuthenticationStepModel stepM if (FrameworkConstants.LOCAL_IDP_NAME.equals(option.getIdp())) { LocalAuthenticatorConfig localAuthOption = new LocalAuthenticatorConfig(); localAuthOption.setEnabled(true); + localAuthOption.setDefinedByType(resolveDefinedByType(option)); localAuthOption.setName(option.getAuthenticator()); localAuthOptions.add(localAuthOption); } else { FederatedAuthenticatorConfig federatedAuthConfig = new FederatedAuthenticatorConfig(); federatedAuthConfig.setEnabled(true); federatedAuthConfig.setName(option.getAuthenticator()); + federatedAuthConfig.setDefinedByType(resolveDefinedByType(option)); IdentityProvider federatedIdp = new IdentityProvider(); federatedIdp.setIdentityProviderName(option.getIdp()); federatedIdp.setFederatedAuthenticatorConfigs(new FederatedAuthenticatorConfig[]{federatedAuthConfig}); @@ -179,6 +184,25 @@ private AuthenticationStep buildAuthenticationStep(AuthenticationStepModel stepM return authenticationStep; } + private DefinedByType resolveDefinedByType(Authenticator authenticator) { + + if (FrameworkConstants.LOCAL_IDP_NAME.equals(authenticator.getIdp())) { + LocalAuthenticatorConfig localAuthConfig = ApplicationAuthenticatorService.getInstance() + .getLocalAuthenticatorByName(authenticator.getAuthenticator()); + if (localAuthConfig != null) { + return localAuthConfig.getDefinedByType(); + } + } else { + FederatedAuthenticatorConfig federatedAuthConfig = ApplicationAuthenticatorService.getInstance() + .getFederatedAuthenticatorByName(authenticator.getAuthenticator()); + if (federatedAuthConfig != null) { + return federatedAuthConfig.getDefinedByType(); + } + } + + return DefinedByType.USER; + } + private int getSubjectStepId(Integer subjectStepId, int numSteps) { return subjectStepId != null && subjectStepId <= numSteps ? subjectStepId : 1; diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java index d07d51a6de..9b2ffae416 100644 --- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java +++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java @@ -50,7 +50,6 @@ import org.wso2.carbon.identity.application.common.model.UserDefinedLocalAuthenticatorConfig; import org.wso2.carbon.identity.application.common.util.AuthenticatorMgtExceptionBuilder.AuthenticatorMgtError; import org.wso2.carbon.identity.application.mgt.ApplicationManagementService; -import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import org.wso2.carbon.identity.base.IdentityException; import org.wso2.carbon.identity.core.model.ExpressionNode; import org.wso2.carbon.identity.core.model.FilterTreeBuilder; @@ -521,11 +520,10 @@ private void addIdp(IdentityProvider identityProvider, List authe authenticator and should always be classified as a SYSTEM type. Otherwise, it can be classified as either SYSTEM or USER, depending on the 'definedBy' type of the federated authenticator. */ if (identityProvider.getFederatedAuthenticatorConfigs().length == 1) { - FederatedAuthenticatorConfig federatedAuthenticatorConfig = identityProvider - .getFederatedAuthenticatorConfig(identityProvider.getFederatedAuthenticatorConfigs()[0].getName()); - DefinedByType definedByType = federatedAuthenticatorConfig.getDefinedByType(); - authenticator.definedBy(Authenticator.DefinedByEnum.valueOf(definedByType.toString())); - authenticator.setTags(Arrays.asList(federatedAuthenticatorConfig.getTags())); + FederatedAuthenticatorConfig federatedAuthConfig = resolveFederatedAuthenticatorConfig(identityProvider); + authenticator.definedBy(Authenticator.DefinedByEnum.valueOf( + String.valueOf(federatedAuthConfig.getDefinedByType()))); + authenticator.setTags(Arrays.asList(federatedAuthConfig.getTags())); } else { authenticator.definedBy(Authenticator.DefinedByEnum.SYSTEM); } @@ -538,6 +536,20 @@ private void addIdp(IdentityProvider identityProvider, List authe String.format("/v1/identity-providers/%s", identityProvider.getResourceId())).toString()); } + private FederatedAuthenticatorConfig resolveFederatedAuthenticatorConfig(IdentityProvider identityProvider) { + + try { + return idpManager.getFederatedAuthenticatorByName( + identityProvider.getFederatedAuthenticatorConfigs()[0].getName(), + ContextLoader.getTenantDomainFromContext()); + } catch (IdentityProviderManagementException e) { + throw handleException(Response.Status.INTERNAL_SERVER_ERROR, Constants.ErrorMessage + .ERROR_CODE_ERROR_LISTING_AUTHENTICATORS, String.format("An error occurred whiling " + + "retrieving federated authenticator configuration for identity provider: %s", + identityProvider.getIdentityProviderName())); + } + } + /** * Adds the local authenticator to the list of authenticators. * From 30bddd80b1e54f634fbf212335fb10c5bc16f929 Mon Sep 17 00:00:00 2001 From: Thisara-Welmilla Date: Sun, 26 Jan 2025 22:06:09 +0530 Subject: [PATCH 4/5] Address comments. --- .../UpdateAuthenticationSequence.java | 25 +++---------------- .../core/ServerConfigManagementService.java | 8 ++++-- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java index ca3099a76c..c42e2c408f 100644 --- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java +++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java @@ -157,19 +157,21 @@ private AuthenticationStep buildAuthenticationStep(AuthenticationStepModel stepM List localAuthOptions = new ArrayList<>(); List federatedAuthOptions = new ArrayList<>(); + /* The defined type of the authenticator (USER or SYSTEM) will not be resolved here. Since this is flow of + the authenticator is being configured for application authentication flows, only the type of the authenticator + local or federated) is relevant. Therefore, resolving by the defined type is not necessary. + */ stepModel.getOptions().forEach(option -> { // TODO : add validations to swagger so that we don't need to check inputs here. if (FrameworkConstants.LOCAL_IDP_NAME.equals(option.getIdp())) { LocalAuthenticatorConfig localAuthOption = new LocalAuthenticatorConfig(); localAuthOption.setEnabled(true); - localAuthOption.setDefinedByType(resolveDefinedByType(option)); localAuthOption.setName(option.getAuthenticator()); localAuthOptions.add(localAuthOption); } else { FederatedAuthenticatorConfig federatedAuthConfig = new FederatedAuthenticatorConfig(); federatedAuthConfig.setEnabled(true); federatedAuthConfig.setName(option.getAuthenticator()); - federatedAuthConfig.setDefinedByType(resolveDefinedByType(option)); IdentityProvider federatedIdp = new IdentityProvider(); federatedIdp.setIdentityProviderName(option.getIdp()); federatedIdp.setFederatedAuthenticatorConfigs(new FederatedAuthenticatorConfig[]{federatedAuthConfig}); @@ -184,25 +186,6 @@ private AuthenticationStep buildAuthenticationStep(AuthenticationStepModel stepM return authenticationStep; } - private DefinedByType resolveDefinedByType(Authenticator authenticator) { - - if (FrameworkConstants.LOCAL_IDP_NAME.equals(authenticator.getIdp())) { - LocalAuthenticatorConfig localAuthConfig = ApplicationAuthenticatorService.getInstance() - .getLocalAuthenticatorByName(authenticator.getAuthenticator()); - if (localAuthConfig != null) { - return localAuthConfig.getDefinedByType(); - } - } else { - FederatedAuthenticatorConfig federatedAuthConfig = ApplicationAuthenticatorService.getInstance() - .getFederatedAuthenticatorByName(authenticator.getAuthenticator()); - if (federatedAuthConfig != null) { - return federatedAuthConfig.getDefinedByType(); - } - } - - return DefinedByType.USER; - } - private int getSubjectStepId(Integer subjectStepId, int numSteps) { return subjectStepId != null && subjectStepId <= numSteps ? subjectStepId : 1; diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java index c465f47ae4..9549513dfc 100644 --- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java +++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java @@ -814,7 +814,7 @@ private Authenticator buildAuthenticatorResponse(LocalAuthenticatorConfig config UserDefinedLocalAuthenticatorConfig userDefinedConfig = castToUserDefinedConfig(config); authenticator.setImage(userDefinedConfig.getImageUrl()); authenticator.setDescription(userDefinedConfig.getDescription()); - resolveEndpointConfiguration(authenticator, userDefinedConfig); + resolveEndpointConfigurationForAuthenticatorFromConfig(authenticator, userDefinedConfig); } else { authenticator.setDefinedBy(Authenticator.DefinedByEnum.SYSTEM); setAuthenticatorProperties(config, authenticator); @@ -839,8 +839,12 @@ private UserDefinedLocalAuthenticatorConfig castToUserDefinedConfig(LocalAuthent } } - private void resolveEndpointConfiguration(Authenticator authenticator, UserDefinedLocalAuthenticatorConfig config) { + private void resolveEndpointConfigurationForAuthenticatorFromConfig( + Authenticator authenticator, UserDefinedLocalAuthenticatorConfig config) { + /* Only the endpoint URI of the endpoint configurations of the user-defined authenticator is set to the + authenticator. The authentication properties in the config are aliases for secrets and must not be included + in the response body.*/ UserDefinedAuthenticatorEndpointConfig endpointConfig = config.getEndpointConfig(); Endpoint endpoint = new Endpoint(); endpoint.setUri(endpointConfig.getAuthenticatorEndpointUri()); From 575e549e5d4cdbe414772149d47272754a8049b3 Mon Sep 17 00:00:00 2001 From: Thisara-Welmilla Date: Sun, 26 Jan 2025 22:13:57 +0530 Subject: [PATCH 5/5] Address comments. --- .../functions/application/UpdateAuthenticationSequence.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java index c42e2c408f..65fcf211b9 100644 --- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java +++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/functions/application/UpdateAuthenticationSequence.java @@ -19,11 +19,9 @@ import org.apache.commons.lang.StringUtils; import org.wso2.carbon.identity.api.server.application.management.v1.AuthenticationSequence; import org.wso2.carbon.identity.api.server.application.management.v1.AuthenticationStepModel; -import org.wso2.carbon.identity.api.server.application.management.v1.Authenticator; import org.wso2.carbon.identity.api.server.application.management.v1.core.functions.UpdateFunction; import org.wso2.carbon.identity.api.server.application.management.v1.core.functions.Utils; import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants; -import org.wso2.carbon.identity.application.common.ApplicationAuthenticatorService; import org.wso2.carbon.identity.application.common.model.AuthenticationStep; import org.wso2.carbon.identity.application.common.model.FederatedAuthenticatorConfig; import org.wso2.carbon.identity.application.common.model.IdentityProvider; @@ -33,7 +31,6 @@ import org.wso2.carbon.identity.application.common.model.ServiceProvider; import org.wso2.carbon.identity.application.common.model.script.AuthenticationScriptConfig; import org.wso2.carbon.identity.application.mgt.ApplicationConstants; -import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import java.util.ArrayList; import java.util.Collections;